From 5c569b1880e0f7521d5b01527722081692fdb926 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 30 Mar 2021 23:10:26 +0100 Subject: [PATCH] Validate TB exit tile when TRLF_TB_EXIT_FREE set in FollowTrainReservation --- src/pbs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pbs.cpp b/src/pbs.cpp index ccd79b2f81..c1fd535276 100644 --- a/src/pbs.cpp +++ b/src/pbs.cpp @@ -678,7 +678,7 @@ PBSTileInfo FollowTrainReservation(const Train *v, Vehicle **train_on_res, Follo if (HasBit(v->lookahead->flags, TRLF_DEPOT_END)) return PBSTileInfo(tile, trackdir, false); if (HasBit(v->lookahead->flags, TRLF_TB_EXIT_FREE)) { TileIndex exit_tile = GetOtherTunnelBridgeEnd(tile); - if (GetTunnelBridgeExitSignalState(exit_tile) == SIGNAL_STATE_GREEN && HasAcrossTunnelBridgeReservation(exit_tile)) { + if (IsTunnelBridgeSignalSimulationExit(exit_tile) && GetTunnelBridgeExitSignalState(exit_tile) == SIGNAL_STATE_GREEN && HasAcrossTunnelBridgeReservation(exit_tile)) { tile = exit_tile; DiagDirection exit_dir = ReverseDiagDir(GetTunnelBridgeDirection(exit_tile)); trackdir = TrackEnterdirToTrackdir(FindFirstTrack(GetAcrossTunnelBridgeTrackBits(exit_tile)), exit_dir);