diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h index 0d8e4ff67d..5d8b60866d 100644 --- a/src/openrct2/ride/Track.h +++ b/src/openrct2/ride/Track.h @@ -15,6 +15,8 @@ constexpr const uint16_t RideConstructionSpecialPieceSelected = 0x100; +constexpr const int32_t BLOCK_BRAKE_BASE_SPEED = 0x20364; + using track_type_t = uint16_t; #pragma pack(push, 1) diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index e4126b584a..0b19382bb5 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -6626,10 +6626,10 @@ static void apply_non_stop_block_brake(Vehicle* vehicle, bool block_brake_closed if (vehicle->velocity >= 0) { // If the vehicle is below the speed limit - if (vehicle->velocity <= 0x20364) + if (vehicle->velocity <= BLOCK_BRAKE_BASE_SPEED) { // Boost it to the fixed block brake speed - vehicle->velocity = 0x20364; + vehicle->velocity = BLOCK_BRAKE_BASE_SPEED; vehicle->acceleration = 0; } else if (block_brake_closed) @@ -7587,7 +7587,7 @@ static void vehicle_update_handle_scenery_door(Vehicle* vehicle) static void vehicle_update_play_water_splash_sound() { - if (_vehicleVelocityF64E08 <= 0x20364) + if (_vehicleVelocityF64E08 <= BLOCK_BRAKE_BASE_SPEED) { return; }