mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 16:54:52 +01:00
Code Issues Releases Wiki Activity

ride_with_colour_config_exists should ignore itself

Browse Source
This commit is contained in:
IntelOrca
2015-11-10 21:28:10 +00:00
parent c9de9aeee0
commit 54ff0b2045
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ride/ride.c
View File

@@ -5110,13 +5110,14 @@ static int ride_get_default_mode(rct_ride *ride)
return availableModes[0];
}
static bool ride_with_colour_config_exists(int rideType, const track_colour *colours)
static bool ride_with_colour_config_exists(rct_ride *srcRide, const track_colour *colours)
{
rct_ride *ride;
int i;
FOR_ALL_RIDES(i, ride) {
if (ride->type != rideType) continue;
if (ride != srcRide) continue;
if (ride->type != srcRide->type) continue;
if (ride->track_colour_main[0] != colours->main) continue;
if (ride->track_colour_additional[0] != colours->additional) continue;
if (ride->track_colour_supports[0] != colours->supports) continue;
@@ -5158,7 +5159,7 @@ static void ride_set_to_random_colour_preset(rct_ride *ride)
int listIndex = scenario_rand() % colourPresets->count;
colours = &colourPresets->list[listIndex];
if (!ride_with_colour_config_exists(ride->type, colours)) {
if (!ride_with_colour_config_exists(ride, colours)) {
break;
}
}