Normal/shunt mode signals default to shunt mode for depot routes

2 years ago · 7e452d6341
parent 9ee3bf7fcf
commit 7e452d6341
1 changed files with 8 additions and 1 deletions
--- 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)) {