dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r4215) -Codechange: Renamed *RoadStation* functions to *RoadStop* and moved them to station_map.h to keep consistency

Browse Source
This commit is contained in:
celestar
2006-03-31 19:10:54 +00:00
parent bb8bdcb5d9
commit 2ab5b8e666
7 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roadveh_cmd.c
View File

@@ -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