diff options
author | rubidium <rubidium@openttd.org> | 2009-07-24 11:47:12 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-07-24 11:47:12 +0000 |
commit | cf38a5bee6628f4be58a1bd7774658cf86807d5c (patch) | |
tree | 2c2890dd002ff6aee0e4fc1905796b623a040153 /src/pbs.cpp | |
parent | 2c6b5237f68b1ce444f35eef6e31e7c0ff49d7cc (diff) | |
download | openttd-cf38a5bee6628f4be58a1bd7774658cf86807d5c.tar.xz |
(svn r16939) -Codechange: s/RailwayStation/RailStation/ to unify the way it's written.
Diffstat (limited to 'src/pbs.cpp')
-rw-r--r-- | src/pbs.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pbs.cpp b/src/pbs.cpp index 32440f914..9b85ed9e7 100644 --- a/src/pbs.cpp +++ b/src/pbs.cpp @@ -41,21 +41,21 @@ TrackBits GetReservedTrackbits(TileIndex t) /** * Set the reservation for a complete station platform. - * @pre IsRailwayStationTile(start) + * @pre IsRailStationTile(start) * @param start starting tile of the platform * @param dir the direction in which to follow the platform * @param b the state the reservation should be set to */ -void SetRailwayStationPlatformReservation(TileIndex start, DiagDirection dir, bool b) +void SetRailStationPlatformReservation(TileIndex start, DiagDirection dir, bool b) { TileIndex tile = start; TileIndexDiff diff = TileOffsByDiagDir(dir); - assert(IsRailwayStationTile(start)); + assert(IsRailStationTile(start)); assert(GetRailStationAxis(start) == DiagDirToAxis(dir)); do { - SetRailwayStationReservation(tile, b); + SetRailStationReservation(tile, b); MarkTileDirtyByTile(tile); tile = TILE_ADD(tile, diff); } while (IsCompatibleTrainStationTile(tile, start)); @@ -100,7 +100,7 @@ bool TryReserveRailTrack(TileIndex tile, Track t) case MP_STATION: if (HasStationRail(tile) && !HasStationReservation(tile)) { - SetRailwayStationReservation(tile, true); + SetRailStationReservation(tile, true); MarkTileDirtyByTile(tile); // some GRFs need redraw after reserving track return true; } @@ -151,7 +151,7 @@ bool TryReserveRailTrack(TileIndex tile, Track t) case MP_STATION: if (HasStationRail(tile)) { - SetRailwayStationReservation(tile, false); + SetRailStationReservation(tile, false); MarkTileDirtyByTile(tile); } break; @@ -295,7 +295,7 @@ Train *GetTrainForReservation(TileIndex tile, Track track) if (ftoti.best != NULL) return ftoti.best; /* Special case for stations: check the whole platform for a vehicle. */ - if (IsRailwayStationTile(ftoti.res.tile)) { + if (IsRailStationTile(ftoti.res.tile)) { TileIndexDiff diff = TileOffsByDiagDir(TrackdirToExitdir(ReverseTrackdir(ftoti.res.trackdir))); for (TileIndex st_tile = ftoti.res.tile + diff; IsCompatibleTrainStationTile(st_tile, ftoti.res.tile); st_tile += diff) { FindVehicleOnPos(st_tile, &ftoti, FindTrainOnTrackEnum); |