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

Part of #9473: Create Vehicle::UpdateVelocity

Browse Source 
Converted from update_velocity
This commit is contained in:
hdpoliveira
2020-04-19 22:14:13 -03:00
parent 48045950c1
commit bfe5366dbe
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6674,27 +6674,27 @@ void Vehicle::CheckAndApplyBlockSectionStopSite()
*
* rct2: 0x006DADAE
*/
static void update_velocity(Vehicle* vehicle)
void Vehicle::UpdateVelocity()
{
int32_t nextVelocity = vehicle->acceleration + vehicle->velocity;
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_ZERO_VELOCITY)
int32_t nextVelocity = acceleration + velocity;
if (update_flags & VEHICLE_UPDATE_FLAG_ZERO_VELOCITY)
{
nextVelocity = 0;
}
if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_ON_BREAK_FOR_DROP)
if (update_flags & VEHICLE_UPDATE_FLAG_ON_BREAK_FOR_DROP)
{
vehicle->vertical_drop_countdown--;
if (vehicle->vertical_drop_countdown == -70)
vertical_drop_countdown--;
if (vertical_drop_countdown == -70)
{
vehicle->update_flags &= ~VEHICLE_UPDATE_FLAG_ON_BREAK_FOR_DROP;
update_flags &= ~VEHICLE_UPDATE_FLAG_ON_BREAK_FOR_DROP;
}
if (vehicle->vertical_drop_countdown >= 0)
if (vertical_drop_countdown >= 0)
{
nextVelocity = 0;
vehicle->acceleration = 0;
acceleration = 0;
}
}
vehicle->velocity = nextVelocity;
velocity = nextVelocity;
_vehicleVelocityF64E08 = nextVelocity;
_vehicleVelocityF64E0C = (nextVelocity >> 10) * 42;
@@ -9537,7 +9537,7 @@ int32_t Vehicle::UpdateTrackMotion(int32_t* outStation)
UpdateTrackMotionUpStopCheck();
CheckAndApplyBlockSectionStopSite();
update_velocity(this);
UpdateVelocity();
Vehicle* vehicle = this;
if (_vehicleVelocityF64E08 < 0)

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

@@ -381,6 +381,7 @@ private:
void Claxon() const;
void UpdateTrackMotionUpStopCheck() const;
void CheckAndApplyBlockSectionStopSite();
void UpdateVelocity();
};
struct train_ref