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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.97 by root, Wed Aug 1 19:15:49 2007 UTC vs.
Revision 1.103 by root, Sun Sep 30 20:22:13 2007 UTC

 #include <global.h>
 #include <loader.h>
 #include <sproto.h>
 /////////////////////////////////////////////////////////////////////////////
+extern archetype *loading_arch;
 /* This table is only necessary to convert objects that existed before the
  * spell object conversion to the new object.  It was not practical
  * to go through every mapping looking for every potion, rod, wand, etc
  * that had a sp set and update to the new value.  So this maps the
   "spell_cause_rabies",         /* 204 */
   "spell_glyph",                /* 205 */
   NULL
 };
-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.
  */
   /* Old spellcasting object - need to load in the appropiate object */
   if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
        /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
        ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
     {
-      /* Fireall is bizarre in that spell type was stored in dam.  Rest are 'normal'
+      /* Firewall 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[type == FIREWALL ? stats.dam : stats.sp]);
       insert_ob_in_ob (tmp, this);
       randomitems = NULL;   /* So another spell isn't created for this object */
           case KW_attach:       f.get_ornull (attach); break;
           case KW_skill:        f.get_ornull (skill); break;
           case KW_race:         f.get_ornull (race); break;
           case KW_slaying:      f.get_ornull (slaying); break;
+          case KW_tag:          f.get_ornull (tag); break;
           case KW_arch:
             {
               object *tmp = object::read (f);
               tmp->deactivate ();
               {
                 // was: insert_ob_in_ob (tmp, op);
                 // but manually adding it can improve map loading times a lot
                 // also, appending instead of prepending keeps the
                 // save ordering the same between repeated load/saves.
+                // and finally we do not want any funny effects
                 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
                 CLEAR_FLAG (tmp, FLAG_REMOVED);
                 if (!op_inv)
                   {
             if (!other_arch)
               LOG (llevError, "%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_animation:
             {
               CLEAR_FLAG (this, FLAG_ANIMATE);
               animation_id = 0;
             face = face_find (f.get_str ());
             break;
           case KW_sound:
             sound = sound_find (f.get_str ());
+            if (!sound)
+              f.parse_warn ("sound not found");
             break;
           case KW_sound_destroy:
             sound_destroy = sound_find (f.get_str ());
+            if (!sound_destroy)
+              f.parse_warn ("sound not found");
             break;
           case KW_x: f.get (x); break;
           case KW_y: f.get (y); break;
 int
 set_variable (object *op, char *buf)
 {
   object_thawer f (buf, (AV *)0);
-  f.next ();
   return op->parse_kv (f);
 }
 /* This returns a string of the integer movement type */
 #if 0
     char uids[64];
     snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
     f.put (KW_uuid, (const char *)uids);
   }
-#define CMP_OUT(v)    if (op->v != tmp->v) f.put (KW_ ## v, op->v)
+#define CMP_OUT(v)    if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
-#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v)
+#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
+  if (object *owner = op->owner)
+    f.put (KW_owner, static_cast<const char *>(owner->ref ()));
   CMP_OUT (name);
   CMP_OUT (name_pl);
   CMP_OUT (custom_name);
   CMP_OUT (title);
   CMP_OUT (race);
   CMP_OUT (slaying);
+  CMP_OUT (tag);
   CMP_OUT (other_arch);
   if (op->msg  != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
   if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
   CMP_OUT (type);
   CMP_OUT (subtype);
   CMP_OUT (attacktype);
   for (i = 0; i < NROFATTACKS; i++)
-    if (op->resist[i] != tmp->resist[i])
+    if (expect_false (op->resist[i] != tmp->resist[i]))
       f.put (resist_save[i], op->resist[i]);
   CMP_OUT (path_attuned);
   CMP_OUT (path_repelled);
   CMP_OUT (path_denied);
   CMP_OUT (move_slow);
   CMP_OUT (move_slow_penalty);
   if (op->flag != tmp->flag)
     for (i = 0; i <= NUM_FLAGS; i++)
-      if (flag_names [i] && op->flag [i] != tmp->flag [i])
+      if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
         f.put (flag_names [i], op->flag [i] ? "1" : "0");
   // save body locations
   for (i = 0; i < NUM_BODY_LOCATIONS; i++)
-    if (op->slot[i].info != tmp->slot[i].info)
+    if (expect_false (op->slot[i].info != tmp->slot[i].info))
       f.put (body_locations[i].save_name, op->slot[i].info);
 }
 /*
  * Dumps all variables in an object to a file.
  * the only place this is not set is when saving the player.
  */
 bool
 object::write (object_freezer &f)
 {
-  /* Even if the object does have an owner, it would seem that we should
-   * still save it.
-   */
-  if (owner)
-    return true;
   archetype *at = arch ? (archetype *)arch : empty_archetype;
   f.put (KW_arch, at->archname);
   write_diff (f, this, at);
   object_thawer f (filename);
   bool success   = false;
   bool seen_arch = false;
-  f.next ();
   for (;;)
     {
       switch (f.kw)
         {
           case KW_region:

Diff Legend

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

Comparing deliantra/server/common/loader.C (file contents): Revision 1.97 by root, Wed Aug 1 19:15:49 2007 UTC vs. Revision 1.103 by root, Sun Sep 30 20:22:13 2007 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.97 by root, Wed Aug 1 19:15:49 2007 UTC vs.
Revision 1.103 by root, Sun Sep 30 20:22:13 2007 UTC