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

(svn r16939) -Codechange: s/RailwayStation/RailStation/ to unify the way it's written.

Browse Source
This commit is contained in:
rubidium
2009-07-24 11:47:12 +00:00
parent 00a9b2fd3d
commit 196856f54e
18 changed files with 80 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/yapf/yapf_rail.cpp
View File

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