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

Fix crash when clearing tunnel where only near end is reserved with realistic braking

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-06-15 18:26:39 +01:00
parent 3392d25aa3
commit a8ce0ac787
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/tunnelbridge_cmd.cpp
View File

@@ -1206,13 +1206,17 @@ static CommandCost DoClearTunnel(TileIndex tile, DoCommandFlag flags)
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
} }
if (GetTunnelBridgeTransportType(tile) == TRANSPORT_RAIL && _settings_game.vehicle.train_braking_model == TBM_REALISTIC && HasTunnelReservation(tile)) { if (GetTunnelBridgeTransportType(tile) == TRANSPORT_RAIL && _settings_game.vehicle.train_braking_model == TBM_REALISTIC) {
DiagDirection dir = GetTunnelBridgeDirection(tile); DiagDirection dir = GetTunnelBridgeDirection(tile);
Track track = DiagDirToDiagTrack(dir); Track track = DiagDirToDiagTrack(dir);
CommandCost ret = CheckTrainReservationPreventsTrackModification(tile, track); if (HasTunnelReservation(tile)) {
if (ret.Failed()) return ret; CommandCost ret = CheckTrainReservationPreventsTrackModification(tile, track);
ret = CheckTrainReservationPreventsTrackModification(endtile, track); if (ret.Failed()) return ret;
if (ret.Failed()) return ret; }
if (HasTunnelReservation(endtile)) {
ret = CheckTrainReservationPreventsTrackModification(endtile, track);
if (ret.Failed()) return ret;
}
} }
/* checks if the owner is town then decrease town rating by RATING_TUNNEL_BRIDGE_DOWN_STEP until /* checks if the owner is town then decrease town rating by RATING_TUNNEL_BRIDGE_DOWN_STEP until