--- deliantra/server/common/loader.C	2008/04/13 13:32:48	1.108
+++ deliantra/server/common/loader.C	2008/04/20 05:24:55	1.110
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * 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
  * 
@@ -363,7 +363,7 @@
     {
       if (last_heal)
         {
-          LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
+          LOG (llevError, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
           gen_sp_armour = last_heal;
           last_heal = 0;
         }
@@ -399,6 +399,7 @@
       /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
        * in that spell was stored in sp.
        */
+      LOG (llevError, "old spellcasting object found: %s", debug_desc ());
       object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
       insert_ob_in_ob (tmp, this);
       randomitems = NULL;   /* So another spell isn't created for this object */
@@ -407,6 +408,7 @@
   /* spellbooks & runes use slaying.  But not to arch name, but to spell name */
   if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
     {
+      LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
       object *tmp = get_archetype_by_object_name (slaying);
       insert_ob_in_ob (tmp, this);
       randomitems = NULL;   /* So another spell isn't created for this object */
@@ -418,7 +420,7 @@
     {
       if (stats.hp > stats.maxhp)
         {
-          LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
+          LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
           stats.maxhp = stats.hp;
         }
 
@@ -428,19 +430,18 @@
     }
 
   if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
-    {
-      /* Object will duplicate it's content as part of the
-       * generation process. To do this, we must flag inventory
-       * so it remains unevaluated concerning the randomitems and
-       * the living (a demonlord shouldn't cast from inside generator!)
-       */
-      flag_inv (this, FLAG_IS_A_TEMPLATE);
-    }
+    /* Object will duplicate it's content as part of the
+     * generation process. To do this, we must flag inventory
+     * so it remains unevaluated concerning the randomitems and
+     * the living (a demonlord shouldn't cast from inside generator!)
+     */
+    /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
+    flag_inv (this, FLAG_IS_A_TEMPLATE);
 
-  /* Handle player movers.  We use move_type for player movers
+  /* Handle player movers. We use move_type for player movers
    * because they operate on their own time (move_on
    * would potentially cause them to be triggered when someone steps
-   * on them).  If move_type is set, presume person knows what they
+   * on them). If move_type is set, presume person knows what they
    * are doing, otherwise, set move_type based on maxhp value.
    */
   if (type == PLAYERMOVER)
@@ -512,7 +513,7 @@
             }
         }
 
-      LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str);
+      LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
 
 next: ;
     }
@@ -589,13 +590,15 @@
             continue;
 
           case KW_other_arch:
-            other_arch =
-              loading_arch
-                ? archetype::get  (f.get_str ())
-                : archetype::find (f.get_str ());
+            if (loading_arch == this)
+              archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
+            else
+              {
+                other_arch = archetype::find (f.get_str ());
 
-            if (!other_arch)
-              f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
+                if (!other_arch)
+                  f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
+              }
             break;
 
           case KW_owner:
@@ -1407,7 +1410,7 @@
 bool
 object::write (object_freezer &f)
 {
-  archetype *at = arch ? (archetype *)arch : empty_archetype;
+  archetype *at = arch ? arch : archetype::empty;
 
   f.put (KW_arch, at->archname);
   write_diff (f, this, at);
@@ -1425,51 +1428,41 @@
 
 // generic resource file load,
 // currently supports: region, treasures, archetypes
-bool load_resource_file (const char *filename)
+bool
+load_resource_file_ (const char *filename)
 {
   object_thawer f (filename);
 
-  bool success   = false;
-  bool seen_arch = false;
-
   for (;;)
     {
       switch (f.kw)
         {
           case KW_region:
             if (!region::read (f))
-              goto finish;
+              return false;
             break;
 
           case KW_treasure:
           case KW_treasureone:
             if (!treasurelist::read (f))
-              goto finish;
+              return false;
             break;
 
           case KW_object:
-            seen_arch = true;
             if (!archetype::read (f))
-              goto finish;
+              return false;
             break;
 
           case KW_EOF:
-            success = true;
-            goto finish;
+            return true;
 
           default:
             if (!f.parse_error ("resource file"))
-              goto finish;
+              return false;
 
             f.next ();
             break;
         }
     }
-
-finish:
-  if (seen_arch)
-    init_archetype_pointers ();
-
-  return success;
 }