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

Check for valid colour presets on vehicle game command 

Fixes an issue some people were getting on servers where clients were somehow sending invalid preset IDs for a given ride entry.
This commit is contained in:
Ted John 2016-07-21 19:51:06 +01:00
parent bc3ec7a463
commit 2d1cbc916f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ride/ride.c
View File

@ -7799,6 +7799,14 @@ static money32 ride_set_vehicles(uint8 rideIndex, uint8 setting, uint8 value, ui
if (!(flags & GAME_COMMAND_FLAG_NETWORKED)) {
preset = ride_get_unused_preset_vehicle_colour(ride->type, ride->subtype);
}
// Validate preset
vehicle_colour_preset_list *presetList = rideEntry->vehicle_preset_list;
if (preset >= presetList->count) {
log_error("Unknown vehicle colour preset.");
return MONEY32_UNDEFINED;
}
ride_set_vehicle_colours_to_random_preset(ride, preset);
if (!gCheatsDisableTrainLengthLimit) {
ride->proposed_num_cars_per_train = clamp(rideEntry->min_cars_in_train, ride->proposed_num_cars_per_train, rideEntry->max_cars_in_train);