diff options
| author | rubidium <rubidium@openttd.org> | 2011-11-04 10:28:31 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-11-04 10:28:31 +0000 |
| commit | f0f17a77bad81ae15de70b4a5bca131561affe05 (patch) | |
| tree | 06181a35bda1c6d966b6d85654f4859a5c190403 /src | |
| parent | d0689c2924bd0c8793a61dfc9407673b1810d051 (diff) | |
| download | openttd-f0f17a77bad81ae15de70b4a5bca131561affe05.tar.xz | |
(svn r23098) -Codechange: remove pointless multiplications by TILE_HEIGHT from the tunnel code
Diffstat (limited to 'src')
| -rw-r--r-- | src/terraform_cmd.cpp | 2 | ||||
| -rw-r--r-- | src/tunnel_map.cpp | 6 | ||||
| -rw-r--r-- | src/tunnelbridge_cmd.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/terraform_cmd.cpp b/src/terraform_cmd.cpp index 1f2847512..9241958cd 100644 --- a/src/terraform_cmd.cpp +++ b/src/terraform_cmd.cpp @@ -316,7 +316,7 @@ CommandCost CmdTerraformLand(TileIndex tile, DoCommandFlag flags, uint32 p1, uin return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST); } /* Check if tunnel would take damage */ - if (direction == -1 && IsTunnelInWay(tile, z_min * TILE_HEIGHT)) { + if (direction == -1 && IsTunnelInWay(tile, z_min)) { _terraform_err_tile = tile; // highlight the tile above the tunnel return_cmd_error(STR_ERROR_EXCAVATION_WOULD_DAMAGE); } diff --git a/src/tunnel_map.cpp b/src/tunnel_map.cpp index 2aac58424..799b39000 100644 --- a/src/tunnel_map.cpp +++ b/src/tunnel_map.cpp @@ -23,7 +23,7 @@ TileIndex GetOtherTunnelEnd(TileIndex tile) { DiagDirection dir = GetTunnelBridgeDirection(tile); TileIndexDiff delta = TileOffsByDiagDir(dir); - uint z = GetTilePixelZ(tile); + uint z = GetTileZ(tile); dir = ReverseDiagDir(dir); do { @@ -31,7 +31,7 @@ TileIndex GetOtherTunnelEnd(TileIndex tile) } while ( !IsTunnelTile(tile) || GetTunnelBridgeDirection(tile) != dir || - GetTilePixelZ(tile) != z + GetTileZ(tile) != z ); return tile; @@ -53,7 +53,7 @@ bool IsTunnelInWayDir(TileIndex tile, uint z, DiagDirection dir) do { tile -= delta; if (!IsValidTile(tile)) return false; - height = GetTilePixelZ(tile); + height = GetTileZ(tile); } while (z < height); return z == height && IsTunnelTile(tile) && GetTunnelBridgeDirection(tile) == dir; diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index c28a2c381..104aadc09 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -113,7 +113,7 @@ Foundation GetBridgeFoundation(Slope tileh, Axis axis) */ bool HasBridgeFlatRamp(Slope tileh, Axis axis) { - ApplyPixelFoundationToSlope(GetBridgeFoundation(tileh, axis), &tileh); + ApplyFoundationToSlope(GetBridgeFoundation(tileh, axis), &tileh); /* If the foundation slope is flat the bridge has a non-flat ramp and vice versa. */ return (tileh != SLOPE_FLAT); } @@ -527,7 +527,7 @@ CommandCost CmdBuildTunnel(TileIndex start_tile, DoCommandFlag flags, uint32 p1, uint start_z; uint end_z; - Slope start_tileh = GetTilePixelSlope(start_tile, &start_z); + Slope start_tileh = GetTileSlope(start_tile, &start_z); DiagDirection direction = GetInclinedSlopeDirection(start_tileh); if (direction == INVALID_DIAGDIR) return_cmd_error(STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL); @@ -563,7 +563,7 @@ CommandCost CmdBuildTunnel(TileIndex start_tile, DoCommandFlag flags, uint32 p1, for (;;) { end_tile += delta; if (!IsValidTile(end_tile)) return_cmd_error(STR_ERROR_TUNNEL_THROUGH_MAP_BORDER); - end_tileh = GetTilePixelSlope(end_tile, &end_z); + end_tileh = GetTileSlope(end_tile, &end_z); if (start_z == end_z) break; |