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

Fix cable lift test reset. 

Code now matches the non cable lift code. Refactor in the future.
This commit is contained in:
Duncan 2016-01-19 12:41:20 +00:00
parent bcbf375d04
commit 64e17cc830
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ride/vehicle.c
View File

@ -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);
}
}
}