--- deliantra/server/include/player.h	2006/09/29 11:53:08	1.19
+++ deliantra/server/include/player.h	2006/12/14 02:37:37	1.22
@@ -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 */
@@ -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_socket socket;             /* Socket information for this player */
   Output_Buf outputs[NUM_OUTPUT_BUFS];  /* holds output strings to client */
   shstr invis_race;             /* What race invisible to? */