diff options
author | tron <tron@openttd.org> | 2005-01-07 17:40:23 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2005-01-07 17:40:23 +0000 |
commit | 35972e68e144030fa04198ba7f47ccc21ae5dfa4 (patch) | |
tree | b4a2b5890976917c6f844cc28c48a6c17d7aa234 /macros.h | |
parent | 7ca6b2b8b0d6f66966fa2ff01e3e9961314dfcc4 (diff) | |
download | openttd-35972e68e144030fa04198ba7f47ccc21ae5dfa4.tar.xz |
(svn r1415) Move TILE_FROM_XY and TILE_XY to map.h and push TILE_[XY] bits from map.h into map.c.
Now the whole source except map.c is independent of TILE_[XY]_BITS!
Diffstat (limited to 'macros.h')
-rw-r--r-- | macros.h | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -70,9 +70,6 @@ static inline int64 BIGMULS(int32 a, int32 b) { #define LANDSCAPE_SIZE_FACTOR 1 -#define TILE_FROM_XY(x,y) (int)((((y) >> 4) << TILE_X_BITS) + ((x) >> 4)) -#define TILE_XY(x,y) (int)(((y) << TILE_X_BITS) + (x)) - #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) @@ -86,7 +83,7 @@ enum { extern uint SafeTileAdd(uint x, int add, const char *exp, const char *file, int line); -#if !defined(_DEBUG) || TILE_X_BITS != 8 +#if !defined(_DEBUG) # define TILE_ADD(x,y) ((x)+(y)) #else # if defined(__GNUC__) |