From 94d73f0c903634d0918175815a98053d96d898ae Mon Sep 17 00:00:00 2001 From: Alexander Overvoorde Date: Fri, 12 Feb 2016 01:18:48 +0100 Subject: [PATCH 1/2] Fix ferris wheel rotating one extra time (fixes #2918) --- src/ride/vehicle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ride/vehicle.c b/src/ride/vehicle.c index d10a7a71b7..6c558aa79e 100644 --- a/src/ride/vehicle.c +++ b/src/ride/vehicle.c @@ -3631,7 +3631,7 @@ static void vehicle_update_ferris_wheel_rotating(rct_vehicle* vehicle) { if (subState == vehicle->var_1F) { bool shouldStop = true; if (ride->status != RIDE_STATUS_CLOSED) { - if (vehicle->var_CE <= ride->rotations) + if (vehicle->var_CE < ride->rotations) shouldStop = false; } From 8f91375530099114d04c9cc327ead079fde44bd8 Mon Sep 17 00:00:00 2001 From: Alexander Overvoorde Date: Fri, 12 Feb 2016 22:11:10 +0100 Subject: [PATCH 2/2] Add missing line in ferris wheel rotation code --- src/ride/vehicle.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ride/vehicle.c b/src/ride/vehicle.c index 6c558aa79e..e8afe0cd72 100644 --- a/src/ride/vehicle.c +++ b/src/ride/vehicle.c @@ -3638,6 +3638,7 @@ static void vehicle_update_ferris_wheel_rotating(rct_vehicle* vehicle) { if (shouldStop) { ferris_wheel_var_0 = vehicle->ferris_wheel_var_0; vehicle->ferris_wheel_var_0 = -abs(ferris_wheel_var_0); + vehicle->ferris_wheel_var_1 = abs(ferris_wheel_var_0); } }