Fix #7062, Revert 7af53d7588: Don't test ship max order distance when pathfinding.

This commit is contained in:
peter1138 2019-02-25 13:07:22 +00:00 committed by PeterN
parent d0e8060182
commit 66bed86bbb

View File

@ -466,8 +466,8 @@ static Track ChooseShipTrack(Ship *v, TileIndex tile, DiagDirection enterdir, Tr
bool path_found = true; bool path_found = true;
Track track; Track track;
if (v->dest_tile == 0 || DistanceManhattan(tile, v->dest_tile) > SHIP_MAX_ORDER_DISTANCE + 5) { if (v->dest_tile == 0) {
/* No destination or destination too far, don't invoke pathfinder. */ /* No destination, don't invoke pathfinder. */
track = TrackBitsToTrack(v->state); track = TrackBitsToTrack(v->state);
if (!IsDiagonalTrack(track)) track = TrackToOppositeTrack(track); if (!IsDiagonalTrack(track)) track = TrackToOppositeTrack(track);
if (!HasBit(tracks, track)) track = FindFirstTrack(tracks); if (!HasBit(tracks, track)) track = FindFirstTrack(tracks);