[ViewVC] Diff of: cvs/deliantra/server/common/loader.C

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.107 by root, Fri Apr 11 14:09:56 2008 UTC vs.
Revision 1.110 by root, Sun Apr 20 05:24:55 2008 UTC

 /*
  * 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
  *
  * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
       || type == AMULET  || type == GIRDLE
       || type == BRACERS || type == CLOAK)
     {
       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;
         }
       int ip = calc_item_power (this, 0);
        ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
     {
       /* 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 */
     }
   /* 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 */
       /* without this, value is all screwed up */
       value = arch->value * inv->value;
   if (QUERY_FLAG (this, FLAG_MONSTER))
     {
       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;
         }
       /* The archs just need to be updated for this */
       if (move_type == 0)
         move_type = MOVE_WALK;
     }
   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
+    /* Object will duplicate it's content as part of the
-       * generation process. To do this, we must flag inventory
+     * generation process. To do this, we must flag inventory
-       * so it remains unevaluated concerning the randomitems and
+     * so it remains unevaluated concerning the randomitems and
-       * the living (a demonlord shouldn't cast from inside generator!)
+     * 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);
+    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)
     {
       if (!move_type)
               goto next;
             }
         }
-      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: ;
     }
 }
               }
             }
             continue;
           case KW_other_arch:
-            other_arch =
-              loading_arch
+            if (loading_arch == this)
-                ? archetype::get  (f.get_str ())
+              archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
+            else
+              {
-                : archetype::find (f.get_str ());
+                other_arch = archetype::find (f.get_str ());
-            if (!other_arch)
+                if (!other_arch)
-              f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
+                  f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
+              }
             break;
           case KW_owner:
             f.delayed_deref (this, owner, f.get_str ());
             break;
           case KW_is_turnable:          GET_FLAG (this, FLAG_IS_TURNABLE); break;
           case KW_is_used_up:           GET_FLAG (this, FLAG_IS_USED_UP); break;
           case KW_alive:                GET_FLAG (this, FLAG_ALIVE); break;
           case KW_applied:              GET_FLAG (this, FLAG_APPLIED); break;
           case KW_unpaid:               GET_FLAG (this, FLAG_UNPAID); break;
+          case KW_player_sold:          GET_FLAG (this, FLAG_PLAYER_SOLD); break;
           case KW_is_animated:          GET_FLAG (this, FLAG_ANIMATE); break;
           case KW_no_pick:              GET_FLAG (this, FLAG_NO_PICK); break;
           case KW_reflecting:           GET_FLAG (this, FLAG_REFLECTING); break;
           case KW_changing:             GET_FLAG (this, FLAG_CHANGING); break;
           case KW_splitting:            GET_FLAG (this, FLAG_SPLITTING); break;
  * the only place this is not set is when saving the player.
  */
 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);
   for (object *tmp = inv; tmp; tmp = tmp->below)
 /////////////////////////////////////////////////////////////////////////////
 // generic resource file load,
 // currently supports: region, treasures, archetypes
+bool
-bool load_resource_file (const char *filename)
+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;
+            return true;
-            goto finish;
           default:
             if (!f.parse_error ("resource file"))
-              goto finish;
+              return false;
             f.next ();
             break;
         }
     }
-finish:
-  if (seen_arch)
-    init_archetype_pointers ();
-  return success;
 }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/loader.C (file contents): Revision 1.107 by root, Fri Apr 11 14:09:56 2008 UTC vs. Revision 1.110 by root, Sun Apr 20 05:24:55 2008 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.107 by root, Fri Apr 11 14:09:56 2008 UTC vs.
Revision 1.110 by root, Sun Apr 20 05:24:55 2008 UTC