Mercurial > hg > openttd
changeset 16896:87e2867ad7a3 draft
(svn r21631) -Fix [FS#4325]: ships with the old pathfinder would easily show up as lost, even when it would eventually find a path. Now also the distance from the "end" of the pathfinding run to the destination is compared to the current distance to the destination; if the distance to the destination at the end of the pathfinder run is less than the current distance from the destination the ship won't be marked as lost. This means that the ships with the old pathfinder will less likely get marked as lost, but due to the design of the old ship pathfinder there "lostness" is merely a best guess. When you still get a lost message
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Sat, 25 Dec 2010 12:20:18 +0000 |
| parents | dd473f691ea9 |
| children | 083a488420e0 |
| files | src/pathfinder/opf/opf_ship.cpp |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/pathfinder/opf/opf_ship.cpp +++ b/src/pathfinder/opf/opf_ship.cpp @@ -205,8 +205,11 @@ uint dist = FindShipTrack(v, tile, enterdir, tracks, 0, &track); /* If the dist equals zero, or distr equals one (the extra reversing penalty), - * then we found our destination and we are not lost. */ - path_found = (dist == 0 || distr == 1); + * then we found our destination and we are not lost. + * When we are not lost (yet) and the distance to our destination becomes + * less, then we aren't lost yet. + * So, we only become lost when the distance to our destination increases. */ + path_found = (dist == 0 || distr == 1 || (!(v->vehicle_flags & VF_PATHFINDER_LOST) && min(dist, distr) < DistanceManhattan(tile, v->dest_tile))); if (dist <= distr) return track; return INVALID_TRACK; // We could better reverse }