diff options
| author | smatz <smatz@openttd.org> | 2008-09-09 12:26:25 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2008-09-09 12:26:25 +0000 |
| commit | ff7e0b2586b4fbc0ef747df274b3b3641bd40509 (patch) | |
| tree | 6bd21c91c8943ef78a3129350c28c9e50daccb89 /src/newgrf_station.cpp | |
| parent | 80631f4a45338a793e7d4335c5280a9efb29ec08 (diff) | |
| download | openttd-ff7e0b2586b4fbc0ef747df274b3b3641bd40509.tar.xz | |
(svn r14280) -Codechange: use IsRailWaypointTile() instead of IsTileType() and IsRailWaypoint() checks at several places
Diffstat (limited to 'src/newgrf_station.cpp')
| -rw-r--r-- | src/newgrf_station.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp index 87e98ef91..f90ae845c 100644 --- a/src/newgrf_station.cpp +++ b/src/newgrf_station.cpp @@ -244,8 +244,7 @@ static TileIndex FindRailStationEnd(TileIndex tile, TileIndexDiff delta, bool ch TileIndex new_tile = TILE_ADD(tile, delta); if (waypoint) { - if (!IsTileType(new_tile, MP_RAILWAY)) break; - if (!IsRailWaypoint(new_tile)) break; + if (!IsRailWaypointTile(new_tile)) break; if (check_axis && GetWaypointAxis(new_tile) != orig_axis) break; } else { if (!IsRailwayStationTile(new_tile)) break; @@ -407,7 +406,7 @@ static uint32 StationGetVariable(const ResolverObject *object, byte variable, by case 0x42: return GetTerrainType(tile) | (GetRailType(tile) << 8); case 0x43: return st->owner; // Station owner case 0x44: - if (IsTileType(tile, MP_RAILWAY) && IsRailWaypoint(tile)) { + if (IsRailWaypointTile(tile)) { return GetDepotWaypointReservation(tile) ? 7 : 4; } else { return GetRailwayStationReservation(tile) ? 7 : 4; // PBS status |