mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #3050. Assert changed to allow for valid index.

This commit is contained in:
duncanspumpkin 2016-02-29 20:04:33 +00:00
parent 70f38aa68f
commit 8749c1e98c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ride/ride.c
View File

@ -2997,9 +2997,9 @@ static void ride_set_vehicle_colours_to_random_preset(rct_ride *ride, uint8 pres
rct_ride_entry *rideEntry = get_ride_entry(ride->subtype);
vehicle_colour_preset_list *presetList = rideEntry->vehicle_preset_list;
assert(preset_index < presetList->count);
if (presetList->count != 255) {
assert(preset_index < presetList->count);
ride->colour_scheme_type = RIDE_COLOUR_SCHEME_ALL_SAME;
vehicle_colour *preset = &presetList->list[preset_index];
ride->vehicle_colours[0].body_colour = preset->main;
@ -3007,6 +3007,8 @@ static void ride_set_vehicle_colours_to_random_preset(rct_ride *ride, uint8 pres
ride->vehicle_colours_extended[0] = preset->additional_2;
} else {
ride->colour_scheme_type = RIDE_COLOUR_SCHEME_DIFFERENT_PER_TRAIN;
assert(presetList->count >= 32);
for (int i = 0; i < 32; i++) {
vehicle_colour *preset = &presetList->list[i];
ride->vehicle_colours[i].body_colour = preset->main;