--- deliantra/server/common/item.C	2007/01/15 21:06:18	1.19
+++ deliantra/server/common/item.C	2007/02/05 01:42:22	1.22
@@ -787,9 +787,10 @@
     {
 #endif
       if (!plural)
-        strcpy (buf, op->name);
+        assign (buf, op->name);
       else
-        strcpy (buf, op->name_pl);
+        assign (buf, op->name_pl);
+
       len = strlen (buf);
 #ifdef NEW_MATERIAL_CODE
     }
@@ -803,50 +804,51 @@
 
   switch (op->type)
     {
-        case SPELLBOOK:
-        case SCROLL:
-        case WAND:
-        case ROD:
-          if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
-            {
-              if (!op->title)
-                {
-                  safe_strcat (buf, " of ", &len, MAX_BUF);
-                  if (op->inv)
-                    safe_strcat (buf, op->inv->name, &len, MAX_BUF);
-                  else
-                    LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
-                }
-              if (op->type != SPELLBOOK)
-                {
-                  sprintf (buf2, " (lvl %d)", op->level);
-                  safe_strcat (buf, buf2, &len, MAX_BUF);
-                }
-            }
-          break;
+      case SPELLBOOK:
+      case SCROLL:
+      case WAND:
+      case ROD:
+        if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
+          {
+            if (!op->title)
+              {
+                safe_strcat (buf, " of ", &len, MAX_BUF);
+                if (op->inv)
+                  safe_strcat (buf, op->inv->name, &len, MAX_BUF);
+                else
+                  LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
+              }
+            if (op->type != SPELLBOOK)
+              {
+                sprintf (buf2, " (lvl %d)", op->level);
+                safe_strcat (buf, buf2, &len, MAX_BUF);
+              }
+          }
+        break;
 
 
-        case SKILL:
-        case AMULET:
-        case RING:
-          if (!op->title)
-            {
-              /* If ring has a title, full description isn't so useful */
-              char *s = ring_desc (op);
-
-              if (s[0])
-                {
-                  safe_strcat (buf, " ", &len, MAX_BUF);
-                  safe_strcat (buf, s, &len, MAX_BUF);
-                }
-            }
-          break;
-        default:
-          if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
-            {
-              sprintf (buf + strlen (buf), " %+d", op->magic);
-            }
+      case SKILL:
+      case AMULET:
+      case RING:
+        if (!op->title)
+          {
+            /* If ring has a title, full description isn't so useful */
+            char *s = ring_desc (op);
+
+            if (s[0])
+              {
+                safe_strcat (buf, " ", &len, MAX_BUF);
+                safe_strcat (buf, s, &len, MAX_BUF);
+              }
+          }
+        break;
+      default:
+        if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
+          {
+            sprintf (buf + strlen (buf), " %+d", op->magic);
+          }
     }
+
   return buf;
 }
 
@@ -856,7 +858,6 @@
  * be called with monster & player objects.  Returns a description
  * in a static buffer.
  */
-
 static char *
 describe_monster (const object *op)
 {
@@ -992,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;
 }