From 6b0a467a50c706546129044a5bd6013bf6d310a1 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Sun, 13 Jan 2019 23:29:29 +0000 Subject: Change: Obey forbid_90_deg_turns when choosing available track with no destination. --- src/ship_cmd.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index 1594c2bf4..ab1f59f11 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -465,6 +465,10 @@ static Track ChooseShipTrack(Ship *v, TileIndex tile, DiagDirection enterdir, Tr if (track != TRACK_X && track != TRACK_Y) track = TrackToOppositeTrack(track); if (!HasBit(tracks, track)) { /* Can't continue in same direction so pick first available track. */ + if (_settings_game.pf.forbid_90_deg) { + tracks &= ~TrackCrossesTracks(TrackdirToTrack(v->GetVehicleTrackdir())); + if (tracks == TRACK_BIT_NONE) return INVALID_TRACK; + } track = FindFirstTrack(tracks); } path_found = false; -- cgit v1.2.3-70-g09d2