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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.67 by root, Sun Mar 18 03:05:39 2007 UTC vs.
Revision 1.74 by root, Sat Apr 28 18:18:04 2007 UTC

   "spell_cause_rabies",         /* 204 */
   "spell_glyph",                /* 205 */
   NULL
 };
-extern int arch_init;
+extern bool loading_arch;
 /* This function checks the object after it has been loaded (when we
  * get the 'end' in the input stream).  This function can be used to
  * deal with legacy objects where fields may have changed.  It can also be used
  * to check for objects to make sure there are no common errors.
   /* only do these when program is first run - a bit
    * excessive to do this at every run - most of this is
    * really just to catch any errors - program will still run, but
    * not in the ideal fashion.
    */
-  if ((op->type == WEAPON || op->type == BOW) && arch_init)
+  if ((op->type == WEAPON || op->type == BOW) && loading_arch)
     {
       if (!op->skill)
         LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
       else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) ||
                (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
     }
   /* Old spellcasting object - need to load in the appropiate object */
   if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL ||
        /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
-       ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init)
+       ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !loading_arch)
     {
       /* Fireall is bizarre in that spell type was stored in dam.  Rest are 'normal'
        * in that spell was stored in sp.
        */
       object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]);
       insert_ob_in_ob (tmp, op);
       op->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 ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init)
+  if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !loading_arch)
     {
       object *tmp = get_archetype_by_object_name (op->slaying);
       insert_ob_in_ob (tmp, op);
       op->randomitems = NULL;   /* So another spell isn't created for this object */
       /* without this, value is all screwed up */
     { "flying"  , MOVE_FLY_LOW | MOVE_FLY_HIGH },
     { "fly_low" , MOVE_FLY_LOW },
     { "fly_high", MOVE_FLY_HIGH },
     { "swim"    , MOVE_SWIM },
     { "boat"    , MOVE_BOAT },
+    { "ship"    , MOVE_SHIP },
     { "all"     , MOVE_ALL },
   };
   if (!str)
     {
     CLEAR_FLAG (op, flag)       \
 bool
 object::parse_kv (object_thawer &f)
 {
-  assert (f.kw == KW_object || f.kw == KW_arch);
-  if (f.kw == KW_object)
-    f.get (name); // preset name from object name
-  f.next ();
   object *op_inv = inv;
   for (;;)
     {
       switch (f.kw)
               }
             }
             continue;
           case KW_other_arch:
+            other_arch =
+              loading_arch
+                ? archetype::get  (f.get_str ())
-            other_arch = archetype::find (f.get_str ());
+                : archetype::find (f.get_str ());
+            if (!other_arch)
+              LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
             break;
           case KW_animation:
             {
               CLEAR_FLAG (this, FLAG_ANIMATE);
           case KW_no_steal:             GET_FLAG (this, FLAG_NO_STEAL); break;
           case KW_one_hit:              GET_FLAG (this, FLAG_ONE_HIT); break;
           case KW_berserk:              GET_FLAG (this, FLAG_BERSERK); break;
           case KW_is_buildable:         GET_FLAG (this, FLAG_IS_BUILDABLE); break;
           case KW_destroy_on_death:     GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
+          case KW_treasure_env:         GET_FLAG (this, FLAG_TREASURE_ENV); break;
+          case KW_precious:             GET_FLAG (this, FLAG_PRECIOUS); break;
           case KW_armour:               f.get (resist[ATNR_PHYSICAL]); break;
           case KW_resist_physical:      f.get (resist[ATNR_PHYSICAL]); break;
           case KW_resist_magic:         f.get (resist[ATNR_MAGIC]); break;
           case KW_resist_fire:          f.get (resist[ATNR_FIRE]); break;
           case KW_connected:
             add_button_link (this, map, f.get_sint32 ());
             break;
           case KW_randomitems:
-            randomitems = find_treasurelist (f.get_str ());
+            if (f.get_str ())
+              {
+                randomitems =
+                  loading_arch
+                    ? treasurelist::get  (f.get_str ())
+                    : treasurelist::find (f.get_str ());
-            //if (!randomitems)
+                if (!randomitems)
-            //  LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
+                  LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
+              }
             break;
           case KW_msg:
             f.get_ml (KW_endmsg, msg);
             //TODO: allow longer messages
             break;
           case KW_end:
             check_loaded_object (this);
-            if (!arch_init)
+            if (!loading_arch)
               instantiate ();
             f.next ();
             return true;
       arch = archetype::find ("earthwall");
     }
   assert (arch); //D maybe use exception handling of sorts?
+  f.next ();
   object *op = object::create ();
   op->map = map;
-  op->arch = arch;
   arch->clone.copy_to (op);
   // copy_to activates, this should be fixed properly
   op->deactivate ();
   if (!op->parse_kv (f))
     {
-      delete op;
+      op->destroy (true);
       return  0;
     }
   return op;
 }
 int
 set_variable (object *op, char *buf)
 {
   object_thawer f (buf, (AV *)0);
-  f.kw = KW_arch; // special hack so that parse_kv skips
+  f.next ();
   return op->parse_kv (f);
 }
 /* This returns a string of the integer movement type */
 #if 0
     KW_monster,
     KW_friendly,
     KW_generator,
     KW_is_thrown,
     KW_auto_apply,
-    KW_NULL, // was KW_treasure
+    KW_treasure_env,
     KW_player_sold,
     /* 20 */
     KW_see_invisible,
     KW_can_roll,
     KW_overlay_floor,
     KW_can_use_skill,
     KW_been_applied,
     /* 80 */
     KW_has_ready_scroll,
     KW_can_use_rod,
-    KW_NULL,
+    KW_precious,
     KW_can_use_horn,
     KW_make_invisible,
     KW_inv_locked,
     KW_is_wooded,
     KW_is_hilly,
   return true;
 }
 /////////////////////////////////////////////////////////////////////////////
+// generic resource file load,
+// currently supports: region, treasures, archetypes
 bool load_resource_file (const char *filename)
 {
   object_thawer f (filename);
+  bool success   = false;
+  bool seen_arch = false;
   f.next ();
   for (;;)
     {
       switch (f.kw)
         {
           case KW_region:
             if (!region::read (f))
-              return false;
+              goto finish;
+            break;
+          case KW_treasure:
+          case KW_treasureone:
+            if (!treasurelist::read (f))
+              goto finish;
+            break;
+          case KW_object:
+            seen_arch = true;
+            if (!archetype::read (f))
+              goto finish;
             break;
           case KW_EOF:
-            return true;
+            success = true;
+            goto finish;
           default:
             if (!f.parse_error ("resource file"))
-              return false;
+              goto finish;
+            f.next ();
+            break;
         }
-        f.next ();
     }
+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.67 by root, Sun Mar 18 03:05:39 2007 UTC vs. Revision 1.74 by root, Sat Apr 28 18:18:04 2007 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.67 by root, Sun Mar 18 03:05:39 2007 UTC vs.
Revision 1.74 by root, Sat Apr 28 18:18:04 2007 UTC