From 4bfeaf0c724f3025c72634167b69a1270cbaa2d9 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Fri, 9 Mar 2018 23:39:53 +0100 Subject: [PATCH] Fix #6870 Crash when loading groena lund This crash only occurs when the option "no test crashes" was enable. With this commit the sprite index will be checked before the vehicle gets checked. --- src/openrct2/ride/Ride.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index a610c34247..56b87de4e9 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -2074,7 +2074,11 @@ static void ride_update(sint32 rideIndex) if (ride->status == RIDE_STATUS_TESTING && gConfigGeneral.no_test_crashes) { for (sint32 i = 0; i < ride->num_vehicles; i++) { - rct_vehicle *vehicle = GET_VEHICLE(ride->vehicles[i]); + uint16 spriteIndex = ride->vehicles[i]; + if (spriteIndex == SPRITE_INDEX_NULL) + continue; + + rct_vehicle *vehicle = GET_VEHICLE(spriteIndex); if (vehicle->status == VEHICLE_STATUS_CRASHED || vehicle->status == VEHICLE_STATUS_CRASHING) { ride_set_status(rideIndex, RIDE_STATUS_CLOSED);