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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.24 by root, Mon Dec 18 02:35:00 2006 UTC vs.
Revision 1.29 by root, Mon Dec 25 17:11:16 2006 UTC

   if (!op->name_pl)
     op->name_pl = op->name;
   /* objects now have a materialname.  try to patch it in */
-  if (!(IS_WEAPON (op) && op->level > 0))
+  if (!(op->is_weapon () && op->level > 0))
     {
       if (op->map != NULL)
         set_materialname (op, op->map->difficulty, NULL);
       else
         set_materialname (op, 5, NULL);
     SET_FLAG (op, flag);        \
   else                          \
     CLEAR_FLAG (op, flag)       \
 int
-parse_object (object *op, object_thawer & thawer, int map_flags)
+parse_object (object *op, object_thawer &thawer, int map_flags)
 {
   bool ismore = 0;
   object *op_inv = op->inv;
   for (;;)
         {
           case KW_Object:    // uppercase alias
           case KW_object:
             thawer.get (op->name);
-            if (op->arch != NULL)
+            if (op->arch)
               op->arch->name = op->name;
             break;
           case KW_uuid:
           case KW_no_damage:            GET_FLAG (op, FLAG_NO_DAMAGE); break;
           case KW_generator:            GET_FLAG (op, FLAG_GENERATOR); break;
           case KW_use_content_on_gen:   GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
           case KW_is_thrown:            GET_FLAG (op, FLAG_IS_THROWN); break;
           case KW_auto_apply:           GET_FLAG (op, FLAG_AUTO_APPLY); break;
-          case KW_treasure:             GET_FLAG (op, FLAG_TREASURE); break;
           case KW_see_invisible:        GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
           case KW_can_roll:             GET_FLAG (op, FLAG_CAN_ROLL); break;
           case KW_overlay_floor:        GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
           case KW_is_turnable:          GET_FLAG (op, FLAG_IS_TURNABLE); break;
           case KW_is_used_up:           GET_FLAG (op, FLAG_IS_USED_UP); break;
  *  LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
  *      be reset.
  *  LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
  *
  */
 int
-load_object (object_thawer & fp, object *op, int map_flags)
+load_object (object_thawer &fp, object *op, int map_flags)
 {
   return parse_object (op, fp, map_flags);
 }
 /* This takes a buffer, scans it for variables, and sets those variables
  * as appropriate in op.
  *
  * This function appears to be used in only 2 places - in crossedit to
     KW_monster,
     KW_friendly,
     KW_generator,
     KW_is_thrown,
     KW_auto_apply,
-    KW_treasure,
+    KW_NULL, // was KW_treasure
     KW_player_sold,
     /* 20 */
     KW_see_invisible,
     KW_can_roll,
     KW_overlay_floor,
   CMP_OUT (move_on);
   CMP_OUT (move_off);
   CMP_OUT (move_slow);
   CMP_OUT (move_slow_penalty);
-  if (op->flags != tmp->flags)
+  if (op->flag != tmp->flag)
     for (i = 0; i <= NUM_FLAGS; i++)
-      if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i)))
+      if (flag_names [i] && op->flag [i] != tmp->flag [i])
-        f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0");
+        f.put (flag_names [i], op->flag [i] ? "1" : "0");
   /* Save body locations */
   for (i = 0; i < NUM_BODY_LOCATIONS; i++)
     if (op->body_info[i] != tmp->body_info[i])
       f.put (body_locations[i].save_name, op->body_info[i]);
 /*
  * Dumps all variables in an object to a file.
  * If bit 0 of flag is set, unpaid objects will be saved.  As of now,
  * the only place this is not set is when saving the player.
- * If bit 1 of flag is set, don't remove the object after save.  As of now,
- * all of the callers are setting this.
  */
 void
-save_object (object_freezer & fp, object *op, int flag)
+save_object (object_freezer &fp, object *op, int flag)
 {
-  archetype *at;
-  object *tmp, *old;
   /* Even if the object does have an owner, it would seem that we should
    * still save it.
    */
   if (op->owner)
     return;
   /* If it is unpaid and we don't want to save those, just return. */
-  if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID)))
+  if (!(flag & 1) && op->flag [FLAG_UNPAID])
     return;
-  if ((at = op->arch) == NULL)
+  archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
-    at = empty_archetype;
   fp.put (KW_arch, at->name);
   put (fp, op, &at->clone);
   /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
-  old = NULL;
-  if (flag & 2)
-    for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
+  for (object *tmp = op->inv; tmp; tmp = tmp->below)
-      save_object (fp, tmp, flag);
+    save_object (fp, tmp, flag);
-  else
-    /* Slightly different logic because tmp/op will be removed by
-     * the save_object we call.  So we just keep looking at op->inv
-     * until there is nothing left.  In theory, the variable old
-     * should not be needed, as recursive loops shouldn't happen.
-     */
-    while ((tmp = op->inv) != NULL)
-      {
-        if (old == tmp)
-          {
-            LOG (llevError, " Recursive loop in inventory\n");
-            break;
-          }
-        save_object (fp, tmp, flag);
-        old = tmp;
-      }
-  if (!(flag & 2))
-    op->destroy ();
   fp.put (op);
   fprintf (fp, "end\n");
 }

Diff Legend

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

Comparing deliantra/server/common/loader.C (file contents): Revision 1.24 by root, Mon Dec 18 02:35:00 2006 UTC vs. Revision 1.29 by root, Mon Dec 25 17:11:16 2006 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.24 by root, Mon Dec 18 02:35:00 2006 UTC vs.
Revision 1.29 by root, Mon Dec 25 17:11:16 2006 UTC