Change: Avoid crashing to the side of a train

When a road vehicle is already running on a multi level crossing, and a train shows up ahead, don't make the road vehicle crash on the side of the train.
This commit is contained in:
SamuXarick
2023-02-20 15:19:39 +00:00
committed by rubidium42
parent 8351b97f52
commit b52b29b1a4
3 changed files with 19 additions and 1 deletions

View File

@@ -1658,6 +1658,19 @@ static Vehicle *TrainOnTileEnum(Vehicle *v, void *)
return (v->type == VEH_TRAIN) ? v : nullptr;
}
/**
* Check if a level crossing tile has a train on it
* @param tile tile to test
* @return true if a train is on the crossing
* @pre tile is a level crossing
*/
bool TrainOnCrossing(TileIndex tile)
{
assert(IsLevelCrossingTile(tile));
return HasVehicleOnPos(tile, nullptr, &TrainOnTileEnum);
}
/**
* Checks if a train is approaching a rail-road crossing
@@ -1709,7 +1722,7 @@ static bool TrainApproachingCrossing(TileIndex tile)
static inline bool CheckLevelCrossing(TileIndex tile)
{
/* reserved || train on crossing || train approaching crossing */
return HasCrossingReservation(tile) || HasVehicleOnPos(tile, NULL, &TrainOnTileEnum) || TrainApproachingCrossing(tile);
return HasCrossingReservation(tile) || TrainOnCrossing(tile) || TrainApproachingCrossing(tile);
}
/**