(svn r1898) Remove some unused macros from macros.h and move some others to more appropriate headers

This commit is contained in:
tron
2005-02-22 12:48:03 +00:00
parent 76b016dd58
commit a370af76d2
6 changed files with 13 additions and 25 deletions

View File

@@ -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 */