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 2c6b5237f6
commit cf38a5bee6
18 changed files with 80 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pbs.cpp
View File

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