--- deliantra/server/include/player.h	2006/09/29 11:53:08	1.19
+++ deliantra/server/include/player.h	2006/12/22 16:34:00	1.31
@@ -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
@@ -120,9 +119,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 */
@@ -134,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 */
 
@@ -149,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 */
@@ -166,9 +162,7 @@
   living ACC (RO, last_stats);            /* Last stats as sent to client */
   float ACC (RW, last_speed);             /* Last speed as sent to client */
   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 */
@@ -185,8 +179,7 @@
 
   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 */
+  char write_buf[MAX_BUF];      /* Holds arbitrary input from client */ /* should go */
   char ACC (RW, password)[16];            /* 2 (seed) + 11 (crypted) + 1 (EOS) + 2 (safety) = 16 */
 
   time_t ACC (RW, last_save_time);
@@ -211,10 +204,11 @@
 
 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 */
+  player *ACC (RW, next);              /* Pointer to next player, NULL if this is last */
+  client *ACC (RO, ns);             /* Socket information for this player */
+  shstr ACC (RW, invis_race);             /* What race invisible to? */
+  bool ACC (RW, enable_save);
   Output_Buf outputs[NUM_OUTPUT_BUFS];  /* holds output strings to client */
-  shstr invis_race;             /* What race invisible to? */
 
   void clear ()
   {
@@ -225,5 +219,17 @@
     for (int i = 0; i < NUM_OUTPUT_BUFS; i++)
       outputs[i].buf = 0;
   }
+
+  static player *create ();
+  static player *load (const char *path);
+  void save (bool final = false);
+
+  void connect (client *ns);
+
+  ~player ();
+
+private:
+  void set_object (object *op);
+  player ();
 };