--- deliantra/server/common/loader.C	2007/06/04 12:19:08	1.87
+++ deliantra/server/common/loader.C	2007/07/04 06:38:35	1.91
@@ -1,23 +1,22 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
  * 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
  * 
- * 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.
+ * 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 3 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
@@ -327,7 +326,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 +411,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 +1025,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 +1286,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);
 
@@ -1298,10 +1297,10 @@
         f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
 
         if (!QUERY_FLAG (op, FLAG_ANIMATE))
-          f.put (KW_is_animated, (sint32) 0);
+          f.put (KW_is_animated, (sint32)0);
       }
     else
-      f.put (KW_animation, (const char *) 0);
+      f.put (KW_animation, (const char *)0);
 
   CMP_OUT2 (str, stats.Str);
   CMP_OUT2 (dex, stats.Dex);
@@ -1420,7 +1419,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);