--- deliantra/server/common/arch.C	2007/04/16 12:37:08	1.49
+++ deliantra/server/common/arch.C	2007/04/17 18:59:05	1.54
@@ -318,18 +318,24 @@
   op->destroy ();
 }
 
-bool
-archetype::load (object_thawer &f)
+archetype *
+archetype::read (object_thawer &f)
 {
   assert (f.kw == KW_object);
 
+  loading_arch = true; // hack to tell parse_kv et al. to behave
+
   typedef std::pair<archetype *, object *> part;
   std::vector<part> parts;
 
+  coroapi::cede_to_tick_every (100);
+
   for (;;)
     {
-      archetype *at = get (f.get_str ());
       object *op = object::create ();
+      archetype *at = get (f.get_str ());
+      f.get (op->name);
+      f.next ();
 
       if (!op->parse_kv (f))
         goto fail;
@@ -340,14 +346,19 @@
         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;
 
     // check that all archetypes belong to the same object or are heads
-    for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p)
+    for (auto (p, parts.begin ()); p != parts.end (); ++p)
       {
         archetype *at = p->first;
 
@@ -379,15 +390,16 @@
     head->tail_y = 0;
 
     // link into list of heads, if not already there
-    if (!head->next)
+    if (!head->linked)
       {
+        head->linked = true;
         head->next = first_archetype;
         first_archetype = head;
       }
 
     // reassemble new chain
     archetype *prev = head;
-    for (AUTODECL (p, parts.begin () + 1); p != parts.end (); ++p)
+    for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
       {
         archetype *at = p->first;
         overwrite (at, p->second);
@@ -402,78 +414,30 @@
 
         prev = at;
       }
-  }
 
-  return true;
+    loading_arch = false;
+    return head;
+  }
 
 fail:
-  for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p)
+  for (auto (p, parts.begin ()); p != parts.end (); ++p)
     p->second->destroy (true);
 
-  return false;
+  loading_arch = false;
+  return 0;
 }
 
 /*
- * Reads/parses the archetype-file, and copies into a linked list
- * of archetype-structures.
+ * Initialize global archtype pointers:
  */
-static bool
-load_archetypes (object_thawer &f)
+void
+init_archetype_pointers ()
 {
-  for (;;)
-    {
-      switch (f.kw)
-        {
-          case KW_object:
-            loading_arch = true;
-            if (!archetype::load (f))
-              {
-                loading_arch = false;
-                return false;
-              }
-
-            loading_arch = false;
-            continue;
-
-          case KW_EOF:
-            return true;
-
-          default:
-            if (!f.parse_error ("archetypes file"))
-              return false;
-        }
-
-        f.next ();
-    }
-}
-
-/*
- * First initialises the archtype hash-table (init_archetable()).
- * Reads and parses the archetype file (with the first and second-pass
- * functions).
- */
-bool
-load_archetype_file (const char *filename)
-{
-  object_thawer f (filename);
-
-  f.next ();
-
-  // make sure the next - long - step is only done after a tick
-  coroapi::wait_for_tick_begin ();
-
-  if (!load_archetypes (f))
-    return false;
-
-  warn_archetypes = 1;
-
+  ring_arch       = archetype::find ("ring");
+  amulet_arch     = archetype::find ("amulet");
+  staff_arch      = archetype::find ("staff");
+  crown_arch      = archetype::find ("crown");
   empty_archetype = archetype::find ("empty_archetype");
-  if (!empty_archetype)
-    return false;
-
-  coroapi::cede ();
-
-  return true;
 }
 
 /*
@@ -485,15 +449,14 @@
 {
   if (!at)
     {
-      if (warn_archetypes)
-        LOG (llevError, "Couldn't find archetype.\n");
-
-      return NULL;
+      LOG (llevError, "Couldn't find archetype.\n");
+      return 0;
     }
 
   object *op = at->clone.clone ();
   op->arch = at;
   op->instantiate ();
+
   return op;
 }
 
@@ -532,36 +495,6 @@
 }
 
 /*
- * Hash-function used by the arch-hashtable.
- */
-
-unsigned long
-hasharch (const char *str, int tablesize)
-{
-  unsigned long hash = 0;
-  unsigned int i = 0;
-  const char *p;
-
-  /* use the one-at-a-time hash function, which supposedly is
-   * better than the djb2-like one used by perl5.005, but
-   * certainly is better then the bug used here before.
-   * see http://burtleburtle.net/bob/hash/doobs.html
-   */
-  for (p = str; i < MAXSTRING && *p; p++, i++)
-    {
-      hash += *p;
-      hash += hash << 10;
-      hash ^= hash >> 6;
-    }
-
-  hash += hash << 3;
-  hash ^= hash >> 11;
-  hash += hash << 15;
-
-  return hash % tablesize;
-}
-
-/*
  * Finds, using the hashtable, which archetype matches the given name.
  * returns a pointer to the found archetype, otherwise NULL.
  */
@@ -571,7 +504,7 @@
   if (!name)
     return 0;
 
-  AUTODECL (i, ht.find (name));
+  auto (i, ht.find (name));
 
   if (i == ht.end ())
     return 0;