mirror of
https://github.com/JGRennison/OpenTTD-patches.git
synced 2024-11-16 00:12:51 +00:00
(svn r3751) -Fix: Correctly implement minimum search, so road vehicles head twoards the closest station, not the last one in the list
This commit is contained in:
parent
08720b6fd7
commit
c91a2e0f26
@ -633,8 +633,9 @@ static void ProcessRoadVehOrder(Vehicle *v)
|
||||
|
||||
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 @@ static void ProcessRoadVehOrder(Vehicle *v)
|
||||
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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user