mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Change: Don't pathfind with no destination or if destination is known to be too far.

pull/7070/head
Peter Nelson 2018-05-18 09:05:24 +01:00 committed by Charles Pigott
parent 6a38a3f5df
commit ebddd596c7
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/ship_cmd.cpp
View File

@ -446,11 +446,38 @@ static Track ChooseShipTrack(Ship *v, TileIndex tile, DiagDirection enterdir, Tr
bool path_found = true; bool path_found = true;
Track track; Track track;
switch (_settings_game.pf.pathfinder_for_ships) {
case VPF_OPF: track = OPFShipChooseTrack(v, tile, enterdir, tracks, path_found); break; if (v->dest_tile == 0 || DistanceManhattan(tile, v->dest_tile) > 130) {
case VPF_NPF: track = NPFShipChooseTrack(v, tile, enterdir, tracks, path_found); break; /* No destination or destination too far, don't invoke pathfinder. */
case VPF_YAPF: track = YapfShipChooseTrack(v, tile, enterdir, tracks, path_found); break; static const TrackBits direction_to_trackbits[DIR_END] = {
default: NOT_REACHED(); TRACK_BIT_LEFT | TRACK_BIT_RIGHT, // DIR_N
TRACK_BIT_X, // DIR_NE
TRACK_BIT_UPPER | TRACK_BIT_LOWER, // DIR_E
TRACK_BIT_Y, // DIR_SE
TRACK_BIT_LEFT | TRACK_BIT_RIGHT, // DIR_S
TRACK_BIT_X, // DIR_SW
TRACK_BIT_UPPER | TRACK_BIT_LOWER, // DIR_W
TRACK_BIT_Y, // DIR_NW
};
TrackBits next_tracks = direction_to_trackbits[v->direction] & tracks;
if (next_tracks != TRACK_BIT_NONE) {
/* Continue in same direction when possible. */
track = (Track)FindFirstBit(next_tracks);
} else {
/* Pick a random track. */
do {
track = (Track)RandomRange(TRACK_END);
} while ((TrackToTrackBits(track) & tracks) == TRACK_BIT_NONE);
}
path_found = false;
} else {
switch (_settings_game.pf.pathfinder_for_ships) {
case VPF_OPF: track = OPFShipChooseTrack(v, tile, enterdir, tracks, path_found); break;
case VPF_NPF: track = NPFShipChooseTrack(v, tile, enterdir, tracks, path_found); break;
case VPF_YAPF: track = YapfShipChooseTrack(v, tile, enterdir, tracks, path_found); break;
default: NOT_REACHED();
}
} }
v->HandlePathfindingResult(path_found); v->HandlePathfindingResult(path_found);