--- deliantra/server/common/arch.C	2007/04/17 18:40:31	1.53
+++ deliantra/server/common/arch.C	2007/05/28 21:21:39	1.61
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * 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>
  */
 
 #include <cassert>
@@ -311,8 +311,8 @@
 overwrite (archetype *at, object *op)
 {
   at->clone = *op;
-  
   at->clone.arch = at;
+
   at->clone.inv = op->inv; op->inv = 0;
 
   op->destroy ();
@@ -332,19 +332,41 @@
 
   for (;;)
     {
-      archetype *at = get (f.get_str ());
       object *op = object::create ();
+      archetype *at = get (f.get_str ());
+      f.get (op->name);
+      f.next ();
+
+#if 0
+      if (f.kw == KW_inherit)
+        {
+          if (archetype *at = find (f.get_str ()))
+            *op = at->clone;
+          else
+            LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
+                 &at->name, f.get_str ());
+
+          f.next ();
+        }
+#endif
 
       if (!op->parse_kv (f))
         goto fail;
 
+      op->post_load_check ();
+
       parts.push_back (std::make_pair (at, op));
 
       if (f.kw != KW_more)
         break;
 
       f.next ();
-      assert (f.kw == KW_object);
+
+      if (f.kw != KW_object)
+        {
+          f.parse_error ("more object");
+          goto fail;
+        }
     }
 
   {
@@ -508,12 +530,18 @@
 archetype *
 archetype::get (const char *name)
 {
+  if (!name)
+    {
+      LOG (llevError, "null archetype requested\n");
+      name = "(null)";
+    }
+
   archetype *at = find (name);
 
   if (!at)
     {
       archetypes.push_back (at = new archetype);
-      at->name = name;
+      at->name = at->clone.name = at->clone.name_pl = name;
       at->hash_add ();
     }