mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Part of #9473: Create Vehicle::SimulateCrash 

Converted from vehicle_simulate_crash
This commit is contained in:
hdpoliveira 2020-04-19 22:58:15 -03:00
parent 0fdc6531dc
commit 3b099f52d0
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3484,12 +3484,12 @@ void Vehicle::CheckIfMissing()
}
}
static void vehicle_simulate_crash(Vehicle* vehicle)
void Vehicle::SimulateCrash() const
{
auto ride = get_ride(vehicle->ride);
if (ride != nullptr)
auto curRide = get_ride(ride);
if (curRide != nullptr)
{
ride->lifecycle_flags |= RIDE_LIFECYCLE_CRASHED;
curRide->lifecycle_flags |= RIDE_LIFECYCLE_CRASHED;
}
}
@ -3507,7 +3507,7 @@ void Vehicle::UpdateCollisionSetup()
if (curRide->status == RIDE_STATUS_SIMULATING)
{
vehicle_simulate_crash(this);
SimulateCrash();
return;
}
@ -3589,7 +3589,7 @@ void Vehicle::UpdateCrashSetup()
auto curRide = get_ride(ride);
if (curRide != nullptr && curRide->status == RIDE_STATUS_SIMULATING)
{
vehicle_simulate_crash(this);
SimulateCrash();
return;
}
SetState(VEHICLE_STATUS_CRASHING, sub_state);
@ -5238,7 +5238,7 @@ void Vehicle::CrashOnLand()
if (curRide->status == RIDE_STATUS_SIMULATING)
{
vehicle_simulate_crash(this);
SimulateCrash();
return;
}
SetState(VEHICLE_STATUS_CRASHED, sub_state);
@ -5301,7 +5301,7 @@ void Vehicle::CrashOnWater()
if (curRide->status == RIDE_STATUS_SIMULATING)
{
vehicle_simulate_crash(this);
SimulateCrash();
return;
}
SetState(VEHICLE_STATUS_CRASHED, sub_state);

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

@ -386,6 +386,7 @@ private:
bool CloseRestraints();
void CrashOnWater();
void CrashOnLand();
void SimulateCrash() const;
};
struct train_ref