--- deliantra/server/common/arch.C	2007/04/17 18:59:05	1.54
+++ deliantra/server/common/arch.C	2007/05/17 21:32:08	1.60
@@ -1,5 +1,5 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  * 
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -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 ();
@@ -337,9 +337,24 @@
       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)
@@ -515,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 ();
     }