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::KillPassengers() (#11714)

Browse Source 
* Part of #9473: Create Vehicle::KillPassengers()

Converted from vehicle_kill_all_passengers

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
This commit is contained in:
hdpoliveira
2020-05-17 23:11:19 -03:00
committed by GitHub
parent 2cf95adc4b
commit d93edf77d6
2 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,8 +49,6 @@ static bool vehicle_boat_is_location_accessible(const CoordsXYZ& location);
static bool vehicle_update_motion_collision_detection(
Vehicle* vehicle, int16_t x, int16_t y, int16_t z, uint16_t* otherVehicleIndex);
static void vehicle_kill_all_passengers(Vehicle* vehicle);
constexpr int16_t VEHICLE_MAX_SPIN_SPEED = 1536;
constexpr int16_t VEHICLE_MIN_SPIN_SPEED = -VEHICLE_MAX_SPIN_SPEED;
constexpr int16_t VEHICLE_MAX_SPIN_SPEED_FOR_STOPPING = 700;
@@ -3599,7 +3597,7 @@ void Vehicle::UpdateCollisionSetup()
curRide->lifecycle_flags |= RIDE_LIFECYCLE_CRASHED;
curRide->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN | RIDE_INVALIDATE_RIDE_LIST;
vehicle_kill_all_passengers(this);
KillAllPassengersInTrain();
Vehicle* lastVehicle = this;
uint16_t spriteId = sprite_index;
@@ -5225,24 +5223,8 @@ static TileElement* vehicle_check_collision(int16_t x, int16_t y, int16_t z)
return nullptr;
}
/**
*
* rct2: 0x006DE6C6
*/
static void vehicle_kill_all_passengers(Vehicle* vehicle)
static void ride_train_crash(Ride* ride, uint16_t numFatalities)
{
auto ride = get_ride(vehicle->ride);
if (ride == nullptr)
return;
uint16_t numFatalities = 0;
uint16_t spriteId = vehicle->sprite_index;
for (Vehicle* curVehicle; spriteId != SPRITE_INDEX_NULL; spriteId = curVehicle->next_vehicle_on_train)
{
curVehicle = GET_VEHICLE(spriteId);
numFatalities += curVehicle->num_peeps;
}
auto ft = Formatter::Common();
ft.Add<uint16_t>(numFatalities);
@@ -5257,7 +5239,7 @@ static void vehicle_kill_all_passengers(Vehicle* vehicle)
{
ride->FormatNameTo(ft);
news_item_add_to_queue(
NEWS_ITEM_RIDE, numFatalities == 1 ? STR_X_PERSON_DIED_ON_X : STR_X_PEOPLE_DIED_ON_X, vehicle->ride);
NEWS_ITEM_RIDE, numFatalities == 1 ? STR_X_PERSON_DIED_ON_X : STR_X_PEOPLE_DIED_ON_X, ride->id);
}
if (gParkRatingCasualtyPenalty < 500)
@@ -5265,36 +5247,52 @@ static void vehicle_kill_all_passengers(Vehicle* vehicle)
gParkRatingCasualtyPenalty += 200;
}
}
}
/**
*
* rct2: 0x006DE6C6
*/
void Vehicle::KillAllPassengersInTrain()
{
auto curRide = get_ride(ride);
if (curRide == nullptr)
return;
spriteId = vehicle->sprite_index;
ride_train_crash(curRide, NumPeepsUntilTrainTail());
uint16_t spriteId = sprite_index;
for (Vehicle* curVehicle; spriteId != SPRITE_INDEX_NULL; spriteId = curVehicle->next_vehicle_on_train)
{
curVehicle = GET_VEHICLE(spriteId);
if (curVehicle->num_peeps != curVehicle->next_free_seat)
continue;
if (curVehicle->num_peeps == 0)
continue;
for (uint8_t i = 0; i < curVehicle->num_peeps; i++)
{
Peep* peep = GET_PEEP(curVehicle->peep[i]);
if (peep->outside_of_park == 0)
{
decrement_guests_in_park();
auto intent = Intent(INTENT_ACTION_UPDATE_GUEST_COUNT);
context_broadcast_intent(&intent);
}
ride->num_riders--;
peep_sprite_remove(peep);
}
curVehicle->num_peeps = 0;
curVehicle->next_free_seat = 0;
curVehicle->KillPassengers(curRide);
}
}
void Vehicle::KillPassengers(Ride* curRide)
{
if (num_peeps != next_free_seat)
return;
if (num_peeps == 0)
return;
for (auto i = 0; i < num_peeps; i++)
{
Peep* curPeep = GET_PEEP(peep[i]);
if (curPeep->outside_of_park == 0)
{
decrement_guests_in_park();
auto intent = Intent(INTENT_ACTION_UPDATE_GUEST_COUNT);
context_broadcast_intent(&intent);
}
curRide->num_riders--;
peep_sprite_remove(curPeep);
}
num_peeps = 0;
next_free_seat = 0;
}
void Vehicle::CrashOnLand()
{
auto curRide = get_ride(ride);
@@ -5331,7 +5329,7 @@ void Vehicle::CrashOnLand()
if (IsHead())
{
vehicle_kill_all_passengers(this);
KillAllPassengersInTrain();
}
sub_state = 2;
@@ -5394,7 +5392,7 @@ void Vehicle::CrashOnWater()
if (IsHead())
{
vehicle_kill_all_passengers(this);
KillAllPassengersInTrain();
}
sub_state = 2;

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

@@ -388,6 +388,8 @@ private:
void CrashOnWater();
void CrashOnLand();
void SimulateCrash() const;
void KillAllPassengersInTrain();
void KillPassengers(Ride* curRide);
void TrainReadyToDepart(uint8_t num_peeps_on_train, uint8_t num_used_seats);
};