--- deliantra/server/common/treasure.C	2007/06/04 12:19:08	1.62
+++ deliantra/server/common/treasure.C	2007/06/04 13:04:00	1.63
@@ -302,7 +302,7 @@
         }
       else
         {
-          if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE)))
+          if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
             {
               object *tmp = arch_to_object (t->item);
 
@@ -359,7 +359,7 @@
       else if (t->nrof)
         create_one_treasure (tl, op, flag, difficulty, tries);
     }
-  else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE))
+  else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
     {
       if (object *tmp = arch_to_object (t->item))
         {
@@ -574,11 +574,11 @@
   if (op->arch)
     {
       if (op->type == ARMOUR)
-        ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100;
+        ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
 
       if (magic < 0 && !(rndm (3)))        /* You can't just check the weight always */
         magic = (-magic);
-      op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100;
+      op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
     }
   else
     {
@@ -1226,10 +1226,10 @@
           for (i = 0; i < depth; i++)
             fprintf (logfile, "  ");
 
-          if (t->item && t->item->clone.type == FLESH)
-            fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
+          if (t->item && t->item->type == FLESH)
+            fprintf (logfile, "%s's %s\n", name, &t->item->object::name);
           else
-            fprintf (logfile, "%s\n", &t->item->clone.name);
+            fprintf (logfile, "%s\n", &t->item->object::name);
         }
 
       if (t->next_yes)
@@ -1267,12 +1267,12 @@
   found = 0;
   fprintf (logfile, "\n");
 
-  for (at = first_archetype; at != NULL; at = at->next)
-    if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
+  for_all_archetypes (at)
+    if (!strcasecmp (at->object::name, name) && at->title == NULL)
       {
-        fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->archname);
-        if (at->clone.randomitems != NULL)
-          dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
+        fprintf (logfile, "treasures for %s (arch: %s)\n", &at->object::name, &at->archname);
+        if (at->randomitems != NULL)
+          dump_monster_treasure_rec (at->object::name, at->randomitems->items, 1);
         else
           fprintf (logfile, "(nothing)\n");