mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity

Merge pull request #4064 from gDanix/fix-4060

Browse Source 
Fix #4060: Block brakes have a different behaviour from RCT2.
This commit is contained in:
Duncan
2016-07-16 13:04:53 +01:00
committed by GitHub
parent edd661659b 8638cf924d
commit 1e1546d87c
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ride/vehicle.c
View File

@@ -5421,7 +5421,11 @@ static void apply_block_brakes(rct_vehicle *vehicle, bool is_block_brake_closed)
vehicle->velocity -= vehicle->velocity >> 3;
}
} else {
apply_non_stop_block_brake(vehicle, is_block_brake_closed);
#ifdef NEW_BLOCK_BRAKES
apply_non_stop_block_brake(vehicle, false);
#else
apply_non_stop_block_brake(vehicle, true);
#endif
}
}
@@ -5472,8 +5476,13 @@ static void check_and_apply_block_section_stop_site(rct_vehicle *vehicle)
case TRACK_ELEM_CABLE_LIFT_HILL:
case TRACK_ELEM_DIAG_25_DEG_UP_TO_FLAT:
case TRACK_ELEM_DIAG_60_DEG_UP_TO_FLAT:
if (ride_is_block_sectioned(ride))
apply_block_brakes(vehicle, trackElement->flags & MAP_ELEMENT_FLAG_BLOCK_BREAK_CLOSED);
if(ride_is_block_sectioned(ride)){
if(trackType == TRACK_ELEM_CABLE_LIFT_HILL || track_element_is_lift_hill(trackElement)) {
if (trackElement->flags & MAP_ELEMENT_FLAG_BLOCK_BREAK_CLOSED) {
apply_block_brakes(vehicle, true);
}
}
}
break;
}