From 4fba02567fa0d48d1e5065bb572de6d6f686d825 Mon Sep 17 00:00:00 2001 From: Daniel Trujillo Date: Tue, 12 Jul 2016 19:47:03 +0200 Subject: [PATCH] Add support for cable lift chain to stop train (old behaviour) --- src/ride/vehicle.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/ride/vehicle.c b/src/ride/vehicle.c index 1b328bfe8c..14fe111040 100644 --- a/src/ride/vehicle.c +++ b/src/ride/vehicle.c @@ -5476,14 +5476,16 @@ 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) && track_element_is_lift_hill(trackElement)) { - if (trackElement->flags & MAP_ELEMENT_FLAG_BLOCK_BREAK_CLOSED) { - RCT2_GLOBAL(0x00F64E18, uint32) |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_10; - vehicle->acceleration = 0; - if (vehicle->velocity <= 0x20000) { - vehicle->velocity = 0; + 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) { + RCT2_GLOBAL(0x00F64E18, uint32) |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_10; + vehicle->acceleration = 0; + if (vehicle->velocity <= 0x20000) { + vehicle->velocity = 0; + } + vehicle->velocity -= vehicle->velocity >> 3; } - vehicle->velocity -= vehicle->velocity >> 3; } }