diff options
author | tron <tron@openttd.org> | 2005-02-22 12:48:03 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2005-02-22 12:48:03 +0000 |
commit | 51eef8c5b7b54a64802fc3b833898f0fd75b6a51 (patch) | |
tree | b51c88c837ee8419763f34a5fbfd2ff8969ecaa3 /macros.h | |
parent | f22eab55442cc77096ec1cd713c358c0208f2c62 (diff) | |
download | openttd-51eef8c5b7b54a64802fc3b833898f0fd75b6a51.tar.xz |
(svn r1898) Remove some unused macros from macros.h and move some others to more appropriate headers
Diffstat (limited to 'macros.h')
-rw-r--r-- | macros.h | 19 |
1 files changed, 0 insertions, 19 deletions
@@ -3,8 +3,6 @@ #include "map.h" -#define MAX_INT 0x7FFFFFFF - #ifdef min #undef min #endif @@ -48,21 +46,6 @@ static inline int64 BIGMULS(int32 a, int32 b) { #define IS_INSIDE_1D(x, base, size) ( (uint)((x) - (base)) < ((uint)(size)) ) -enum { - CORRECT_Z_BITS = 1 << 1 | 1 << 2 | 1 << 3 | 1 << 4 | 1 << 5 | 1 << 6 | 1 << 7 -}; -#define CORRECT_Z(tileh) (CORRECT_Z_BITS & (1 << tileh)) - -#define TILE_ASSERT(x) assert( TILE_MASK(x) == (x) ); - -//#define REMADP_COORDS(x,y,z) { int t = x; x = (y-t)*2; y+=t-z; } - -#define PACK_POINT(x,y) ((x) | ((y) << 16)) -#define UNPACK_POINT_X(p) ((uint16)(p)) -#define UNPACK_POINT_Y(p) ((uint16)(p>>16)) - -#define PACK_PPOINT(p) PACK_POINT((p).x, (p).y) - #define HASBIT(x,y) ((x) & (1 << (y))) #define SETBIT(x,y) ((x) |= (1 << (y))) #define CLRBIT(x,y) ((x) &= ~(1 << (y))) @@ -178,6 +161,4 @@ static inline void WRITE_LE_UINT16(void *b, uint16 x) { ((byte*)b)[1] = (byte)(x >> 8); } -#define MAX_DETOUR 6 - #endif /* MACROS_H */ |