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

Merge pull request #2919 from Overv/fix-ferris-wheel-rotations 

Fix ferris wheel rotating one extra time (fixes #2918)
This commit is contained in:
Duncan 2016-02-12 21:13:53 +00:00
parent 6d47bf19d3 8f91375530
commit 71b65e9880
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ride/vehicle.c
View File

@ -3631,13 +3631,14 @@ 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;
}
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);
}
}