Mercurial > hg > openttd

changeset 18259:362cc64dda9f draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r23095) -Codechange: remove useless divisions/multiplications by TILE_HEIGHT for the AI API code
author rubidium <rubidium@openttd.org>
date Fri, 04 Nov 2011 10:25:33 +0000
parents c27aabdb6433
children 73a8e1d13059
files src/ai/api/ai_tile.cpp src/ai/api/ai_tunnel.cpp
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/ai/api/ai_tile.cpp
+++ b/src/ai/api/ai_tile.cpp
@@ -156,14 +156,14 @@
 {
 	if (!::IsValidTile(tile)) return -1;
 
-	return ::GetTilePixelZ(tile) / ::TILE_HEIGHT;
+	return ::GetTileZ(tile);
 }
 
 /* static */ int32 AITile::GetMaxHeight(TileIndex tile)
 {
 	if (!::IsValidTile(tile)) return -1;
 
-	return ::GetTileMaxPixelZ(tile) / ::TILE_HEIGHT;
+	return ::GetTileMaxZ(tile);
 }
 
 /* static */ int32 AITile::GetCornerHeight(TileIndex tile, Corner corner)
@@ -171,8 +171,8 @@
 	if (!::IsValidTile(tile) || !::IsValidCorner((::Corner)corner)) return -1;
 
 	uint z;
-	::Slope slope = ::GetTilePixelSlope(tile, &z);
-	return (z + ::GetSlopePixelZInCorner(slope, (::Corner)corner)) / ::TILE_HEIGHT;
+	::Slope slope = ::GetTileSlope(tile, &z);
+	return (z + ::GetSlopeZInCorner(slope, (::Corner)corner));
 }
 
 /* static */ AICompany::CompanyID AITile::GetOwner(TileIndex tile)
--- a/src/ai/api/ai_tunnel.cpp
+++ b/src/ai/api/ai_tunnel.cpp
@@ -30,7 +30,7 @@
 	if (IsTunnelTile(tile)) return ::GetOtherTunnelEnd(tile);
 
 	uint start_z;
-	Slope start_tileh = ::GetTilePixelSlope(tile, &start_z);
+	Slope start_tileh = ::GetTileSlope(tile, &start_z);
 	DiagDirection direction = ::GetInclinedSlopeDirection(start_tileh);
 	if (direction == INVALID_DIAGDIR) return INVALID_TILE;
 
@@ -40,7 +40,7 @@
 		tile += delta;
 		if (!::IsValidTile(tile)) return INVALID_TILE;
 
-		::GetTilePixelSlope(tile, &end_z);
+		::GetTileSlope(tile, &end_z);
 	} while (start_z != end_z);
 
 	return tile;