From f703e233220069c33dcb6cdea7ceb171152d8687 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sat, 29 May 2021 02:22:27 +0100 Subject: [PATCH] Fix assert fail when ChooseTrainTrack called on disallowed 90 degree turn --- src/train_cmd.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 224e05364f..da8c226bd7 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -4004,8 +4004,7 @@ static Track ChooseTrainTrack(Train *v, TileIndex tile, DiagDirection enterdir, if (KillFirstBit(tracks) == TRACK_BIT_NONE) { Track track = FindFirstTrack(tracks); /* We need to check for signals only here, as a junction tile can't have signals. */ - Trackdir td = TrackEnterdirToTrackdir(track, enterdir); - if (track != INVALID_TRACK && HasPbsSignalOnTrackdir(tile, td)) { + if (track != INVALID_TRACK && HasPbsSignalOnTrackdir(tile, TrackEnterdirToTrackdir(track, enterdir))) { if (IsRestrictedSignal(tile) && v->force_proceed != TFP_SIGNAL) { const TraceRestrictProgram *prog = GetExistingTraceRestrictProgram(tile, track); if (prog && prog->actions_used_flags & (TRPAUF_WAIT_AT_PBS | TRPAUF_SLOT_ACQUIRE | TRPAUF_TRAIN_NOT_STUCK)) {