(svn r1545) Add TileHeight() which returns the height (not multiplied by 8)

Replace some direct references to _map_type_and_height with TileHeight()/IsTileType()

1 files changed, 7 insertions, 2 deletions

diff --git a/map.h b/map.h
index a2d37e755..126bdd0b3 100644
--- a/map.h
+++ b/map.h
@@ -73,10 +73,15 @@ static inline TileIndexDiff TileOffsByDir(uint dir)
 }
 
 
-static inline uint TilePixelHeight(TileIndex tile)
+static inline uint TileHeight(TileIndex tile)
 {
 	assert(tile < MapSize());
-	return (_map_type_and_height[tile] & 0xf) * 8;
+	return _map_type_and_height[tile] & 0xf;
+}
+
+static inline uint TilePixelHeight(TileIndex tile)
+{
+	return TileHeight(tile) * 8;
 }
 
 static inline int TileType(TileIndex tile)