--- deliantra/server/common/item.C	2007/05/28 21:21:40	1.36
+++ deliantra/server/common/item.C	2007/06/04 13:04:00	1.37
@@ -773,7 +773,7 @@
 
 #ifdef NEW_MATERIAL_CODE
   if ((op->is_armor () || op->is_weapon ()) && op->materialname && mt &&
-      op->arch->clone.materialname != mt->name && !(op->material & M_SPECIAL))
+      op->arch->materialname != mt->name && !(op->material & M_SPECIAL))
     {
       strcpy (buf, mt->description);
       len = strlen (buf);
@@ -936,7 +936,7 @@
       int first = 1;
 
       for (t = op->randomitems->items; t != NULL; t = t->next)
-        if (t->item && t->item->clone.type == SPELL)
+        if (t->item && t->item->type == SPELL)
           {
             if (first)
               {
@@ -944,7 +944,7 @@
                 strcat (retbuf, "(Spell abilities:)");
               }
             strcat (retbuf, "(");
-            strcat (retbuf, t->item->clone.name);
+            strcat (retbuf, t->item->object::name);
             strcat (retbuf, ")");
           }
     }
@@ -1522,8 +1522,8 @@
         op->title = op->inv->name;
       else if (op->arch)
         {
-          op->name = op->arch->clone.name;
-          op->name_pl = op->arch->clone.name_pl;
+          op->name = op->arch->object::name;
+          op->name_pl = op->arch->object::name_pl;
         }
     }