--- deliantra/server/include/player.h	2006/12/21 23:37:05	1.30
+++ deliantra/server/include/player.h	2006/12/23 13:56:25	1.33
@@ -108,11 +108,13 @@
   uint32 kills;
 };
 
-ACC_CLASS (player)
+#define for_all_players(var) for (player *var = first_player; var; var = var->next)
 
-// memsettable part of player
-struct player_pod
+ACC_CLASS (player)
+struct player : zero_initialised, refcounted, attachable<player>
 {
+  player *ACC (RW, next);              /* Pointer to next player, NULL if this is last */
+  client *ACC (RO, ns);             /* Socket information for this player */
   object_ptr ACC (RW, ob);            /* The object representing the player */
   maptile *loading;             /* When entering a map in progress of loading, not really used */
   rangetype shoottype;          /* Which range-attack is being used by player */
@@ -142,7 +144,6 @@
   uint32 ACC (RO, fire_on):1;             /* Player should fire object, not move */
   uint32 ACC (RO, run_on):1;              /* Player should keep moving in dir until run is off */
   uint32 ACC (RO, has_hit):1;             /* If set, weapon_sp instead of speed will count */
-  uint32 ACC (RO, name_changed):1;        /* If true, the player has set a name. */
   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 */
@@ -162,7 +163,6 @@
   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 */
 
   sint16 ACC (RW, bed_x), ACC (RW, bed_y);          /* x,y - coordinates of respawn (savebed) */
@@ -180,8 +180,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);
@@ -200,25 +199,23 @@
   tag_t *stack_items;           /* Item stack for patch/dump/... commands */
   int ACC (RW, stack_position);           /* Current stack position, 0 for no item */
   sint8 blocked_los[MAP_CLIENT_X][MAP_CLIENT_Y];        /* array showing what spaces */
-  /* the player can see.  For maps smaller than */
-  /* MAP_CLIENT_.., the upper left is used */
-};
+                                                        /* the player can see.  For maps smaller than */
+                                                        /* MAP_CLIENT_.., the upper left is used */
 
-struct player : zero_initialised, attachable<player>, player_pod
-{
-  player *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 ()
-  {
-    memset (static_cast < player_pod * >(this), 0, sizeof (player_pod));
-    attachable_clear ();
-    invis_race = 0;
-
-    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 ();
 };