--- deliantra/server/include/player.h	2006/09/20 21:53:50	1.18
+++ deliantra/server/include/player.h	2006/12/15 20:08:45	1.27
@@ -19,7 +19,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
@@ -120,9 +120,8 @@
   bowtype_t bowtype;            /* which firemode? */
   petmode_t petmode;            /* which petmode? */
   object_ptr ranges[range_size];   /* object for each range.  Set up in fix player.  Note */
-  /* That not all are used, it is just nice to map this 1:1 */
-  /* With the range names */
-  uint32 ACC (RW, golem_count);           /* To track the golem */
+                                   /* That not all are used, it is just nice to map this 1:1 */
+                                   /* With the range names */
   usekeytype usekeys;           /* Method for finding keys for doors */
   unapplymode unapply;          /* Method for auto unapply */
   uint32 ACC (RW, count);                 /* Any numbers typed before a command */
@@ -168,7 +167,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 */
@@ -177,13 +175,13 @@
 
   char ACC (RW, own_title)[MAX_NAME];     /* Title the player has chosen for themself */
   /* Note that for dragon players, this is filled in for them */
-  char ACC (RW, title)[BIG_NAME];         /* Default title, like fighter, wizard, etc */
+  char ACC (RW, title)[64];         /* Default title, like fighter, wizard, etc */
 
   sint8 levhp[11];              /* What the player gained on that level */
   sint8 levsp[11];              /* Same for sp */
   sint8 levgrace[11];           /* And same for grace */
 
-  char ACC (RW, killer)[BIG_NAME];        /* Who killed this player. */
+  char ACC (RW, killer)[64];        /* Who killed this player. */
 
   char write_buf[MAX_BUF];      /* Holds arbitrary input from client */
   char input_buf[MAX_BUF];      /* Holds command to run */
@@ -212,7 +210,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, socket);             /* Socket information for this player */
   Output_Buf outputs[NUM_OUTPUT_BUFS];  /* holds output strings to client */
   shstr invis_race;             /* What race invisible to? */