--- deliantra/server/common/item.C	2007/02/05 01:24:45	1.20
+++ deliantra/server/common/item.C	2007/03/14 04:12:27	1.24
@@ -458,14 +458,12 @@
   return buf;
 }
 
-
 /*
  * get_number(integer) returns the text-representation of the given number
  * in a static buffer.  The buffer might be overwritten at the next
  * call to get_number().
  * It is currently only used by the query_name() function.
  */
-
 char *
 get_number (int i)
 {
@@ -649,7 +647,7 @@
 char *
 query_name (const object *op)
 {
-  static char buf[5][HUGE_BUF];
+  static char buf[5][HUGE_BUF]; // OMFG
   static int use_buf = 0;
   int len = 0;
 
@@ -686,6 +684,7 @@
       else if (QUERY_FLAG (op, FLAG_CURSED))
         safe_strcat (buf[use_buf], " (cursed)", &len, HUGE_BUF);
     }
+
   /* Basically, if the object is known magical (detect magic spell on it),
    * and it isn't identified,  print out the fact that
    * it is magical.  Assume that the detect magical spell will only set
@@ -711,39 +710,40 @@
     {
       switch (op->type)
         {
-            case BOW:
-            case WAND:
-            case ROD:
-            case HORN:
-              safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF);
-              break;
-            case WEAPON:
-              safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF);
-              break;
-            case ARMOUR:
-            case HELMET:
-            case SHIELD:
-            case RING:
-            case BOOTS:
-            case GLOVES:
-            case AMULET:
-            case GIRDLE:
-            case BRACERS:
-            case CLOAK:
-              safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF);
-              break;
-            case CONTAINER:
-              safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF);
-              break;
-            case SKILL:
-            default:
-              safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF);
+          case BOW:
+          case WAND:
+          case ROD:
+          case HORN:
+            safe_strcat (buf[use_buf], " (readied)", &len, HUGE_BUF);
+            break;
+          case WEAPON:
+            safe_strcat (buf[use_buf], " (wielded)", &len, HUGE_BUF);
+            break;
+          case ARMOUR:
+          case HELMET:
+          case SHIELD:
+          case RING:
+          case BOOTS:
+          case GLOVES:
+          case AMULET:
+          case GIRDLE:
+          case BRACERS:
+          case CLOAK:
+            safe_strcat (buf[use_buf], " (worn)", &len, HUGE_BUF);
+            break;
+          case CONTAINER:
+            safe_strcat (buf[use_buf], " (active)", &len, HUGE_BUF);
+            break;
+          case SKILL:
+          default:
+            safe_strcat (buf[use_buf], " (applied)", &len, HUGE_BUF);
         }
     }
+
   if (QUERY_FLAG (op, FLAG_UNPAID))
     safe_strcat (buf[use_buf], " (unpaid)", &len, HUGE_BUF);
 
-  return buf[use_buf];
+  return buf [use_buf];
 }
 
 /*
@@ -858,7 +858,6 @@
  * be called with monster & player objects.  Returns a description
  * in a static buffer.
  */
-
 static char *
 describe_monster (const object *op)
 {
@@ -994,29 +993,24 @@
           break;
 
       if (tmp && tmp->attacktype != 0)
-        {
-          DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws");
-        }
+        { DESCRIBE_ABILITY (retbuf, tmp->attacktype, "Claws") }
       else
-        {
-          DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");
-        }
+        { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") }
     }
   else
-    {
-      DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks");
-    }
+    { DESCRIBE_ABILITY (retbuf, op->attacktype, "Attacks") }
+
   DESCRIBE_PATH (retbuf, op->path_attuned, "Attuned");
   DESCRIBE_PATH (retbuf, op->path_repelled, "Repelled");
   DESCRIBE_PATH (retbuf, op->path_denied, "Denied");
+
   for (i = 0; i < NROFATTACKS; i++)
-    {
-      if (op->resist[i])
-        {
-          sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]);
-          strcat (retbuf, buf);
-        }
-    }
+    if (op->resist[i])
+      {
+        sprintf (buf, "(%s %+d)", resist_plus[i], op->resist[i]);
+        strcat (retbuf, buf);
+      }
+
   return retbuf;
 }
 
@@ -1528,7 +1522,7 @@
 
   /* If the object is on a map, make sure we update its face */
   if (op->map)
-    update_object (op, UP_OBJ_FACE);
+    update_object (op, UP_OBJ_CHANGE);
   else
     {
       pl = op->in_player ();