--- deliantra/server/common/loader.C	2007/06/04 12:19:08	1.87
+++ deliantra/server/common/loader.C	2007/06/06 05:41:25	1.89
@@ -327,7 +327,7 @@
    * Otherwise, what happens is that the the plural name will lose
    * information (appear as just 'hearts' and not 'goblins heart') 
    */
-  if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl)
+  if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
     name_pl = 0;
 
   if (!name_pl)
@@ -412,7 +412,7 @@
       insert_ob_in_ob (tmp, this);
       randomitems = NULL;   /* So another spell isn't created for this object */
       /* without this, value is all screwed up */
-      value = arch->clone.value * inv->value;
+      value = arch->value * inv->value;
     }
 
   if (QUERY_FLAG (this, FLAG_MONSTER))
@@ -1026,7 +1026,7 @@
   object *op = object::create ();
 
   op->map = map;
-  arch->clone.copy_to (op);
+  arch->copy_to (op);
   // copy_to activates, this should be fixed properly
   op->deactivate ();
 
@@ -1287,8 +1287,8 @@
     f.put (KW_msg, KW_endmsg, op->msg);
   if (op->lore != tmp->lore)
     f.put (KW_lore, KW_endlore, op->lore);
-  if (op->other_arch != tmp->other_arch)
-    f.put (KW_other_arch, op->other_arch ? &op->other_arch->archname : 0);
+
+  CMP_OUT (other_arch);
 
   if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
 
@@ -1420,7 +1420,7 @@
   archetype *at = arch ? (archetype *)arch : empty_archetype;
 
   f.put (KW_arch, at->archname);
-  write_diff (f, this, &at->clone);
+  write_diff (f, this, at);
 
   for (object *tmp = inv; tmp; tmp = tmp->below)
     tmp->write (f);