--- deliantra/server/include/player.h	2007/05/28 21:15:56	1.59
+++ deliantra/server/include/player.h	2007/08/07 22:13:52	1.66
@@ -1,23 +1,22 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
  * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT 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.
+ * Crossfire TRT 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 3 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.
+ * 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
@@ -97,7 +96,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? */
@@ -106,13 +105,14 @@
   uint32 ACC (RW, count);             /* Any numbers typed before a command */
   uint32 ACC (RW, mode);              /* Mode of player for pickup. */
 
-  sint8 ACC (RW, digestion);          /* Any bonuses/penalties to digestion */
-  sint8 ACC (RW, gen_hp);             /* Bonuses to regeneration speed of hp */
-  sint8 ACC (RW, gen_sp);             /* Bonuses to regeneration speed of sp */
-  sint8 ACC (RW, gen_sp_armour);      /* Penalty to sp regen from armour */
-  sint8 ACC (RW, gen_grace);          /* Bonuses to regeneration speed of grace */
-  sint16 ACC (RW, item_power);        /* Total item power of objects equipped */
+  int ACC (RW, digestion);          /* Any bonuses/penalties to digestion */
+  int ACC (RW, gen_hp);             /* Bonuses to regeneration speed of hp */
+  int ACC (RW, gen_sp);             /* Bonuses to regeneration speed of sp */
+  int ACC (RW, gen_sp_armour);      /* Penalty to sp regen from armour */
+  int ACC (RW, gen_grace);          /* Bonuses to regeneration speed of grace */
+  int ACC (RW, item_power);        /* Total item power of objects equipped */
   uint8 ACC (RW, listening);          /* Which priority will be used in info_all */
+  uint8 ACC (RW, gender);             /* 0 male, 1 female, others not yte defined */
 
   /* Try to put all the bitfields together - saves some small amount of memory */
   bool ACC (RW, braced);              /* Will not move if braced, only attack */
@@ -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 */
@@ -181,6 +182,12 @@
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
+  MTH void play_sound (faceidx sound, int dx = 0, int dy = 0) const
+  {
+    if (ns)
+      ns->play_sound (sound, dx, dy);
+  }
+
   // wether the player can "see" this mapspace or not, decided by los
   // 0 - nothing see, 100 - fully visible
   MTH sint8 visibility_at (maptile *map, int x, int y) const;
@@ -194,6 +201,8 @@
   MTH void chargen_race_done ();
   MTH void chargen_race_next ();
 
+  MTH void set_observe (object *ob);
+
   ~player ();
 
 private:
@@ -206,6 +215,6 @@
 extern playervec players;
 
 #define for_all_players(var)			\
-  for (unsigned _i = 0; _i < players.size (); ++_i)	\
-    declvar (player *, var, players [_i])
+  for (unsigned _i = 0; _i < ::players.size (); ++_i)	\
+    statementvar (player *, var, ::players [_i])