--- deliantra/server/common/arch.C	2009/11/06 12:49:19	1.94
+++ deliantra/server/common/arch.C	2018/11/18 00:37:11	1.117
@@ -1,47 +1,46 @@
 /*
  * 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 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 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 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>
  */
 
 #include <cassert>
+#include <functional>
 
-#include <global.h>
-#include <loader.h>
+#include <flat_hash_map.hpp>
 
-#include <tr1/functional>
-#include <tr1/unordered_map>
+#include <global.h>
 
 archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
 arch_ptr archetype::empty;
 
 // the hashtable
-typedef std::tr1::unordered_map
-  <
-    const char *,
-    arch_ptr,
-    str_hash,
-    str_equal,
-    slice_allocator< std::pair<const char *const, arch_ptr> >
-  > HT;
+typedef ska::flat_hash_map<
+  const char *,
+  arch_ptr,
+  str_hash,
+  str_equal,
+  slice_allocator< std::pair<const char *const, arch_ptr> >
+> HT;
 
 static HT ht (10000);
 archvec archetypes;
@@ -56,9 +55,9 @@
 //+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 *
@@ -215,13 +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' */
@@ -302,6 +301,12 @@
 
 //-GPL
 
+void
+archetype::do_delete ()
+{
+  delete this;
+}
+
 archetype::archetype (const char *name)
 {
   arch = this;
@@ -351,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)
 {
@@ -369,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 +425,6 @@
     }
 
   {
-    auto (at, parts.begin ());
-
     archetype *new_head = parts.front ();
     archetype *old_head = find (new_head->archname);
 
@@ -422,9 +436,9 @@
       }
 
     // check that all archetypes belong to the same old object or are new
-    for (auto (at, parts.begin ()); at != parts.end (); ++at)
+    for (auto &&at : parts)
       {
-        archetype *new_part = *at;
+        archetype *new_part = at;
         archetype *old_part = find (new_part->archname);
 
         if (old_part && old_part->head_ () != old_head)
@@ -436,11 +450,10 @@
       }
 
     // 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)
+    for (auto &&p = parts.begin () + 1; p != parts.end (); ++p)
       {
         archetype *at = *p;
 
@@ -452,10 +465,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;
@@ -468,8 +478,8 @@
   }
 
 fail:
-  for (auto (p, parts.begin ()); p != parts.end (); ++p)
-    (*p)->destroy ();
+  for (auto &&at : parts)
+    at->destroy ();
 
   return 0;
 }
@@ -485,10 +495,8 @@
 archetype::commit_load ()
 {
   // unlink old archetypes and link in new ones */
-  for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p)
+  for (auto &&at : postponed_arch)
     {
-      archetype *at = *p;
-
       if (archetype *old = find (at->archname))
         old->unlink ();
 
@@ -501,13 +509,13 @@
   postponed_arch.clear ();
 
   // now resolve arch references
-  for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p)
+  for (auto &&p : postponed_arch_ref) // not yet C++17
     {
-      arch_ptr *ap = p->first;
-      archetype *at = find (p->second);
+      arch_ptr *ap = p.first;
+      archetype *at = find (p.second);
 
       if (!at)
-        LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
+        LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p.second);
 
       *ap = at;
     }
@@ -520,7 +528,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
@@ -539,7 +547,7 @@
         ++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);
 
@@ -574,12 +582,6 @@
  * 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);
@@ -594,7 +596,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)