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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.94 by root, Fri Nov 6 12:49:19 2009 UTC vs.
Revision 1.108 by root, Sun May 1 16:58:15 2011 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
  */
 #include <cassert>
 #include <global.h>
-#include <loader.h>
 #include <tr1/functional>
 #include <tr1/unordered_map>
 archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
 static std::vector<archetype *> postponed_arch;
 //+GPL
 /*
- * Creates an object.  This function is called by get_archetype()
+ * Creates an object.  This function is called by archetype::get ()
  * if it fails to find the appropriate archetype.
- * Thus get_archetype() will be guaranteed to always return
+ * Thus archetype::get() will be guaranteed to always return
  * an object, and never NULL.
  */
 static object *
 create_singularity (const char *name)
 {
       /* All is a very generic match - low match value */
       if (!strcmp (cp, "all"))
         return 1;
       /* unpaid is a little more specific */
-      if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID))
+      if (!strcmp (cp, "unpaid") && op->flag [FLAG_UNPAID])
         return 2;
-      if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
+      if (!strcmp (cp, "cursed") && op->flag [FLAG_KNOWN_CURSED] && (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED]))
         return 2;
-      if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED))
+      if (!strcmp (cp, "unlocked") && !op->flag [FLAG_INV_LOCKED])
         return 2;
       /* Allow for things like '100 arrows' */
       if ((count = atoi (cp)) != 0)
         {
   return 0;
 }
 //-GPL
+void
+archetype::do_delete ()
+{
+  delete this;
+}
 archetype::archetype (const char *name)
 {
   arch = this;
   this->archname = this->name = this->name_pl = name;
 }
     return 0;
   else
     return i->second;
 }
+void
+archetype::post_load_check ()
+{
+  assert (("obj_original MUST NOT be set for archetypes", !flag [FLAG_OBJ_ORIGINAL]));
+  if (type == SKILL)
+    add_skill_archetype (this);
+  object::post_load_check ();
+}
 archetype *
 archetype::read (object_thawer &f)
 {
   assert (f.kw == KW_object);
       f.next ();
 #if 0
       // implementing it here in the server does neither allow multiple inheritence
       // nor does it cleanly "just override". it would allow use in map files, though,
-      // and other resource files dynamically laoded (as opposed to being preprocessed).
+      // and other resource files dynamically loaded (as opposed to being preprocessed).
       // not that any of this is relevant as of yet...
       if (f.kw == KW_inherit)
         {
           if (archetype *at = find (f.get_str ()))
             *op = at->clone;
             goto fail;
           }
       }
     // assemble new chain
-    new_head->min_x = new_head->max_x = new_head->x;
+    new_head->max_x = new_head->x;
-    new_head->min_y = new_head->max_y = new_head->y;
     archetype *less = new_head;
     for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
       {
         archetype *at = *p;
         at->flag [FLAG_ALIVE]    = new_head->flag [FLAG_ALIVE];
         at->flag [FLAG_NO_PICK]  = new_head->flag [FLAG_NO_PICK];
         at->flag [FLAG_MONSTER]  = new_head->flag [FLAG_MONSTER];
         at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
-        new_head->min_x = min (new_head->min_x, at->x);
-        new_head->min_y = min (new_head->min_y, at->y);
         new_head->max_x = max (new_head->max_x, at->x);
-        new_head->max_y = max (new_head->max_y, at->y);
         at->head = new_head;
         less->more = at;
         less = at;
       }
       if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
         ++idx;
       else
         {
-          LOG (llevDebug, "garbage collect arch %s", &at->archname);
+          //LOG (llevDebug, "garbage collect arch %s", &at->archname);
           assert (at->arch == at); // verify that refcnt == 1 is truly valid
           allarch.erase (idx);
           // break chain
           for (object *op = at->head_ (); op; )
 /*
  * Finds which archetype matches the given name, and returns a new
  * object containing a copy of the archetype.
  */
 object *
-get_archetype (const char *name)
-{
-  return archetype::get (name);
-}
-object *
 archetype::get (const char *name)
 {
   archetype *at = find (name);
   if (!at)
 /*
  * Returns the first archetype using the given type.
  * Used in treasure-generation.
  */
-archetype *
+static archetype *
 type_to_archetype (int type)
 {
   for_all_archetypes (at)
     if (at->type == type && at->head_ () != at)
       return at;

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.94 by root, Fri Nov 6 12:49:19 2009 UTC vs. Revision 1.108 by root, Sun May 1 16:58:15 2011 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.94 by root, Fri Nov 6 12:49:19 2009 UTC vs.
Revision 1.108 by root, Sun May 1 16:58:15 2011 UTC