From 64e17cc830cc1423a05550c78d19a4ca4cd91723 Mon Sep 17 00:00:00 2001 From: Duncan Date: Tue, 19 Jan 2016 12:41:20 +0000 Subject: [PATCH] Fix cable lift test reset. Code now matches the non cable lift code. Refactor in the future. --- src/ride/vehicle.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/ride/vehicle.c b/src/ride/vehicle.c index 4212a04692..10fe3d38f0 100644 --- a/src/ride/vehicle.c +++ b/src/ride/vehicle.c @@ -3104,21 +3104,18 @@ static void vehicle_update_travelling_cable_lift(rct_vehicle* vehicle) { vehicle->sub_state = 1; vehicle_peep_easteregg_here_we_are(vehicle); if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED)) { - if (!(vehicle->update_flags & VEHICLE_UPDATE_FLAG_TESTING)) { - if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TEST_IN_PROGRESS)) { - vehicle_test_reset(vehicle); + if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_TESTING) { + if (ride->current_test_segment + 1 < ride->num_stations) { + ride->current_test_segment++; + ride->var_1F6 = vehicle->current_station; } else { - uint8 currentSegment = ride->current_test_segment + 1; - if (currentSegment >= ride->num_stations) { - vehicle_update_test_finish(vehicle); - } - else { - ride->current_test_segment = currentSegment; - ride->var_1F6 = vehicle->current_station; - } + vehicle_update_test_finish(vehicle); } } + else if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_TEST_IN_PROGRESS)) { + vehicle_test_reset(vehicle); + } } }