mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #10741: Rail platforms left partially reserved after train crash (#10751)

pull/10764/head
Jonathan G Rennison 2023-05-04 21:45:13 +01:00 committed by GitHub
parent 7ccdefa1c1
commit 8d501f2db1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/train_cmd.cpp
View File

@ -3550,6 +3550,20 @@ static Vehicle *CollectTrackbitsFromCrashedVehiclesEnum(Vehicle *v, void *data)
return nullptr; return nullptr;
} }
static bool IsRailStationPlatformOccupied(TileIndex tile)
{
TileIndexDiff delta = (GetRailStationAxis(tile) == AXIS_X ? TileDiffXY(1, 0) : TileDiffXY(0, 1));
for (TileIndex t = tile; IsCompatibleTrainStationTile(t, tile); t -= delta) {
if (HasVehicleOnPos(t, nullptr, &TrainOnTileEnum)) return true;
}
for (TileIndex t = tile + delta; IsCompatibleTrainStationTile(t, tile); t += delta) {
if (HasVehicleOnPos(t, nullptr, &TrainOnTileEnum)) return true;
}
return false;
}
/** /**
* Deletes/Clears the last wagon of a crashed train. It takes the engine of the * Deletes/Clears the last wagon of a crashed train. It takes the engine of the
* train, then goes to the last wagon and deletes that. Each call to this function * train, then goes to the last wagon and deletes that. Each call to this function
@ -3608,6 +3622,13 @@ static void DeleteLastWagon(Train *v)
/* check if the wagon was on a road/rail-crossing */ /* check if the wagon was on a road/rail-crossing */
if (IsLevelCrossingTile(tile)) UpdateLevelCrossing(tile); if (IsLevelCrossingTile(tile)) UpdateLevelCrossing(tile);
if (IsRailStationTile(tile)) {
bool occupied = IsRailStationPlatformOccupied(tile);
DiagDirection dir = AxisToDiagDir(GetRailStationAxis(tile));
SetRailStationPlatformReservation(tile, dir, occupied);
SetRailStationPlatformReservation(tile, ReverseDiagDir(dir), occupied);
}
/* Update signals */ /* Update signals */
if (IsTileType(tile, MP_TUNNELBRIDGE) || IsRailDepotTile(tile)) { if (IsTileType(tile, MP_TUNNELBRIDGE) || IsRailDepotTile(tile)) {
UpdateSignalsOnSegment(tile, INVALID_DIAGDIR, owner); UpdateSignalsOnSegment(tile, INVALID_DIAGDIR, owner);