mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 21:43:06 +01:00
Code Issues Releases Wiki Activity

Remove NEW_BLOCK_BRAKES define (#11727)

Browse Source 
This define was never enabled, because this "new block brake" behaviour (i.e. not braking at all if the brake was open) was too different from the old behaviour to be useful.
Its intended purpose will be handled by adding actual speed settings on block brakes in the future.

This commit removes the define, and also removes the second parameter to apply_non_stop_block_brake(), which is now always true.
This commit is contained in:
Michael Steenbeek
2020-05-12 16:29:15 +02:00
committed by GitHub
parent 9c26c9776b
commit e9fc50d435
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/ride/Vehicle.cpp
View File

@@ -6620,7 +6620,7 @@ void Vehicle::UpdateTrackMotionUpStopCheck() const
* merely as a velocity regulator, in a closed state. When the brake is open, it
* boosts the train to the speed limit
*/
static void apply_non_stop_block_brake(Vehicle* vehicle, bool slowDownToBlockBrakeSpeed)
static void apply_non_stop_block_brake(Vehicle* vehicle)
{
if (vehicle->velocity >= 0)
{
@@ -6631,7 +6631,7 @@ static void apply_non_stop_block_brake(Vehicle* vehicle, bool slowDownToBlockBra
vehicle->velocity = BLOCK_BRAKE_BASE_SPEED;
vehicle->acceleration = 0;
}
else if (slowDownToBlockBrakeSpeed)
else
{
// Slow it down till the fixed block brake speed
vehicle->velocity -= vehicle->velocity >> 4;
@@ -6664,11 +6664,7 @@ static void apply_block_brakes(Vehicle* vehicle, bool is_block_brake_closed)
}
else
{
#ifdef NEW_BLOCK_BRAKES
apply_non_stop_block_brake(vehicle, false);
#else
apply_non_stop_block_brake(vehicle, true);
#endif
apply_non_stop_block_brake(vehicle);
}
}
@@ -6708,7 +6704,7 @@ void Vehicle::CheckAndApplyBlockSectionStopSite()
if (curRide->IsBlockSectioned())
apply_block_brakes(this, trackElement->AsTrack()->BlockBrakeClosed());
else
apply_non_stop_block_brake(this, true);
apply_non_stop_block_brake(this);
break;
case TRACK_ELEM_END_STATION: