summaryrefslogtreecommitdiff
path: root/roadveh_cmd.c
diff options
context:
space:
mode:
authorcelestar <celestar@openttd.org>2006-03-31 19:10:54 +0000
committercelestar <celestar@openttd.org>2006-03-31 19:10:54 +0000
commit2ab5b8e666d14df7437bfa01a78f7ade3af69fa5 (patch)
treeb1afcd4a3ffa7895ccd33c4d034fb543b8d4765f /roadveh_cmd.c
parentbb8bdcb5d91bf76c164813fc8d2d27f86bd3da76 (diff)
downloadopenttd-2ab5b8e666d14df7437bfa01a78f7ade3af69fa5.tar.xz
(svn r4215) -Codechange: Renamed *RoadStation* functions to *RoadStop* and moved them to station_map.h to keep consistency
Diffstat (limited to 'roadveh_cmd.c')
-rw-r--r--roadveh_cmd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/roadveh_cmd.c b/roadveh_cmd.c
index d3b6ae63d..2ee1a3c72 100644
--- a/roadveh_cmd.c
+++ b/roadveh_cmd.c
@@ -1012,7 +1012,7 @@ static int RoadFindPathToDest(Vehicle* v, TileIndex tile, DiagDirection enterdir
/* Road depot */
bitmask |= _road_veh_fp_ax_or[GetRoadDepotDirection(tile)];
}
- } else if (IsTileType(tile, MP_STATION) && IsRoadStationTile(tile)) {
+ } else if (IsTileType(tile, MP_STATION) && IsRoadStopTile(tile)) {
if (IsTileOwner(tile, v->owner)) {
/* Our station */
RoadStopType rstype = (v->cargo_type == CT_PASSENGERS) ? RS_BUS : RS_TRUCK;
@@ -1021,7 +1021,7 @@ static int RoadFindPathToDest(Vehicle* v, TileIndex tile, DiagDirection enterdir
const RoadStop *rs = GetRoadStopByTile(tile, rstype);
if (rs != NULL && (_patches.roadveh_queue || GB(rs->status, 0, 2) != 0)) {
- bitmask |= _road_veh_fp_ax_or[GetRoadStationDir(tile)];
+ bitmask |= _road_veh_fp_ax_or[GetRoadStopDir(tile)];
}
}
}
@@ -1089,7 +1089,7 @@ static int RoadFindPathToDest(Vehicle* v, TileIndex tile, DiagDirection enterdir
}
} else if (IsTileType(desttile, MP_STATION)) {
if (IsRoadStop(desttile)) {
- dir = GetRoadStationDir(desttile);
+ dir = GetRoadStopDir(desttile);
do_it:;
/* When we are heading for a depot or station, we just
* pretend we are heading for the tile in front, we'll