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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.55 by root, Tue Apr 17 19:12:32 2007 UTC vs.
Revision 1.60 by root, Thu May 17 21:32:08 2007 UTC

 /*
- * 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
  * Copyright (C) 1992 Frank Tore Johansen
  *
       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;
 }
 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 ();
     }
   return at;
 }

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