Mercurial > hg > openttd
changeset 3136:95adfedf12e4 draft
(svn r3751) -Fix: Correctly implement minimum search, so road vehicles head twoards the closest station, not the last one in the list
author | tron <tron@openttd.org> |
---|---|
date | Fri, 03 Mar 2006 21:18:19 +0000 |
parents | 75cfc0f3bc02 |
children | 50fda31aeccd |
files | roadveh_cmd.c |
diffstat | 1 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/roadveh_cmd.c +++ b/roadveh_cmd.c @@ -633,8 +633,9 @@ if (order->type == OT_GOTO_STATION) { const Station* st = GetStation(order->station); - uint mindist = 0xFFFFFFFF; const RoadStop* rs; + TileIndex dest; + uint mindist; if (order->station == v->last_station_visited) { v->last_station_visited = INVALID_STATION; @@ -649,9 +650,17 @@ return; } - for (; rs != NULL; rs = rs->next) { - if (DistanceManhattan(v->tile, rs->xy) < mindist) v->dest_tile = rs->xy; + dest = rs->xy; + mindist = DistanceManhattan(v->tile, rs->xy); + for (rs = rs->next; rs != NULL; rs = rs->next) { + uint dist = DistanceManhattan(v->tile, rs->xy); + + if (dist < mindist) { + mindist = dist; + dest = rs->xy; + } } + v->dest_tile = dest; } else if (order->type == OT_GOTO_DEPOT) { v->dest_tile = GetDepot(order->station)->xy; }