diff options
| author | Peter Nelson <peter1138@openttd.org> | 2018-05-18 22:16:15 +0100 |
|---|---|---|
| committer | Patric Stout <truebrain@openttd.org> | 2019-03-03 20:59:44 +0100 |
| commit | 3f327116db615a902c0ddf149fd35d031955fcfa (patch) | |
| tree | 4a68078512d3365c639444098fc04edd801b5dde /src/ship_cmd.cpp | |
| parent | a67ee025294278f9113a1c8bcb5ee91d9e174f69 (diff) | |
| download | openttd-3f327116db615a902c0ddf149fd35d031955fcfa.tar.xz | |
Change: Don't apply forbid 90 deg turn settings to ships.
Diffstat (limited to 'src/ship_cmd.cpp')
| -rw-r--r-- | src/ship_cmd.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index c2ce5adc9..0f3f7b74d 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -474,14 +474,7 @@ static Track ChooseShipTrack(Ship *v, TileIndex tile, DiagDirection enterdir, Tr /* No destination or destination too far, don't invoke pathfinder. */ track = TrackBitsToTrack(v->state); if (!IsDiagonalTrack(track)) 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); - } + if (!HasBit(tracks, track)) track = FindFirstTrack(tracks); path_found = false; } else { /* Attempt to follow cached path. */ |