--- deliantra/server/common/arch.C	2007/04/16 10:14:25	1.47
+++ deliantra/server/common/arch.C	2007/04/17 10:06:32	1.52
@@ -277,14 +277,6 @@
   return 0;
 }
 
-void
-init_archetypes (void)
-{
-  load_archetypes ();
-
-  empty_archetype = archetype::find ("empty_archetype");
-}
-
 archetype::archetype ()
 {
   clone.arch = this;
@@ -321,65 +313,107 @@
   at->clone = *op;
   
   at->clone.arch = at;
-  //TODO: inv et al.
+  at->clone.inv = op->inv; op->inv = 0;
+
+  op->destroy ();
 }
 
-archetype *
-archetype::read (object_thawer &f)
+bool
+archetype::load (object_thawer &f)
 {
   assert (f.kw == KW_object);
 
-  archetype *head = get (f.get_str ());
-  unlink (head);
-  object *op = object::create ();
-
-  if (!op->parse_kv (f))
-    {
-      op->destroy (true);
-      // leak head
-      return 0;
-    }
+  typedef std::pair<archetype *, object *> part;
+  std::vector<part> parts;
 
-  overwrite (head, op);
-  op->destroy ();
+  coroapi::cede_to_tick_every (100);
 
-  for (archetype *prev = head; f.kw == KW_more; )
+  for (;;)
     {
-      f.next ();
-      assert (f.kw == KW_object);
-
-      archetype *more = get (f.get_str ());
-      unlink (more);
+      archetype *at = get (f.get_str ());
       object *op = object::create ();
 
       if (!op->parse_kv (f))
-        {
-          op->destroy (true);
-          // leak head more*
-          return 0;
-        }
-
-      overwrite (more, op);
-      op->destroy ();
+        goto fail;
 
-      if (more->clone.x > head->tail_x) head->tail_x = more->clone.x;
-      if (more->clone.y > head->tail_y) head->tail_y = more->clone.y;
+      parts.push_back (std::make_pair (at, op));
 
-      more->head       = head;
-      more->clone.head = &head->clone;
-      prev->more       = more;
-      prev->clone.more = &more->clone;
+      if (f.kw != KW_more)
+        break;
 
-      prev = more;
+      f.next ();
+      assert (f.kw == KW_object);
     }
 
-  if (!head->next)
-    {
-      head->next = first_archetype;
-      first_archetype = head;
-    }
+  {
+    archetype *head = parts.front ().first;
+
+    // check that all archetypes belong to the same object or are heads
+    for (auto (p, parts.begin ()); p != parts.end (); ++p)
+      {
+        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);
+            goto fail;
+          }
+
+        if (at->next && at != head)
+          {
+            LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
+            goto fail;
+          }
+      }
+
+    // sever chain of existing head object
+    for (archetype *more, *at = head; at; at = more)
+      {
+        more = at->more;
+
+        at->head = 0;
+        at->more = 0;
+      }
+
+    // replace/update head
+    overwrite (head, parts.front ().second);
+    head->tail_x = 0;
+    head->tail_y = 0;
+
+    // link into list of heads, if not already there
+    if (!head->linked)
+      {
+        head->linked = true;
+        head->next = first_archetype;
+        first_archetype = head;
+      }
+
+    // reassemble new chain
+    archetype *prev = head;
+    for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
+      {
+        archetype *at = p->first;
+        overwrite (at, p->second);
+
+        if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
+        if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;
+
+        at->head         = head;
+        at->clone.head   = &head->clone;
+        prev->more       = at;
+        prev->clone.more = &at->clone;
+
+        prev = at;
+      }
+  }
+
+  return true;
+
+fail:
+  for (auto (p, parts.begin ()); p != parts.end (); ++p)
+    p->second->destroy (true);
 
-  return head;
+  return false;
 }
 
 /*
@@ -395,7 +429,7 @@
         {
           case KW_object:
             loading_arch = true;
-            if (!archetype::read (f))
+            if (!archetype::load (f))
               {
                 loading_arch = false;
                 return false;
@@ -421,24 +455,23 @@
  * Reads and parses the archetype file (with the first and second-pass
  * functions).
  */
-void
-load_archetypes (void)
+bool
+load_archetype_file (const char *filename)
 {
-  char filename[MAX_BUF];
-
-  sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
-  LOG (llevDebug, "Reading archetypes from %s:\n", filename);
-
   object_thawer f (filename);
 
   f.next ();
 
   if (!load_archetypes (f))
-    cleanup ("unable to load archetypes");
+    return false;
 
   warn_archetypes = 1;
 
-  load_treasures ();
+  empty_archetype = archetype::find ("empty_archetype");
+  if (!empty_archetype)
+    return false;
+
+  return true;
 }
 
 /*
@@ -497,36 +530,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.
  */
@@ -536,7 +539,7 @@
   if (!name)
     return 0;
 
-  AUTODECL (i, ht.find (name));
+  auto (i, ht.find (name));
 
   if (i == ht.end ())
     return 0;