--- deliantra/server/include/map.h	2007/01/19 17:50:11	1.55
+++ deliantra/server/include/map.h	2007/01/20 23:39:09	1.57
@@ -49,13 +49,6 @@
 
 #define MAP_LAYERS		3
 
-/* options passed to ready_map_name and load_original_map */
-#define MAP_FLUSH	    0x01
-#define MAP_PLAYER_UNIQUE   0x02
-#define MAP_BLOCK	    0x04
-#define MAP_STYLE	    0x08
-#define MAP_OVERLAY	    0x10
-
 /* Values for in_memory below.  Should probably be an enumerations */
 enum {
   MAP_IN_MEMORY,
@@ -85,7 +78,7 @@
  * should almost always be using out_of_map instead, which takes into account
  * map tiling.
  */
-#define OUT_OF_REAL_MAP(M,X,Y) !(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height))
+#define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height)))
 
 /* These are used in the MapLook flags element.  They are not used in
  * in the object flags structure.