--- deliantra/server/include/player.h	2006/12/09 16:11:09	1.20
+++ deliantra/server/include/player.h	2006/12/21 23:37:05	1.30
@@ -1,4 +1,3 @@
-
 /*
     CrossFire, A Multiplayer game for X-windows
 
@@ -19,7 +18,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at crossfire@schmorp.de
 */
 
 #define NUM_OUTPUT_BUFS	5
@@ -133,7 +132,6 @@
   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 */
-  uint8 ACC (RW, state);                  /* Input state of the player (name, password, etc */
   uint8 ACC (RW, listening);              /* Which priority will be used in info_all */
   sint8 ACC (RW, last_level);             /* Last level we sent to client */
 
@@ -148,7 +146,6 @@
   uint32 ACC (RO, peaceful):1;            /* If set, won't attack friendly creatures */
   uint32 ACC (RO, hidden):1;              /* If True, player (DM) is hidden from view */
   uint32 ACC (RO, explore):1;             /* if True, player is in explore mode */
-  uint32 ACC (RO, no_shout):1;            /* if True, player is *not* able to use shout command */
 
   object_ptr last_skill_ob[NUM_SKILLS];    /* the exp object */
   sint64 last_skill_exp[NUM_SKILLS];    /* shadow register. if != exp. obj update client */
@@ -167,7 +164,6 @@
   sint16 last_resist[NROFATTACKS];      /* last resist values sent to client */
   int Swap_First;               /* First stat player has selected to swap */
   object_ptr ACC (RW, last_used);            /* Pointer to object last picked or applied */
-  uint32 last_used_id;          /* Safety measures to be sure it's the same */
 
   sint16 ACC (RW, bed_x), ACC (RW, bed_y);          /* x,y - coordinates of respawn (savebed) */
   char ACC (RW, savebed_map)[MAX_BUF];    /* map where player will respawn after death */
@@ -211,7 +207,7 @@
 struct player : zero_initialised, attachable<player>, player_pod
 {
   player *next;              /* Pointer to next player, NULL if this is last */
-  NewSocket socket;             /* Socket information for this player */
+  client *ACC (RO, ns);             /* Socket information for this player */
   Output_Buf outputs[NUM_OUTPUT_BUFS];  /* holds output strings to client */
   shstr invis_race;             /* What race invisible to? */