mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-20 02:42:42 +01:00
Code Issues Releases Wiki Activity

Add: [Script] Include number of victims in ScriptEventVehicleCrashed (#12861)

Browse Source
This commit is contained in:
Loïc Guilloux
2024-07-16 21:28:29 +02:00
committed by GitHub
parent eeed824329
commit d67963e616
8 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/train_cmd.cpp
View File

@@ -3086,9 +3086,9 @@ void Train::ReserveTrackUnderConsist() const
*/
uint Train::Crash(bool flooded)
{
uint pass = 0;
uint victims = 0;
if (this->IsFrontEngine()) {
pass += 2; // driver
victims += 2; // driver
/* Remove the reserved path in front of the train if it is not stuck.
* Also clear all reserved tracks the train is currently on. */
@@ -3111,10 +3111,10 @@ uint Train::Crash(bool flooded)
HideFillingPercent(&this->fill_percent_te_id);
}
pass += this->GroundVehicleBase::Crash(flooded);
victims += this->GroundVehicleBase::Crash(flooded);
this->crash_anim_pos = flooded ? 4000 : 1; // max 4440, disappear pretty fast when flooded
return pass;
return victims;
}
/**
@@ -3125,20 +3125,20 @@ uint Train::Crash(bool flooded)
*/
static uint TrainCrashed(Train *v)
{
uint num = 0;
uint victims = 0;
/* do not crash train twice */
if (!(v->vehstatus & VS_CRASHED)) {
num = v->Crash();
AI::NewEvent(v->owner, new ScriptEventVehicleCrashed(v->index, v->tile, ScriptEventVehicleCrashed::CRASH_TRAIN));
Game::NewEvent(new ScriptEventVehicleCrashed(v->index, v->tile, ScriptEventVehicleCrashed::CRASH_TRAIN));
victims = v->Crash();
AI::NewEvent(v->owner, new ScriptEventVehicleCrashed(v->index, v->tile, ScriptEventVehicleCrashed::CRASH_TRAIN, victims));
Game::NewEvent(new ScriptEventVehicleCrashed(v->index, v->tile, ScriptEventVehicleCrashed::CRASH_TRAIN, victims));
}
/* Try to re-reserve track under already crashed train too.
* Crash() clears the reservation! */
v->ReserveTrackUnderConsist();
return num;
return victims;
}
/** Temporary data storage for testing collisions. */