--- deliantra/server/include/object.h	2007/01/08 22:32:10	1.83
+++ deliantra/server/include/object.h	2007/01/11 01:10:01	1.85
@@ -240,10 +240,6 @@
   object *head;			/* Points to the main object of a large body */ // NO ACC, perl semantics are different
   client_container *seen_by;    // seen by which player/container currently?
 
-  //static vector active_list;  // active objects, not yet used
-  //static vector object_list; // not used yet, use first->next->...
-  static object *first;  // will be replaced by "objects"
-
   MTH static object *create ();
   MTH void copy_to (object *dst);
   MTH object *clone (); // create + copy_to
@@ -310,7 +306,7 @@
   // contr => is a player
   // head  => only save head of a multitile object
   // owner => can not reference owner yet
-  MTH bool can_map_save () const { return !contr && !head && !owner; }
+  MTH bool can_map_save () const { return !contr && !head && !owner && !flag [FLAG_NO_SAVE]; }
 
   /* This return true if object has still randomitems which
    * could be expanded.
@@ -391,6 +387,14 @@
     return this;
   }
 
+  /* This returns TRUE if the object is something that
+   * should be displayed in the floorbox/inventory window
+   */
+  MTH bool client_visible () const
+  {
+    return !invisible && type != PLAYER;
+  }
+
 protected:
   friend struct archetype;
 
@@ -460,11 +464,6 @@
 						 */
 };
 
-/* This returns TRUE if the object is something that
- * should be displayed in the floorbox window
- */
-#define LOOK_OBJ(ob) (!ob->invisible && ob->type != PLAYER && ob->type != EVENT_CONNECTOR)
-
 /* Used by update_object to know if the object being passed is
  * being added or removed.
  */