From 9ee3bf7fcfd7e4787fab5d681375e0424f89f62b Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 15 Oct 2022 17:20:50 +0100 Subject: [PATCH] Fix normal/shunt signal mode with intermediary shunt signals --- src/signal.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/signal.cpp b/src/signal.cpp index 6d98405c12..be255173a1 100644 --- a/src/signal.cpp +++ b/src/signal.cpp @@ -1581,8 +1581,8 @@ void DetermineCombineNormalShuntModeWithLookahead(Train *v, TileIndex tile, Trac for (size_t j = i + 1; j < count; j++) { const TrainReservationLookAheadItem &ahead = v->lookahead->items[j]; if (ahead.type == TRLIT_SIGNAL) { - if (HasBit(item.data_aux, TRSLAI_COMBINED)) return; - if (!HasBit(item.data_aux, TRSLAI_NO_ASPECT_INC) && !HasBit(item.data_aux, TRSLAI_NEXT_ONLY)) return; + if (HasBit(ahead.data_aux, TRSLAI_COMBINED)) return; + if (!HasBit(ahead.data_aux, TRSLAI_NO_ASPECT_INC) && !HasBit(ahead.data_aux, TRSLAI_NEXT_ONLY)) return; } }