dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check blocking train reservation before removing signals in CmdRemoveSingleRail

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-12-05 21:37:08 +00:00
parent 24fb390e9f
commit de6cf4de24
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/rail_cmd.cpp
View File

@@ -967,12 +967,6 @@ CommandCost CmdRemoveSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1,
cost.AddCost(RailClearCost(GetTileRailTypeByTrackBit(tile, trackbit))); cost.AddCost(RailClearCost(GetTileRailTypeByTrackBit(tile, trackbit)));
/* Charge extra to remove signals on the track, if they are there */
if (HasSignalOnTrack(tile, track)) {
if (flags & DC_EXEC) CheckRemoveSignal(tile, track);
cost.AddCost(DoCommand(tile, track, 0, flags, CMD_REMOVE_SIGNALS));
}
if (HasReservedTracks(tile, trackbit)) { if (HasReservedTracks(tile, trackbit)) {
v = GetTrainForReservation(tile, track); v = GetTrainForReservation(tile, track);
if (v != nullptr) { if (v != nullptr) {
@@ -981,6 +975,11 @@ CommandCost CmdRemoveSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1,
} }
} }
/* Charge extra to remove signals on the track, if they are there */
if (HasSignalOnTrack(tile, track)) {
cost.AddCost(DoCommand(tile, track, 0, flags, CMD_REMOVE_SIGNALS));
}
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
if (v != nullptr) FreeTrainTrackReservation(v); if (v != nullptr) FreeTrainTrackReservation(v);