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

Guard against NULL in fix_invalid_vehicle_sprite_sizes()

This commit is contained in:
rwjuk 2017-07-06 22:29:51 +01:00
parent 1c7eeb14c8
commit f28db5731f
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2/ride/ride.c
View File

@ -8681,6 +8681,15 @@ void fix_invalid_vehicle_sprite_sizes()
while (rideSpriteIndex != SPRITE_INDEX_NULL) {
rct_vehicle *vehicle = GET_VEHICLE(rideSpriteIndex);
rct_ride_entry_vehicle *vehicleEntry = vehicle_get_vehicle_entry(vehicle);
if (vehicle == NULL ||
vehicle == (rct_vehicle*)-1 ||
vehicleEntry == NULL ||
vehicleEntry == (rct_ride_entry_vehicle*)-1)
{
continue;
}
if (vehicle->sprite_width == 0)
{
vehicle->sprite_width = vehicleEntry->sprite_width;