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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.83 by root, Sat May 19 00:08:11 2007 UTC vs.
Revision 1.101 by root, Tue Sep 4 18:20:35 2007 UTC

 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Crossfire TRT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
    sub/add_weight will transcend the environment updating the carrying
    variable. */
 #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.
  */
    * also have to catch is if this object is not using the normal name for
    * the object.  In that case, we also want to use the loaded name.
    * Otherwise, what happens is that the the plural name will lose
    * information (appear as just 'hearts' and not 'goblins heart')
    */
-  if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl)
+  if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
     name_pl = 0;
   if (!name_pl)
     name_pl = name;
        * something that has item_power 1 is probably just fine if our calculated
        * value is 1 or 2 - these values are small enough that hard to be precise.
        * similarly, it item_power is 0, the first check will always pass,
        * but not the second one.
        */
+#if 0 //TODO
       if (ip > 2 * item_power && ip > (item_power + 3))
         LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
+#endif
     }
   /* 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 */
     {
       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->clone.value * inv->value;
+      value = arch->value * inv->value;
     }
   if (QUERY_FLAG (this, FLAG_MONSTER))
     {
       if (stats.hp > stats.maxhp)
 next: ;
     }
 }
-#define GET_FLAG(op,flag)       \
+#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
-  if (f.get_sint32 ())     \
-    SET_FLAG (op, flag);        \
-  else                          \
-    CLEAR_FLAG (op, flag)       \
 bool
 object::parse_kv (object_thawer &f)
 {
   object *op_inv = 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;
             f.get (move_slow_penalty);
             break;
           case KW_face:
             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;
               CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
             break;
           case KW_friendly:
-            if (f.get_sint32 ())
+            if (f.get_bool ())
               if (type != PLAYER)
                 add_friendly_object (this);
             break;
               randomitems = 0;
             break;
           case KW_msg:
             f.get_ml (KW_endmsg, msg);
-            //TODO: allow longer messages
-            if (strlen (msg) >= HUGE_BUF)
-              {
-                LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
-                msg = "ERROR, please report: string too long, winged.\n";
-              }
             break;
           case KW_lore:
             f.get_ml (KW_endlore, lore);
-            //TODO: allow longer messages
-            /* Just print a warning so we can be reasonably safe
-             * about not overflowing the buffer.
-             */
-            if (strlen (lore) > (HUGE_BUF / 2))
-              LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
-                   HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
             break;
           case KW_editable:
           case KW_editor_folder:
             break;
   f.next ();
   object *op = object::create ();
   op->map = map;
-  arch->clone.copy_to (op);
+  arch->copy_to (op);
   // copy_to activates, this should be fixed properly
   op->deactivate ();
   if (!op->parse_kv (f))
     {
 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);
-  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 (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);
-  if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
+  if (op->face          != tmp->face         ) f.put (KW_face         , op->face          ? &faces [op->face         ] : 0);
+  if (op->sound         != tmp->sound        ) f.put (KW_sound        , op->sound         ? &faces [op->sound        ] : 0);
+  if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
   if (op->animation_id != tmp->animation_id)
     if (op->animation_id)
       {
         f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
         if (!QUERY_FLAG (op, FLAG_ANIMATE))
-          f.put (KW_is_animated, (sint32) 0);
+          f.put (KW_is_animated, (sint32)0);
       }
     else
-      f.put (KW_animation, (const char *) 0);
+      f.put (KW_animation, (const char *)0);
   CMP_OUT2 (str, stats.Str);
   CMP_OUT2 (dex, stats.Dex);
   CMP_OUT2 (con, stats.Con);
   CMP_OUT2 (wis, stats.Wis);
   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->name);
+  f.put (KW_arch, at->archname);
-  write_diff (f, this, &at->clone);
+  write_diff (f, this, at);
   for (object *tmp = inv; tmp; tmp = tmp->below)
     tmp->write (f);
   f.put (this);
   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.83 by root, Sat May 19 00:08:11 2007 UTC vs. Revision 1.101 by root, Tue Sep 4 18:20:35 2007 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.83 by root, Sat May 19 00:08:11 2007 UTC vs.
Revision 1.101 by root, Tue Sep 4 18:20:35 2007 UTC