mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

release/0.6
rubidium 2007-05-30 18:22:56 +00:00
parent 70e6102c86
commit 2bfc36c1ba
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/roadveh_cmd.cpp
View File

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