--- deliantra/server/include/object.h	2007/01/08 14:11:05	1.82
+++ deliantra/server/include/object.h	2007/01/09 21:32:42	1.84
@@ -228,6 +228,8 @@
   object *ACC (RW, above);	/* Pointer to the object stacked above this one */
                                 /* Note: stacked in the *same* environment */
   object *inv;			/* Pointer to the first object in the inventory */
+
+  //TODO: container must move into client
   object *ACC (RW, container);	/* Current container being used.  I think this
 				 * is only used by the player right now.
 				 */
@@ -238,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
@@ -389,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;
 
@@ -458,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.
  */