--- deliantra/server/include/define.h	2006/12/15 20:08:45	1.17
+++ deliantra/server/include/define.h	2006/12/18 02:35:01	1.18
@@ -427,19 +427,9 @@
  */
 
 /* Basic routines to do above */
-#define SET_FLAG(xyz, p) \
-        ((xyz)->flags[p/32] |= (1U << (p % 32)))
-#define CLEAR_FLAG(xyz, p) \
-        ((xyz)->flags[p/32] &= ~(1U << (p % 32)))
-#define QUERY_FLAG(xyz, p) \
-        ((xyz)->flags[p/32] & (1U << (p % 32)))
-#define COMPARE_FLAGS(p,q) \
-        (                                            \
-                ((p)->flags[0] == (q)->flags[0]) &&  \
-                ((p)->flags[1] == (q)->flags[1]) &&  \
-                ((p)->flags[2] == (q)->flags[2]) &&  \
-                ((p)->flags[3] == (q)->flags[3])     \
-        )
+#define SET_FLAG(obj, flag)   (obj)->flags[flag] = 1
+#define CLEAR_FLAG(obj, flag) (obj)->flags[flag] = 0
+#define QUERY_FLAG(obj, flag) (obj)->flags[flag]
 
 /* convenience macros to determine what kind of things we are dealing with */