--- deliantra/server/common/living.C	2008/04/21 23:35:24	1.82
+++ deliantra/server/common/living.C	2008/05/02 20:16:24	1.83
@@ -285,11 +285,11 @@
   char message[MAX_BUF];
   int potion_max = 0;
 
-  /* remember what object was like before it was changed.  note that
-   * refop is a local copy of op only to be used for detecting changes
-   * found by update_stats. refop is not a real object 
-   */
-  object_copy refop = *op;
+  object::flags_t prev_flag = op->flag;
+  MoveType prev_move_type = op->move_type;
+  sint16 prev_resist [NROFATTACKS]; // clumsy
+  assert (sizeof (prev_resist) == sizeof (op->resist));
+  memcpy (prev_resist, op->resist, sizeof (prev_resist));
 
   if (op->type == PLAYER)
     {
@@ -367,19 +367,19 @@
       DIFF_MSG (flag, "Your hands begin to glow red.", "Your hands stop glowing red.");
     }
 
-  if (QUERY_FLAG (op, FLAG_LIFESAVE) != QUERY_FLAG (&refop, FLAG_LIFESAVE))
+  if (op->flag [FLAG_LIFESAVE] != prev_flag [FLAG_LIFESAVE])
     {
       success = 1;
       DIFF_MSG (flag, "You feel very protected.", "You don't feel protected anymore.");
     }
 
-  if (QUERY_FLAG (op, FLAG_REFL_MISSILE) != QUERY_FLAG (&refop, FLAG_REFL_MISSILE))
+  if (op->flag [FLAG_REFL_MISSILE] != prev_flag [FLAG_REFL_MISSILE])
     {
       success = 1;
       DIFF_MSG (flag, "A magic force shimmers around you.", "The magic force fades away.");
     }
 
-  if (QUERY_FLAG (op, FLAG_REFL_SPELL) != QUERY_FLAG (&refop, FLAG_REFL_SPELL))
+  if (op->flag [FLAG_REFL_SPELL] != prev_flag [FLAG_REFL_SPELL])
     {
       success = 1;
       DIFF_MSG (flag, "You feel more safe now, somehow.", "Suddenly you feel less safe, somehow.");
@@ -391,7 +391,7 @@
    * can be misleading (a little higher could be miscontrued from
    * from fly high)
    */
-  if (tmp->move_type && op->move_type != refop.move_type)
+  if (tmp->move_type && op->move_type != prev_move_type)
     {
       success = 1;
 
@@ -422,8 +422,8 @@
   /* becoming UNDEAD... a special treatment for this flag. Only those not
    * originally undead may change their status 
    */
-  if (!QUERY_FLAG (op->arch, FLAG_UNDEAD))
-    if (QUERY_FLAG (op, FLAG_UNDEAD) != QUERY_FLAG (&refop, FLAG_UNDEAD))
+  if (!op->arch->flag [FLAG_UNDEAD])
+    if (op->flag [FLAG_UNDEAD] != prev_flag [FLAG_UNDEAD])
       {
         success = 1;
         if (flag > 0)
@@ -438,13 +438,13 @@
           }
       }
 
-  if (QUERY_FLAG (op, FLAG_STEALTH) != QUERY_FLAG (&refop, FLAG_STEALTH))
+  if (op->flag [FLAG_STEALTH] != prev_flag [FLAG_STEALTH])
     {
       success = 1;
       DIFF_MSG (flag, "You walk more quietly.", "You walk more noisily.");
     }
 
-  if (QUERY_FLAG (op, FLAG_MAKE_INVIS) != QUERY_FLAG (&refop, FLAG_MAKE_INVIS))
+  if (op->flag [FLAG_MAKE_INVIS] != prev_flag [FLAG_MAKE_INVIS])
     {
       success = 1;
       DIFF_MSG (flag, "You become transparent.", "You can see yourself.");
@@ -453,12 +453,12 @@
   /* blinded you can tell if more blinded since blinded player has minimal
    * vision 
    */
-  if (QUERY_FLAG (tmp, FLAG_BLIND))
+  if (tmp->flag [FLAG_BLIND])
     {
       success = 1;
       if (flag > 0)
         {
-          if (QUERY_FLAG (op, FLAG_WIZ))
+          if (op->flag [FLAG_WIZ])
             new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self is blinded.");
           else
             {
@@ -470,7 +470,7 @@
         }
       else
         {
-          if (QUERY_FLAG (op, FLAG_WIZ))
+          if (op->flag [FLAG_WIZ])
             new_draw_info (NDI_UNIQUE, 0, op, "Your mortal self can now see again.");
           else
             {
@@ -482,7 +482,7 @@
         }
     }
 
-  if (QUERY_FLAG (op, FLAG_SEE_IN_DARK) != QUERY_FLAG (&refop, FLAG_SEE_IN_DARK))
+  if (op->flag [FLAG_SEE_IN_DARK] != prev_flag [FLAG_SEE_IN_DARK])
     {
       success = 1;
       if (op->type == PLAYER)
@@ -490,12 +490,12 @@
       DIFF_MSG (flag, "Your vision is better in the dark.", "You see less well in the dark.");
     }
 
-  if (QUERY_FLAG (op, FLAG_XRAYS) != QUERY_FLAG (&refop, FLAG_XRAYS))
+  if (op->flag [FLAG_XRAYS] != prev_flag [FLAG_XRAYS])
     {
       success = 1;
       if (flag > 0)
         {
-          if (QUERY_FLAG (op, FLAG_WIZ))
+          if (op->flag [FLAG_WIZ])
             new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a little clearer.");
           else
             {
@@ -506,7 +506,7 @@
         }
       else
         {
-          if (QUERY_FLAG (op, FLAG_WIZ))
+          if (op->flag [FLAG_WIZ])
             new_draw_info (NDI_UNIQUE, 0, op, "Your vision becomes a bit out of focus.");
           else
             {
@@ -554,13 +554,14 @@
       if (i == ATNR_PHYSICAL)
         continue;               /* Don't display about armour */
 
-      if (op->resist[i] != refop.resist[i])
+      if (op->resist [i] != prev_resist [i])
         {
           success = 1;
-          if (op->resist[i] > refop.resist[i])
-            sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg[i], op->resist[i]);
+
+          if (op->resist [i] > prev_resist [i])
+            sprintf (message, "Your resistance to %s rises to %d%%.", change_resist_msg [i], op->resist [i]);
           else
-            sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg[i], op->resist[i]);
+            sprintf (message, "Your resistance to %s drops to %d%%.", change_resist_msg [i], op->resist [i]);
 
           new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, op, message);
         }