cpp/openttd-patchpack/source Changeset - r3136:1093719fec82

Changeset - r3136:1093719fec82

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

tron - 18 years ago 2006-03-03 21:18:19
tron@openttd.org

(svn r3751) -Fix: Correctly implement minimum search, so road vehicles head twoards the closest station, not the last one in the list

1 file changed with 12 insertions and 3 deletions:

roadveh_cmd.c

0 comments (0 inline, 0 general)

roadveh_cmd.c

➞

Show inline comments

@@ @@ -633,8 +633,9 @@ static void ProcessRoadVehOrder(Vehicle @@
 	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 @@
 			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;
+	}

0 comments (0 inline, 0 general)