[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.62 by root, Mon Jun 4 12:19:08 2007 UTC

 /*
- * 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 (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Crossfire TRT is free software; you can redistribute it and/or modify it
- * it under the terms of the GNU General Public License as published by
+ * under the terms of the GNU General Public License as published by the Free
- * the Free Software Foundation; either version 2 of the License, or
+ * Software Foundation; either version 2 of the License, or (at your option)
- * (at your option) any later version.
+ * any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful, but
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * GNU General Public License for more details.
+ * for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License along
- * along with this program; if not, write to the Free Software
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 #include <cassert>
 #include <global.h>
     str_equal,
     slice_allocator< std::pair<const char *const, arch_ptr> >
   > HT;
 static HT ht (5000);
-static std::vector<archetype *> archetypes;
+archvec archetypes;
 /**
  * GROS -  This function retrieves an archetype given the name that appears
  * during the game (for example, "writing pen" instead of "stylus").
  * It does not use the hashtable system, but browse the whole archlist each time.
 // 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 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;
+        }
     }
   {
     archetype *head = parts.front ().first;
       {
         archetype *at = p->first;
         if (at->head != head && at->head)
           {
-            LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name);
+            LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->archname);
             goto fail;
           }
         if (at->next && at != head)
           {
-            LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
+            LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->archname);
             goto fail;
           }
       }
     // sever chain of existing head object
 }
 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);
+      archetypes.insert (at = new archetype);
-      at->name = name;
+      at->archname = at->clone.name = at->clone.name_pl = name;
       at->hash_add ();
     }
   return at;
 }
  * Adds an archetype to the hashtable.
  */
 void
 archetype::hash_add ()
 {
-  ht.insert (std::make_pair (name, this));
+  ht.insert (std::make_pair (archname, this));
 }
 void
 archetype::hash_del ()
 {
-  ht.erase (name);
+  ht.erase (archname);
 }
 /*
  * Returns the first archetype using the given type.
  * Used in treasure-generation.

Diff Legend

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

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

Diff Legend

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