mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 23:04:36 +01:00
Code Issues Releases Wiki Activity

Fix #8739: savegame from original game crashes when cruising through map (#8746)

Browse Source
This commit is contained in:
Ted John
2019-02-24 23:23:41 +00:00
committed by GitHub
parent a6e7041f49
commit 08508cc638
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/openrct2/ride/VehiclePaint.cpp
View File

@@ -3075,8 +3075,6 @@ void vehicle_visual_splash_effect(
{
switch (vehicleEntry->effect_visual)
{
case 1: /* nullsub */
break;
case VEHICLE_VISUAL_SPLASH1_EFFECT:
vehicle_visual_splash1_effect(session, z, vehicle);
break;
@@ -3092,9 +3090,6 @@ void vehicle_visual_splash_effect(
case VEHICLE_VISUAL_SPLASH5_EFFECT:
vehicle_visual_splash5_effect(session, z, vehicle);
break;
default:
assert(false);
break;
}
}
@@ -3143,13 +3138,19 @@ void vehicle_paint(paint_session* session, const rct_vehicle* vehicle, int32_t i
{
return;
}
vehicleEntry = &rideEntry->vehicles[vehicle->vehicle_type];
auto vehicleEntryIndex = vehicle->vehicle_type;
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
{
vehicleEntry++;
vehicleEntryIndex++;
z += 16;
}
if (vehicleEntryIndex >= std::size(rideEntry->vehicles))
{
return;
}
vehicleEntry = &rideEntry->vehicles[vehicleEntryIndex];
}
switch (vehicleEntry->car_visual)