From 43852baace470938c71147d9029b4679d62a05a8 Mon Sep 17 00:00:00 2001 From: "Johannes E. Krause" Date: Sun, 13 Jan 2019 20:49:44 +0100 Subject: Codechange: Remove unused GetTilePixelZOutsideMap and GetTileMaxPixelZOutsideMap functions (Patch by adf88, #6583) --- src/tile_map.cpp | 36 ------------------------------------ src/tile_map.h | 5 ----- 2 files changed, 41 deletions(-) diff --git a/src/tile_map.cpp b/src/tile_map.cpp index d73beeb88..05b0ea194 100644 --- a/src/tile_map.cpp +++ b/src/tile_map.cpp @@ -192,23 +192,6 @@ int GetTileZ(TileIndex tile) return h; } -/** - * Get bottom height of the tile outside map. - * - * @param x X-coordinate of the tile outside to compute height of. - * @param y Y-coordinate of the tile outside to compute height of. - * @return Minimum height of the tile outside the map. - */ -int GetTilePixelZOutsideMap(int x, int y) -{ - uint h = TileHeightOutsideMap(x, y); // N corner. - h = min(h, TileHeightOutsideMap(x + 1, y)); // W corner. - h = min(h, TileHeightOutsideMap(x, y + 1)); // E corner. - h = min(h, TileHeightOutsideMap(x + 1, y + 1)); // S corner - - return h * TILE_HEIGHT; -} - /** * Get top height of the tile inside the map. * @param t Tile to compute height of @@ -225,22 +208,3 @@ int GetTileMaxZ(TileIndex t) return h; } - -/** - * Get top height of the tile outside the map. - * - * @see Detailed description in header. - * - * @param x X-coordinate of the tile outside to compute height of. - * @param y Y-coordinate of the tile outside to compute height of. - * @return Maximum height of the tile. - */ -int GetTileMaxPixelZOutsideMap(int x, int y) -{ - uint h = TileHeightOutsideMap(x, y); - h = max(h, TileHeightOutsideMap(x + 1, y)); - h = max(h, TileHeightOutsideMap(x, y + 1)); - h = max(h, TileHeightOutsideMap(x + 1, y + 1)); - - return h * TILE_HEIGHT; -} diff --git a/src/tile_map.h b/src/tile_map.h index 89f532e4f..3fad368cd 100644 --- a/src/tile_map.h +++ b/src/tile_map.h @@ -289,8 +289,6 @@ static inline int GetTilePixelZ(TileIndex tile) return GetTileZ(tile) * TILE_HEIGHT; } -int GetTilePixelZOutsideMap(int x, int y); - /** * Get top height of the tile * @param tile Tile to compute height of @@ -301,9 +299,6 @@ static inline int GetTileMaxPixelZ(TileIndex tile) return GetTileMaxZ(tile) * TILE_HEIGHT; } -int GetTileMaxPixelZOutsideMap(int x, int y); - - /** * Calculate a hash value from a tile position * -- cgit v1.2.3-54-g00ecf