--- deliantra/server/include/object.h	2007/01/08 22:32:10	1.83
+++ deliantra/server/include/object.h	2007/01/11 23:17:04	1.86
@@ -1,26 +1,26 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
-    Copyright (C) 2001 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program 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
-    (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
-    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
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The authors can be reached via e-mail at crossfire@schmorp.de
-*/
+ * CrossFire, A Multiplayer Online RPG
+ *
+ * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
+ * Copyright (C) 1992 Frank Tore Johansen
+ *
+ * This program 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
+ * (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
+ * 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
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * The authors can be reached via e-mail at crossfire@schmorp.de
+ */
 
 #ifndef OBJECT_H
 #define OBJECT_H
@@ -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.
  */