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/yapf/yapf_rail.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/yapf/yapf_rail.cpp')
| -rw-r--r-- | src/yapf/yapf_rail.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/yapf/yapf_rail.cpp b/src/yapf/yapf_rail.cpp index e6df394ea..89ffa8cbf 100644 --- a/src/yapf/yapf_rail.cpp +++ b/src/yapf/yapf_rail.cpp @@ -63,14 +63,14 @@ private: } /** Reserve a railway platform. Tile contains the failed tile on abort. */ - bool ReserveRailwayStationPlatform(TileIndex &tile, DiagDirection dir) + bool ReserveRailStationPlatform(TileIndex &tile, DiagDirection dir) { TileIndex start = tile; TileIndexDiff diff = TileOffsByDiagDir(dir); do { if (HasStationReservation(tile)) return false; - SetRailwayStationReservation(tile, true); + SetRailStationReservation(tile, true); MarkTileDirtyByTile(tile); tile = TILE_ADD(tile, diff); } while (IsCompatibleTrainStationTile(tile, start)); @@ -81,8 +81,8 @@ private: /** Try to reserve a single track/platform. */ bool ReserveSingleTrack(TileIndex tile, Trackdir td) { - if (IsRailwayStationTile(tile)) { - if (!ReserveRailwayStationPlatform(tile, TrackdirToExitdir(ReverseTrackdir(td)))) { + if (IsRailStationTile(tile)) { + if (!ReserveRailStationPlatform(tile, TrackdirToExitdir(ReverseTrackdir(td)))) { /* Platform could not be reserved, undo. */ m_res_fail_tile = tile; m_res_fail_td = td; @@ -102,11 +102,11 @@ private: /** Unreserve a single track/platform. Stops when the previous failer is reached. */ bool UnreserveSingleTrack(TileIndex tile, Trackdir td) { - if (IsRailwayStationTile(tile)) { + if (IsRailStationTile(tile)) { TileIndex start = tile; TileIndexDiff diff = TileOffsByDiagDir(TrackdirToExitdir(ReverseTrackdir(td))); while ((tile != m_res_fail_tile || td != m_res_fail_td) && IsCompatibleTrainStationTile(tile, start)) { - SetRailwayStationReservation(tile, false); + SetRailStationReservation(tile, false); tile = TILE_ADD(tile, diff); } } else if (tile != m_res_fail_tile || td != m_res_fail_td) { |