Mercurial > hg > openttd

changeset 18262:9fcde0b48dcd draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r23098) -Codechange: remove pointless multiplications by TILE_HEIGHT from the tunnel code
author rubidium <rubidium@openttd.org>
date Fri, 04 Nov 2011 10:28:31 +0000
parents 9cdb7965ac4a
children 67b0fa9c5043
files src/terraform_cmd.cpp src/tunnel_map.cpp src/tunnelbridge_cmd.cpp
diffstat 3 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/terraform_cmd.cpp
+++ b/src/terraform_cmd.cpp
@@ -316,7 +316,7 @@
 					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);
 				}
--- a/src/tunnel_map.cpp
+++ b/src/tunnel_map.cpp
@@ -23,7 +23,7 @@
 {
 	DiagDirection dir = GetTunnelBridgeDirection(tile);
 	TileIndexDiff delta = TileOffsByDiagDir(dir);
-	uint z = GetTilePixelZ(tile);
+	uint z = GetTileZ(tile);
 
 	dir = ReverseDiagDir(dir);
 	do {
@@ -31,7 +31,7 @@
 	} while (
 		!IsTunnelTile(tile) ||
 		GetTunnelBridgeDirection(tile) != dir ||
-		GetTilePixelZ(tile) != z
+		GetTileZ(tile) != z
 	);
 
 	return tile;
@@ -53,7 +53,7 @@
 	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;
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -113,7 +113,7 @@
  */
 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 @@
 
 	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 @@
 	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;