--- deliantra/server/include/object.h	2006/12/31 10:28:36	1.77
+++ deliantra/server/include/object.h	2006/12/31 17:17:23	1.78
@@ -242,8 +242,8 @@
   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;  // active objects, not yet used
-  static vector objects; // not used yet, use first->next->...
+  //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 ();
@@ -339,8 +339,11 @@
   // handles both inventory and map "positions"
   MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
 
-  MTH void activate (bool recursive = true);
-  MTH void deactivate (bool recursive = true);
+  MTH bool active () const;
+  MTH void activate   ();
+  MTH void deactivate ();
+  MTH void activate_recursive   ();
+  MTH void deactivate_recursive ();
 
   void enter_exit (object *exit);//PERL
   MTH void enter_map (maptile *newmap, int x, int y);