diff options
| author | smatz <smatz@openttd.org> | 2008-05-14 18:31:21 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2008-05-14 18:31:21 +0000 |
| commit | ec627dedf884069a1cbca8ebf524d761e755493c (patch) | |
| tree | 865f25008dfeacaa3e7b65aadc36c6076eb1c4b0 /src/tunnelbridge_cmd.cpp | |
| parent | 56f15b3544089c3d690644b0b4f6e88c65710d83 (diff) | |
| download | openttd-ec627dedf884069a1cbca8ebf524d761e755493c.tar.xz | |
(svn r13090) -Codechange: add functions for direct conversion from DiagDirection to Track and Trackbits
Diffstat (limited to 'src/tunnelbridge_cmd.cpp')
| -rw-r--r-- | src/tunnelbridge_cmd.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index 96c57833c..c53a52a10 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -494,7 +494,7 @@ CommandCost CmdBuildTunnel(TileIndex start_tile, uint32 flags, uint32 p1, uint32 delta = TileOffsByDiagDir(direction); DiagDirection tunnel_in_way_dir; - if (OtherAxis(DiagDirToAxis(direction)) == AXIS_X) { + if (DiagDirToAxis(direction) == AXIS_Y) { tunnel_in_way_dir = (TileX(start_tile) < (MapMaxX() / 2)) ? DIAGDIR_SW : DIAGDIR_NE; } else { tunnel_in_way_dir = (TileY(start_tile) < (MapMaxX() / 2)) ? DIAGDIR_SE : DIAGDIR_NW; @@ -558,7 +558,7 @@ CommandCost CmdBuildTunnel(TileIndex start_tile, uint32 flags, uint32 p1, uint32 MakeRailTunnel(start_tile, _current_player, direction, (RailType)GB(p1, 0, 4)); MakeRailTunnel(end_tile, _current_player, ReverseDiagDir(direction), (RailType)GB(p1, 0, 4)); AddSideToSignalBuffer(start_tile, INVALID_DIAGDIR, _current_player); - YapfNotifyTrackLayoutChange(start_tile, AxisToTrack(DiagDirToAxis(direction))); + YapfNotifyTrackLayoutChange(start_tile, DiagDirToDiagTrack(direction)); } else { MakeRoadTunnel(start_tile, _current_player, direction, (RoadTypes)GB(p1, 0, 3)); MakeRoadTunnel(end_tile, _current_player, ReverseDiagDir(direction), (RoadTypes)GB(p1, 0, 3)); @@ -623,7 +623,7 @@ static CommandCost DoClearTunnel(TileIndex tile, uint32 flags) AddSideToSignalBuffer(tile, ReverseDiagDir(dir), owner); AddSideToSignalBuffer(endtile, dir, owner); - Track track = AxisToTrack(DiagDirToAxis(dir)); + Track track = DiagDirToDiagTrack(dir); YapfNotifyTrackLayoutChange(tile, track); YapfNotifyTrackLayoutChange(endtile, track); } else { @@ -691,7 +691,7 @@ static CommandCost DoClearBridge(TileIndex tile, uint32 flags) AddSideToSignalBuffer(tile, ReverseDiagDir(direction), owner); AddSideToSignalBuffer(endtile, direction, owner); - Track track = AxisToTrack(DiagDirToAxis(direction)); + Track track = DiagDirToDiagTrack(direction); YapfNotifyTrackLayoutChange(tile, track); YapfNotifyTrackLayoutChange(endtile, track); } @@ -1233,7 +1233,7 @@ static TrackStatus GetTileTrackStatus_TunnelBridge(TileIndex tile, TransportType DiagDirection dir = GetTunnelBridgeDirection(tile); if (side != INVALID_DIAGDIR && side != ReverseDiagDir(dir)) return 0; - return CombineTrackStatus(TrackBitsToTrackdirBits(AxisToTrackBits(DiagDirToAxis(dir))), TRACKDIR_BIT_NONE); + return CombineTrackStatus(TrackBitsToTrackdirBits(DiagDirToDiagTrackBits(dir)), TRACKDIR_BIT_NONE); } static void ChangeTileOwner_TunnelBridge(TileIndex tile, PlayerID old_player, PlayerID new_player) |