--- deliantra/server/common/living.C	2010/04/06 21:11:48	1.117
+++ deliantra/server/common/living.C	2010/04/11 00:34:05	1.118
@@ -463,7 +463,7 @@
           else
             {
               new_draw_info (NDI_UNIQUE, 0, op, "You are blinded.");
-              SET_FLAG (op, FLAG_BLIND);
+              op->set_flag (FLAG_BLIND);
               if (op->type == PLAYER)
                 op->contr->do_los = 1;
             }
@@ -475,7 +475,7 @@
           else
             {
               new_draw_info (NDI_UNIQUE, 0, op, "Your vision returns.");
-              CLEAR_FLAG (op, FLAG_BLIND);
+              op->clr_flag (FLAG_BLIND);
               if (op->type == PLAYER)
                 op->contr->do_los = 1;
             }
@@ -612,7 +612,7 @@
         {
           tmp = at->instance ();
           tmp = insert_ob_in_ob (tmp, this);
-          SET_FLAG (tmp, FLAG_APPLIED);
+          tmp->set_flag (FLAG_APPLIED);
         }
     }
 
@@ -642,7 +642,7 @@
 
           tmp = at->instance ();
           tmp = insert_ob_in_ob (tmp, this);
-          SET_FLAG (tmp, FLAG_APPLIED);
+          tmp->set_flag (FLAG_APPLIED);
         }
 
       if (value)
@@ -769,20 +769,20 @@
 
   slaying = 0;
 
-  if (!QUERY_FLAG (this, FLAG_WIZ))
+  if (!this->flag [FLAG_WIZ])
     {
-      CLEAR_FLAG (this, FLAG_XRAYS);
-      CLEAR_FLAG (this, FLAG_MAKE_INVIS);
+      this->clr_flag (FLAG_XRAYS);
+      this->clr_flag (FLAG_MAKE_INVIS);
     }
 
-  CLEAR_FLAG (this, FLAG_LIFESAVE);
-  CLEAR_FLAG (this, FLAG_STEALTH);
-  CLEAR_FLAG (this, FLAG_BLIND);
+  this->clr_flag (FLAG_LIFESAVE);
+  this->clr_flag (FLAG_STEALTH);
+  this->clr_flag (FLAG_BLIND);
 
-  if (!QUERY_FLAG (arch, FLAG_REFL_SPELL  )) CLEAR_FLAG (this, FLAG_REFL_SPELL);
-  if (!QUERY_FLAG (arch, FLAG_REFL_MISSILE)) CLEAR_FLAG (this, FLAG_REFL_MISSILE);
-  if (!QUERY_FLAG (arch, FLAG_UNDEAD      )) CLEAR_FLAG (this, FLAG_UNDEAD);
-  if (!QUERY_FLAG (arch, FLAG_SEE_IN_DARK )) CLEAR_FLAG (this, FLAG_SEE_IN_DARK);
+  if (!arch->flag [FLAG_REFL_SPELL  ]) this->clr_flag (FLAG_REFL_SPELL);
+  if (!arch->flag [FLAG_REFL_MISSILE]) this->clr_flag (FLAG_REFL_MISSILE);
+  if (!arch->flag [FLAG_UNDEAD      ]) this->clr_flag (FLAG_UNDEAD);
+  if (!arch->flag [FLAG_SEE_IN_DARK ]) this->clr_flag (FLAG_SEE_IN_DARK);
 
   path_attuned  = arch->path_attuned;
   path_repelled = arch->path_repelled;
@@ -815,7 +815,7 @@
    * basically, if a server updates its max level, these playes may find
    * that their protection from physical goes down
    */
-  if (!QUERY_FLAG (this, FLAG_USE_ARMOUR) && type == PLAYER)
+  if (!this->flag [FLAG_USE_ARMOUR] && type == PLAYER)
     {
       ac = max (-10, arch->stats.ac - level / 3);
       prot[ATNR_PHYSICAL] += ((100 - prot[AT_PHYSICAL]) * (80 * level / settings.max_level)) / 100;
@@ -837,7 +837,7 @@
        * applied so we can tell the player what changed. But change_abil
        * then calls this function.
        */
-      if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
+      if (tmp->flag [FLAG_APPLIED] && tmp->type == POTION)
         continue;
 
       glow_radius += tmp->glow_radius;
@@ -936,13 +936,13 @@
 
           flag |= tmp->flag & copy_flags;
 
-          if (QUERY_FLAG (tmp, FLAG_UNDEAD) && !QUERY_FLAG (arch, FLAG_UNDEAD))
-            SET_FLAG (this, FLAG_UNDEAD);
+          if (tmp->flag [FLAG_UNDEAD] && !arch->flag [FLAG_UNDEAD])
+            this->set_flag (FLAG_UNDEAD);
 
           //TODO: copy_flags?
-          if (QUERY_FLAG (tmp, FLAG_MAKE_INVIS))
+          if (tmp->flag [FLAG_MAKE_INVIS])
             {
-              SET_FLAG (this, FLAG_MAKE_INVIS);
+              this->set_flag (FLAG_MAKE_INVIS);
               invisible = 1;
             }
 
@@ -979,7 +979,7 @@
 
                   if (tmp->stats.dam > 0)
                     {             /* skill is a 'weapon' */
-                      if (!QUERY_FLAG (this, FLAG_READY_WEAPON))
+                      if (!this->flag [FLAG_READY_WEAPON])
                         weapon_speed = max (0, WEAPON_SPEED (tmp));
 
                       weapon_weight = tmp->weight;
@@ -1527,7 +1527,7 @@
   /* clear the flag - exp goes into this bucket, but player
    * still doesn't know it.
    */
-  CLEAR_FLAG (skill_obj, FLAG_CAN_USE_SKILL);
+  skill_obj->clr_flag (FLAG_CAN_USE_SKILL);
   skill_obj->stats.exp = 0;
   skill_obj->level = 1;
   op->insert (skill_obj);
@@ -1850,7 +1850,7 @@
   if (op->type != PLAYER)
     {
       /* Sanity check */
-      if (!QUERY_FLAG (op, FLAG_ALIVE))
+      if (!op->flag [FLAG_ALIVE])
         return;
 
       /* reset exp to max allowed value.  We subtract from