summaryrefslogtreecommitdiff
path: root/src/tile_map.h
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-11-04 11:30:37 +0000
committerrubidium <rubidium@openttd.org>2011-11-04 11:30:37 +0000
commit19eabdba2cf0184d5dc55cb3b9b8a7b5fe7ccfd3 (patch)
treee0fd85356bbcae38f6b50b8e7bc9470156b81e2d /src/tile_map.h
parent643c54d288e091adf386bacd3615991e24e8909f (diff)
downloadopenttd-19eabdba2cf0184d5dc55cb3b9b8a7b5fe7ccfd3.tar.xz
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
Diffstat (limited to 'src/tile_map.h')
-rw-r--r--src/tile_map.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tile_map.h b/src/tile_map.h
index 76a3fd75c..8dc4757ba 100644
--- a/src/tile_map.h
+++ b/src/tile_map.h
@@ -226,9 +226,9 @@ static inline void SetAnimationFrame(TileIndex t, byte frame)
_me[t].m7 = frame;
}
-Slope GetTileSlope(TileIndex tile, uint *h = NULL);
-uint GetTileZ(TileIndex tile);
-uint GetTileMaxZ(TileIndex tile);
+Slope GetTileSlope(TileIndex tile, int *h = NULL);
+int GetTileZ(TileIndex tile);
+int GetTileMaxZ(TileIndex tile);
/**
* Return the slope of a given tile
@@ -236,7 +236,7 @@ uint GetTileMaxZ(TileIndex tile);
* @param h If not \c NULL, pointer to storage of z height
* @return Slope of the tile, except for the HALFTILE part
*/
-static inline Slope GetTilePixelSlope(TileIndex tile, uint *h)
+static inline Slope GetTilePixelSlope(TileIndex tile, int *h)
{
Slope s = GetTileSlope(tile, h);
if (h != NULL) *h *= TILE_HEIGHT;
@@ -248,7 +248,7 @@ static inline Slope GetTilePixelSlope(TileIndex tile, uint *h)
* @param tile Tile to compute height of
* @return Minimum height of the tile
*/
-static inline uint GetTilePixelZ(TileIndex tile)
+static inline int GetTilePixelZ(TileIndex tile)
{
return GetTileZ(tile) * TILE_HEIGHT;
}
@@ -258,7 +258,7 @@ static inline uint GetTilePixelZ(TileIndex tile)
* @param t Tile to compute height of
* @return Maximum height of the tile
*/
-static inline uint GetTileMaxPixelZ(TileIndex tile)
+static inline int GetTileMaxPixelZ(TileIndex tile)
{
return GetTileMaxZ(tile) * TILE_HEIGHT;
}