From 3b099f52d08109c91018fbd25fc2751aaa8b22d6 Mon Sep 17 00:00:00 2001 From: hdpoliveira Date: Sun, 19 Apr 2020 22:58:15 -0300 Subject: [PATCH] Part of #9473: Create Vehicle::SimulateCrash Converted from vehicle_simulate_crash --- src/openrct2/ride/Vehicle.cpp | 16 ++++++++-------- src/openrct2/ride/Vehicle.h | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 0935bfb622..265d6ac42c 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -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); diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h index d66324588c..9ec071a63c 100644 --- a/src/openrct2/ride/Vehicle.h +++ b/src/openrct2/ride/Vehicle.h @@ -386,6 +386,7 @@ private: bool CloseRestraints(); void CrashOnWater(); void CrashOnLand(); + void SimulateCrash() const; }; struct train_ref