--- deliantra/server/socket/item.C	2010/04/08 04:49:02	1.91
+++ deliantra/server/socket/item.C	2010/04/11 00:34:07	1.92
@@ -55,7 +55,7 @@
 {
   unsigned int flags = 0;
 
-  if (QUERY_FLAG (op, FLAG_APPLIED))
+  if (op->flag [FLAG_APPLIED])
     switch (op->type)
       {
         case BOW:
@@ -91,19 +91,19 @@
   if (op->is_open_container ())
     flags |= F_OPEN;
 
-  if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
+  if (op->flag [FLAG_KNOWN_CURSED])
     {
-      if (QUERY_FLAG (op, FLAG_DAMNED))
+      if (op->flag [FLAG_DAMNED])
         flags |= F_DAMNED;
-      else if (QUERY_FLAG (op, FLAG_CURSED))
+      else if (op->flag [FLAG_CURSED])
         flags |= F_CURSED;
     }
 
-  if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
+  if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
     flags |= F_MAGIC;
-  if (QUERY_FLAG (op, FLAG_UNPAID))
+  if (op->flag [FLAG_UNPAID])
     flags |= F_UNPAID;
-  if (QUERY_FLAG (op, FLAG_INV_LOCKED))
+  if (op->flag [FLAG_INV_LOCKED])
     flags |= F_LOCKED;
 
   return flags;
@@ -118,17 +118,17 @@
 {
   int flags = query_flags (head);
 
-  if (QUERY_FLAG (head, FLAG_NO_PICK))
+  if (head->flag [FLAG_NO_PICK])
     flags |= F_NOPICK;
 
   ns.send_face (head->face, -50);
 
-  if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
+  if (head->flag [FLAG_ANIMATE] && !ns.anims_sent[head->animation_id])
     ns.send_animation (head->animation_id);
 
   sl << uint32 (head->count)
      << uint32 (flags)
-     << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
+     << uint32 (head->flag [FLAG_NO_PICK] ? -1 : head->client_weight ())
      << uint32 (head->face);
 
   if (!head->custom_name)
@@ -197,7 +197,7 @@
 
   pl->ns->update_look = 0;
 
-  if (QUERY_FLAG (ob, FLAG_REMOVED)
+  if (ob->flag [FLAG_REMOVED]
       || !ob->map
       || ob->map->in_memory != MAP_ACTIVE
       || out_of_map (ob->map, ob->x, ob->y))
@@ -450,7 +450,7 @@
     {
       int anim_speed = 0;
 
-      if (QUERY_FLAG (op, FLAG_ANIMATE))
+      if (op->flag [FLAG_ANIMATE])
         {
           if (op->anim_speed)
             anim_speed = op->anim_speed;
@@ -647,9 +647,9 @@
     }
 
   if (!flag)
-    CLEAR_FLAG (op, FLAG_INV_LOCKED);
+    op->clr_flag (FLAG_INV_LOCKED);
   else
-    SET_FLAG (op, FLAG_INV_LOCKED);
+    op->set_flag (FLAG_INV_LOCKED);
 
   esrv_update_item (UPD_FLAGS, pl->ob, op);
 }
@@ -720,7 +720,7 @@
       if (pos.normalise ())
         for (object *tmp = pos->top; tmp; tmp = tmp->below)
           {
-            if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
+            if (tmp->invisible && !ob->flag [FLAG_WIZ])
               continue;
 
             if (wiz)
@@ -732,10 +732,10 @@
 
             if (head->inv)
               if ((head->type != CONTAINER && head->type != FLESH)
-                  || QUERY_FLAG (ob, FLAG_WIZ))
+                  || ob->flag [FLAG_WIZ])
                 buf << head->query_inventory (ob, "   ");
 
-            if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !wiz)        /* don't continue under the floor */
+            if (tmp->flag [FLAG_IS_FLOOR] && !wiz)        /* don't continue under the floor */
               break;
           }
     }
@@ -780,7 +780,7 @@
       /* If it is an active container, then we should drop all objects
        * in the container and not the container itself.
        */
-      if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
+      if (op->inv && op->flag [FLAG_APPLIED])
         {
           int cnt = MAX_ITEM_PER_ACTION;