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

Fix handling of reservations when reserving at one way tunnel-bridge exit

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-06-01 19:22:11 +01:00
parent 7ef8706ed2
commit 05915b2129
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/train_cmd.cpp
View File

@@ -3781,6 +3781,8 @@ void FreeTrainTrackReservation(Train *v, TileIndex origin, Trackdir orig_td)
TileIndex end = GetOtherTunnelBridgeEnd(tile); TileIndex end = GetOtherTunnelBridgeEnd(tile);
bool free = TunnelBridgeIsFree(tile, end, v, TBIFM_ACROSS_ONLY).Succeeded(); bool free = TunnelBridgeIsFree(tile, end, v, TBIFM_ACROSS_ONLY).Succeeded();
if (!free) break; if (!free) break;
} else if (IsTunnelBridgeWithSignalSimulation(tile) && IsTunnelBridgeSignalSimulationExitOnly(tile) && TrackdirEntersTunnelBridge(tile, td)) {
break;
} }
/* Don't free first station/bridge/tunnel if we are on it. */ /* Don't free first station/bridge/tunnel if we are on it. */
@@ -5723,6 +5725,9 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse)
return false; return false;
} }
goto reverse_train_direction; goto reverse_train_direction;
} else if (!(v->track & TRACK_BIT_WORMHOLE) && IsTunnelBridgeWithSignalSimulation(gp.new_tile) &&
IsTunnelBridgeSignalSimulationExitOnly(gp.new_tile) && v->force_proceed == TFP_NONE) {
goto reverse_train_direction;
} else { } else {
TryReserveRailTrack(gp.new_tile, TrackBitsToTrack(chosen_track), false); TryReserveRailTrack(gp.new_tile, TrackBitsToTrack(chosen_track), false);