cpp/openttd-patchpack/source Changeset - r6754:717f1444dfd8

Changeset - r6754:717f1444dfd8

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 17 years ago 2007-05-30 18:22:56
rubidium@openttd.org

(svn r9989) -Fix [FS#817]: trams/road vehicles did go to the closest road stop regardless whether they could actually "drive" on there.

1 file changed with 10 insertions and 4 deletions:

src/roadveh_cmd.cpp

0 comments (0 inline, 0 general)

src/roadveh_cmd.cpp

➞

Show inline comments

@@ @@ -729,11 +729,14 @@ static void ProcessRoadVehOrder(Vehicle @@
 				IsCargoInClass(v->cargo_type, CC_PASSENGERS) ? RoadStop::BUS : RoadStop::TRUCK
 			);
 			TileIndex dest = INVALID_TILE;
 			if (rs != NULL) {
 				TileIndex dest = rs->xy;
 				uint mindist = DistanceManhattan(v->tile, rs->xy);
 				uint mindist = MAX_UVALUE(uint);
 				for (rs = rs->next; rs != NULL; rs = rs->next) {
 				for (; rs != NULL; rs = rs->next) {
 					/* The vehicle cannot go to this roadstop */
 					if ((GetRoadTypes(rs->xy) & v->u.road.compatible_roadtypes) == ROADTYPES_NONE) continue;
 					uint dist = DistanceManhattan(v->tile, rs->xy);
 					if (dist < mindist) {
@@ @@ -741,7 +744,10 @@ static void ProcessRoadVehOrder(Vehicle @@
 						dest = rs->xy;
+					}
+				}
 				v->dest_tile = dest;
+			}
 			if (dest != INVALID_TILE) {
 					v->dest_tile = dest;
 			} else {
 				/* There is no stop left at the station, so don't even TRY to go there */
 				v->cur_order_index++;

0 comments (0 inline, 0 general)