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

Part of #9473: Create Apply(Non)StopBlockBrake (#11835)

Browse Source
This commit is contained in:
hdpoliveira
2020-05-30 22:15:23 -03:00
committed by GitHub
parent 99bbfc9034
commit 7cc9f5a46d
2 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6618,22 +6618,22 @@ 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)
void Vehicle::ApplyNonStopBlockBrake()
{
if (vehicle->velocity >= 0)
if (velocity >= 0)
{
// If the vehicle is below the speed limit
if (vehicle->velocity <= BLOCK_BRAKE_BASE_SPEED)
if (velocity <= BLOCK_BRAKE_BASE_SPEED)
{
// Boost it to the fixed block brake speed
vehicle->velocity = BLOCK_BRAKE_BASE_SPEED;
vehicle->acceleration = 0;
velocity = BLOCK_BRAKE_BASE_SPEED;
acceleration = 0;
}
else
{
// Slow it down till the fixed block brake speed
vehicle->velocity -= vehicle->velocity >> 4;
vehicle->acceleration = 0;
velocity -= velocity >> 4;
acceleration = 0;
}
}
}
@@ -6642,27 +6642,19 @@ static void apply_non_stop_block_brake(Vehicle* vehicle)
*
* Modifies the train's velocity influenced by a block brake
*/
static void apply_block_brakes(Vehicle* vehicle, bool is_block_brake_closed)
void Vehicle::ApplyStopBlockBrake()
{
// If the site is in a "train blocking" state
if (is_block_brake_closed)
// Slow it down till completely stop the car
_vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_10;
acceleration = 0;
// If the this is slow enough, stop it. If not, slow it down
if (velocity <= 0x20000)
{
// Slow it down till completely stop the car
_vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_10;
vehicle->acceleration = 0;
// If the vehicle is slow enough, stop it. If not, slow it down
if (vehicle->velocity <= 0x20000)
{
vehicle->velocity = 0;
}
else
{
vehicle->velocity -= vehicle->velocity >> 3;
}
velocity = 0;
}
else
{
apply_non_stop_block_brake(vehicle);
velocity -= velocity >> 3;
}
}
@@ -6699,10 +6691,10 @@ void Vehicle::CheckAndApplyBlockSectionStopSite()
switch (trackType)
{
case TRACK_ELEM_BLOCK_BRAKES:
if (curRide->IsBlockSectioned())
apply_block_brakes(this, trackElement->AsTrack()->BlockBrakeClosed());
if (curRide->IsBlockSectioned() && trackElement->AsTrack()->BlockBrakeClosed())
ApplyStopBlockBrake();
else
apply_non_stop_block_brake(this);
ApplyNonStopBlockBrake();
break;
case TRACK_ELEM_END_STATION:
@@ -6721,7 +6713,7 @@ void Vehicle::CheckAndApplyBlockSectionStopSite()
{
if (trackElement->AsTrack()->BlockBrakeClosed())
{
apply_block_brakes(this, true);
ApplyStopBlockBrake();
}
}
}

2
src/openrct2/ride/Vehicle.h
View File

@@ -381,6 +381,8 @@ private:
void UpdateHandleWaterSplash() const;
void Claxon() const;
void UpdateTrackMotionUpStopCheck() const;
void ApplyNonStopBlockBrake();
void ApplyStopBlockBrake();
void CheckAndApplyBlockSectionStopSite();
void UpdateVelocity();
bool OpenRestraints();