--- deliantra/server/include/player.h	2007/07/01 05:00:18	1.64
+++ deliantra/server/include/player.h	2007/08/15 05:01:25	1.67
@@ -94,8 +94,8 @@
 INTERFACE_CLASS (player)
 struct player : zero_initialised, attachable
 {
-  client *ACC (RO, ns);               /* Socket information for this player */
-  object *ACC (RW, ob);               /* The object representing the player */
+  client *ACC (RO, ns);               /* Socket information for this player, ALWAYS valid when a player is on a map */
+  object *ACC (RW, ob);               /* The object representing the player, ALWAYS valid */
   object_vector_index ACC (RO, active);
 
   bowtype_t ACC (RW, bowtype);        /* which firemode? */
@@ -105,12 +105,12 @@
   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 */
 
@@ -182,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;
@@ -209,6 +215,6 @@
 extern playervec players;
 
 #define for_all_players(var)			\
-  for (unsigned _i = 0; _i < players.size (); ++_i)	\
-    statementvar (player *, var, players [_i])
+  for (unsigned _i = 0; _i < ::players.size (); ++_i)	\
+    statementvar (player *, var, ::players [_i])