From 7e452d6341930f6fa657a863d81063f6fd113a1a Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 15 Oct 2022 17:21:28 +0100 Subject: [PATCH] Normal/shunt mode signals default to shunt mode for depot routes --- src/signal.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/signal.cpp b/src/signal.cpp index be255173a1..c1c94cf279 100644 --- a/src/signal.cpp +++ b/src/signal.cpp @@ -1586,7 +1586,14 @@ void DetermineCombineNormalShuntModeWithLookahead(Train *v, TileIndex tile, Trac } } - if (IsRailDepotTile(v->lookahead->reservation_end_tile) || IsTileType(v->lookahead->reservation_end_tile, MP_TUNNELBRIDGE)) return; + if (IsTileType(v->lookahead->reservation_end_tile, MP_TUNNELBRIDGE)) return; + + if (IsRailDepotTile(v->lookahead->reservation_end_tile)) { + /* shunt mode */ + SetSignalAspect(tile, TrackdirToTrack(trackdir), 1); + SetBit(item.data_aux, TRSLAI_COMBINED_SHUNT); + return; + } CFollowTrackRail ft(v); if (ft.Follow(v->lookahead->reservation_end_tile, v->lookahead->reservation_end_trackdir)) {