--- deliantra/server/common/treasure.C	2007/05/12 18:14:47	1.60
+++ deliantra/server/common/treasure.C	2007/06/04 13:04:00	1.63
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Crossfire TRT is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
  * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * You should have received a copy of the GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 /* TREASURE_DEBUG does some checking on the treasurelists after loading.
@@ -205,7 +205,7 @@
         {
           if (t->next_yes || t->next_no)
             {
-              LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name);
+              LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
               LOG (llevError, "  the next_yes or next_no field is set\n");
             }
 
@@ -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->name);
-        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");
 
@@ -1614,7 +1614,7 @@
         name = tmp->name, neg = 0;
 
       /* If we match name, then return the opposite of 'neg' */
-      if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name)))
+      if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
         return !neg;
 
       /* Set success as true, since if the match was an inverse, it means