summaryrefslogtreecommitdiff
path: root/src/npf.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-07-24 11:47:12 +0000
committerrubidium <rubidium@openttd.org>2009-07-24 11:47:12 +0000
commitcf38a5bee6628f4be58a1bd7774658cf86807d5c (patch)
tree2c2890dd002ff6aee0e4fc1905796b623a040153 /src/npf.cpp
parent2c6b5237f68b1ce444f35eef6e31e7c0ff49d7cc (diff)
downloadopenttd-cf38a5bee6628f4be58a1bd7774658cf86807d5c.tar.xz
(svn r16939) -Codechange: s/RailwayStation/RailStation/ to unify the way it's written.
Diffstat (limited to 'src/npf.cpp')
-rw-r--r--src/npf.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/npf.cpp b/src/npf.cpp
index dbdd93ec4..dccb5a0cd 100644
--- a/src/npf.cpp
+++ b/src/npf.cpp
@@ -480,8 +480,8 @@ static void ClearPathReservation(const PathNode *start, const PathNode *end)
{
bool first_run = true;
for (; start != end; start = start->parent) {
- if (IsRailwayStationTile(start->node.tile) && first_run) {
- SetRailwayStationPlatformReservation(start->node.tile, TrackdirToExitdir(start->node.direction), false);
+ if (IsRailStationTile(start->node.tile) && first_run) {
+ SetRailStationPlatformReservation(start->node.tile, TrackdirToExitdir(start->node.direction), false);
} else {
UnreserveRailTrack(start->node.tile, TrackdirToTrack(start->node.direction));
}
@@ -512,7 +512,7 @@ static void NPFSaveTargetData(AyStar *as, OpenListNode *current)
ftd->node = target->node;
/* If the target is a station skip to platform end. */
- if (IsRailwayStationTile(target->node.tile)) {
+ if (IsRailStationTile(target->node.tile)) {
DiagDirection dir = TrackdirToExitdir(target->node.direction);
uint len = Station::GetByTile(target->node.tile)->GetPlatformLength(target->node.tile, dir);
TileIndex end_tile = TILE_ADD(target->node.tile, (len - 1) * TileOffsByDiagDir(dir));
@@ -520,8 +520,8 @@ static void NPFSaveTargetData(AyStar *as, OpenListNode *current)
/* Update only end tile, trackdir of a station stays the same. */
ftd->node.tile = end_tile;
if (!IsWaitingPositionFree(v, end_tile, target->node.direction, _settings_game.pf.forbid_90_deg)) return;
- SetRailwayStationPlatformReservation(target->node.tile, dir, true);
- SetRailwayStationReservation(target->node.tile, false);
+ SetRailStationPlatformReservation(target->node.tile, dir, true);
+ SetRailStationReservation(target->node.tile, false);
} else {
if (!IsWaitingPositionFree(v, target->node.tile, target->node.direction, _settings_game.pf.forbid_90_deg)) return;
}