--- deliantra/server/common/loader.C	2006/12/23 06:41:39	1.27
+++ deliantra/server/common/loader.C	2006/12/25 17:11:16	1.29
@@ -489,7 +489,7 @@
     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;
@@ -504,7 +504,7 @@
           case KW_object:
             thawer.get (op->name);
 
-            if (op->arch != NULL)
+            if (op->arch)
               op->arch->name = op->name;
 
             break;
@@ -1064,14 +1064,12 @@
  *  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.
  *
@@ -1445,16 +1443,10 @@
  * 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.
    */
@@ -1462,43 +1454,18 @@
     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)
-    at = empty_archetype;
+  archetype *at = op->arch ? (archetype *)op->arch : 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)
-      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 ();
+  for (object *tmp = op->inv; tmp; tmp = tmp->below)
+    save_object (fp, tmp, flag);
 
   fp.put (op);
   fprintf (fp, "end\n");