--- deliantra/server/common/loader.C	2007/05/22 10:49:58	1.84
+++ deliantra/server/common/loader.C	2007/06/04 13:04:00	1.88
@@ -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>
  */
 
 /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
@@ -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))
@@ -519,11 +519,7 @@
     }
 }
 
-#define GET_FLAG(op,flag)       \
-  if (f.get_sint32 ())     \
-    SET_FLAG (op, flag);        \
-  else                          \
-    CLEAR_FLAG (op, flag)       \
+#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
 
 bool
 object::parse_kv (object_thawer &f)
@@ -779,7 +775,7 @@
             break;
 
           case KW_friendly:
-            if (f.get_sint32 ())
+            if (f.get_bool ())
               if (type != PLAYER)
                 add_friendly_object (this);
 
@@ -1030,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 ();
 
@@ -1291,8 +1287,8 @@
     f.put (KW_msg, KW_endmsg, op->msg);
   if (op->lore != tmp->lore)
     f.put (KW_lore, KW_endlore, op->lore);
-
-  CMP_OUT (other_arch);
+  if (op->other_arch != tmp->other_arch)
+    f.put (KW_other_arch, op->other_arch ? &op->other_arch->archname : 0);
 
   if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
 
@@ -1423,8 +1419,8 @@
 
   archetype *at = arch ? (archetype *)arch : empty_archetype;
 
-  f.put (KW_arch, at->name);
-  write_diff (f, this, &at->clone);
+  f.put (KW_arch, at->archname);
+  write_diff (f, this, at);
 
   for (object *tmp = inv; tmp; tmp = tmp->below)
     tmp->write (f);