summaryrefslogtreecommitdiff
path: root/macros.h
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-01-16 11:24:58 +0000
committertron <tron@openttd.org>2005-01-16 11:24:58 +0000
commit61a6bc544d9e656feb4458b6f9a86f7b7e01e7d6 (patch)
treebc9e7bccf2119556badf2efe43aca901dfc0a76e /macros.h
parent0c587b1a6098ba546d6e05930ba54b05ec930dd4 (diff)
downloadopenttd-61a6bc544d9e656feb4458b6f9a86f7b7e01e7d6.tar.xz
(svn r1536) Move GET_TILEHEIGHT, GET_TILETYPE and IS_TILETYPE to map.h, turn them into inline functions and add some asserts
Diffstat (limited to 'macros.h')
-rw-r--r--macros.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/macros.h b/macros.h
index f4c8cfc42..1294dd216 100644
--- a/macros.h
+++ b/macros.h
@@ -70,10 +70,6 @@ static inline int64 BIGMULS(int32 a, int32 b) {
#define LANDSCAPE_SIZE_FACTOR 1
-#define IS_TILETYPE(_t_, _s_) (_map_type_and_height[(_t_)] >> 4 == (_s_))
-#define GET_TILETYPE(_t_) (_map_type_and_height[(_t_)] >> 4)
-#define GET_TILEHEIGHT(_t_) ((_map_type_and_height[_t_] & 0xF) * 8)
-
enum {
CORRECT_Z_BITS = 1 << 1 | 1 << 2 | 1 << 3 | 1 << 4 | 1 << 5 | 1 << 6 | 1 << 7
};