--- deliantra/server/common/arch.C	2008/09/29 10:31:32	1.84
+++ deliantra/server/common/arch.C	2011/12/31 06:18:00	1.109
@@ -1,22 +1,23 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -24,7 +25,6 @@
 #include <cassert>
 
 #include <global.h>
-#include <loader.h>
 
 #include <tr1/functional>
 #include <tr1/unordered_map>
@@ -52,6 +52,28 @@
 // the vector of loaded but not yet committed archetypes
 static std::vector<archetype *> postponed_arch;
 
+//+GPL
+
+/*
+ * Creates an object.  This function is called by archetype::get ()
+ * if it fails to find the appropriate archetype.
+ * Thus archetype::get() will be guaranteed to always return
+ * an object, and never NULL.
+ */
+static object *
+create_singularity (const char *name)
+{
+  LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
+
+  if (!strcmp (name, "bug"))
+    abort ();
+
+  object *op = archetype::get (shstr_bug);
+  op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
+
+  return op;
+}
+
 /**
  * GROS -  This function retrieves an archetype given the name that appears
  * during the game (for example, "writing pen" instead of "stylus").
@@ -142,11 +164,10 @@
 get_archetype_by_object_name (const char *name)
 {
   char tmpname[MAX_BUF];
-  int i;
 
   assign (tmpname, name);
 
-  for (i = strlen (tmpname); i > 0; i--)
+  for (int i = strlen (tmpname); i > 0; i--)
     {
       tmpname[i] = 0;
 
@@ -193,12 +214,13 @@
         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' */
@@ -226,30 +248,32 @@
        * later.  So keep it in descending order here, so we try for the best
        * match first, and work downward.
        */
+      const char *qbn0, *qbn1, *qsn; // query base name/short name caches
+
       if (!strcasecmp (cp, query_name (op)))
         retval = 20;
-      else if (!strcasecmp (cp, query_short_name (op)))
+      else if (!strcasecmp (cp, qsn = query_short_name (op)))
         retval = 18;
-      else if (!strcasecmp (cp, query_base_name (op, 0)))
+      else if (!strcasecmp (cp, qbn0 = query_base_name (op, 0)))
         retval = 16;
-      else if (!strcasecmp (cp, query_base_name (op, 1)))
+      else if (!strcasecmp (cp, qbn1 = query_base_name (op, 1)))
         retval = 16;
       else if (op->custom_name && !strcasecmp (cp, op->custom_name))
         retval = 15;
-      else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))
+      else if (!strncasecmp (cp, qbn0, strlen (cp)))
         retval = 14;
-      else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))
+      else if (!strncasecmp (cp, qbn1, strlen (cp)))
         retval = 14;
       /* Do substring checks, so things like 'Str+1' will match.
        * retval of these should perhaps be lower - they are lower
        * then the specific strcasecmp aboves, but still higher than
        * some other match criteria.
        */
-      else if (strstr (query_base_name (op, 1), cp))
+      else if (strstr (qbn1, cp))
         retval = 12;
-      else if (strstr (query_base_name (op, 0), cp))
+      else if (strstr (qbn0, cp))
         retval = 12;
-      else if (strstr (query_short_name (op), cp))
+      else if (strstr (qsn, cp))
         retval = 12;
       /* Check against plural/non plural based on count. */
       else if (count > 1 && !strcasecmp (cp, op->name_pl))
@@ -260,7 +284,7 @@
       else if (strcasecmp (cp, op->name) == 0 && !count)
         retval = 4;
       /* Check for partial custom name, but give a real low priority */
-      else if (op->custom_name && strstr (op->custom_name, cp))
+      else if (op->custom_name.contains (cp))
         retval = 3;
 
       if (retval)
@@ -275,6 +299,14 @@
   return 0;
 }
 
+//-GPL
+
+void
+archetype::do_delete ()
+{
+  delete this;
+}
+
 archetype::archetype (const char *name)
 {
   arch = this;
@@ -324,6 +356,17 @@
     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)
 {
@@ -342,7 +385,7 @@
 #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)
         {
@@ -409,8 +452,7 @@
       }
 
     // assemble new chain
-    new_head->min_x = new_head->max_x = new_head->x;
-    new_head->min_y = new_head->max_y = new_head->y;
+    new_head->max_x = new_head->x;
 
     archetype *less = new_head;
     for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
@@ -425,10 +467,7 @@
         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;
@@ -442,7 +481,7 @@
 
 fail:
   for (auto (p, parts.begin ()); p != parts.end (); ++p)
-    (*p)->destroy (true);
+    (*p)->destroy ();
 
   return 0;
 }
@@ -493,7 +532,7 @@
 void
 archetype::gc ()
 {
-  int cnt = max (1, min (allarch.size () / 128, dirtycnt));
+  int cnt = max (1, min<int> (allarch.size () / 128, dirtycnt));
   dirtycnt = max (0, dirtycnt - cnt);
 
   do
@@ -512,7 +551,7 @@
         ++idx;
       else
         {
-          LOG (llevDebug, "garbage collect arch %s", at->debug_desc ());
+          //LOG (llevDebug, "garbage collect arch %s", &at->archname);
           assert (at->arch == at); // verify that refcnt == 1 is truly valid
           allarch.erase (idx);
 
@@ -525,7 +564,7 @@
               op = next;
             }
 
-          at->destroy (true);
+          at->destroy ();
           at->arch = 0;
         }
     }
@@ -540,37 +579,13 @@
   return op;
 }
 
-/*
- * Creates an object.  This function is called by get_archetype()
- * if it fails to find the appropriate archetype.
- * Thus get_archetype() will be guaranteed to always return
- * an object, and never NULL.
- */
-object *
-create_singularity (const char *name)
-{
-  LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
-
-  if (!strcmp (name, "bug"))
-    abort ();
-
-  object *op = archetype::get (shstr_bug);
-  op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
-
-  return op;
-}
+//+GPL
 
 /*
  * 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);
@@ -585,7 +600,7 @@
  * Returns the first archetype using the given type.
  * Used in treasure-generation.
  */
-archetype *
+static archetype *
 type_to_archetype (int type)
 {
   for_all_archetypes (at)
@@ -642,3 +657,5 @@
   return head;
 }
 
+//-GPL
+