diff options
| author | tron <tron@openttd.org> | 2006-07-22 08:59:52 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-07-22 08:59:52 +0000 |
| commit | d7cc128c969db41b7683180d324e9a01625371b8 (patch) | |
| tree | 3cd7af50d593f93b4699b58b3293d63c0a9c7eef /rail_cmd.c | |
| parent | c51d0c0a0904716f480829e2d2125d05bde7f0b3 (diff) | |
| download | openttd-d7cc128c969db41b7683180d324e9a01625371b8.tar.xz | |
(svn r5582) Add and use AxisToTrack{Bits,}()
Diffstat (limited to 'rail_cmd.c')
| -rw-r--r-- | rail_cmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rail_cmd.c b/rail_cmd.c index f5805dc9d..8dc73c063 100644 --- a/rail_cmd.c +++ b/rail_cmd.c @@ -234,7 +234,7 @@ int32 CmdBuildSingleRail(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) case MP_TUNNELBRIDGE: if (!IsBridge(tile) || !IsBridgeMiddle(tile) || - (GetBridgeAxis(tile) == AXIS_X ? TRACK_BIT_Y : TRACK_BIT_X) != trackbit) { + AxisToTrackBits(OtherAxis(GetBridgeAxis(tile))) != trackbit) { // Get detailed error message return DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); } @@ -1918,7 +1918,7 @@ static uint32 GetTileTrackStatus_Track(TileIndex tile, TransportType mode) return ret; } else { if (GetRailTileSubtype(tile) == RAIL_SUBTYPE_DEPOT) { - return (DiagDirToAxis(GetRailDepotDirection(tile)) == AXIS_X ? TRACK_BIT_X : TRACK_BIT_Y) * 0x101; + return AxisToTrackBits(DiagDirToAxis(GetRailDepotDirection(tile))) * 0x101; } else { return GetRailWaypointBits(tile) * 0x101; } |