[ViewVC] Diff of: cvs/deliantra/server/common/arch.C

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.53 by root, Tue Apr 17 18:40:31 2007 UTC vs.
Revision 1.55 by root, Tue Apr 17 19:12:32 2007 UTC

 // dire hack, need to rationalise
 void
 overwrite (archetype *at, object *op)
 {
   at->clone = *op;
   at->clone.arch = at;
   at->clone.inv = op->inv; op->inv = 0;
   op->destroy ();
 }
   coroapi::cede_to_tick_every (100);
   for (;;)
     {
+      object *op = object::create ();
       archetype *at = get (f.get_str ());
-      object *op = object::create ();
+      f.get (op->name);
+      f.next ();
+      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 ();
+        }
       if (!op->parse_kv (f))
         goto fail;
       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;
+        }
     }
   {
     archetype *head = parts.front ().first;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines