--- deliantra/server/common/arch.C	2007/04/17 18:40:31	1.53
+++ deliantra/server/common/arch.C	2007/04/21 11:55:36	1.58
@@ -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,8 +332,23 @@
 
   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;
@@ -344,7 +359,12 @@
         break;
 
       f.next ();
-      assert (f.kw == KW_object);
+
+      if (f.kw != KW_object)
+        {
+          f.parse_error ("more object");
+          goto fail;
+        }
     }
 
   {
@@ -508,12 +528,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 ();
     }