From b167c0a3967a62b4cbe98a12f2c4d932ee8df510 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 4 Nov 2011 10:25:33 +0000 Subject: [PATCH] (svn r23095) -Codechange: remove useless divisions/multiplications by TILE_HEIGHT for the AI API code --- src/ai/api/ai_tile.cpp | 8 ++++---- src/ai/api/ai_tunnel.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ai/api/ai_tile.cpp b/src/ai/api/ai_tile.cpp index bda19775b9..677c845a36 100644 --- 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) diff --git a/src/ai/api/ai_tunnel.cpp b/src/ai/api/ai_tunnel.cpp index d82d8d68e6..99aec30c4a 100644 --- 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;