--- deliantra/server/include/player.h	2007/05/28 21:15:56	1.59
+++ deliantra/server/include/player.h	2007/06/24 00:33:54	1.62
@@ -97,7 +97,7 @@
 {
   client *ACC (RO, ns);               /* Socket information for this player */
   object *ACC (RW, ob);               /* The object representing the player */
-  int ACC (RO, active);
+  object_vector_index ACC (RO, active);
 
   bowtype_t ACC (RW, bowtype);        /* which firemode? */
   petmode_t ACC (RW, petmode);        /* which petmode? */
@@ -132,6 +132,7 @@
   object_ptr ACC (RW, combat_ob);     // which weapon/bow/skill to use for direct attacks
   object_ptr ACC (RW, ranged_ob);     // which skill/item/spell to use for ranged attacks
   object_ptr ACC (RW, golem);         // the currently controlled golem
+  object_ptr ACC (RW, observe);       // the object that is being observed (or 0)
 
   sint16 ACC (RW, bed_x), ACC (RW, bed_y);          /* x,y - coordinates of respawn (savebed) */
   shstr ACC (RW, savebed_map);    /* map where player will respawn after death */
@@ -194,6 +195,8 @@
   MTH void chargen_race_done ();
   MTH void chargen_race_next ();
 
+  MTH void set_observe (object *ob);
+
   ~player ();
 
 private:
@@ -207,5 +210,5 @@
 
 #define for_all_players(var)			\
   for (unsigned _i = 0; _i < players.size (); ++_i)	\
-    declvar (player *, var, players [_i])
+    statementvar (player *, var, players [_i])