--- deliantra/server/include/client.h	2006/12/20 09:14:22	1.13
+++ deliantra/server/include/client.h	2006/12/23 09:41:55	1.19
@@ -70,8 +70,6 @@
  * are using.
  */
 
-enum Sock_Status { Ns_Add, Ns_Dead };
-
 /* Only one map mode can actually be used, so lets make it a switch
  * instead of having a bunch of different fields that needed to
  * get toggled.
@@ -81,7 +79,6 @@
 /* The following is the setup for a ring buffer for storing output
  * data that the OS can't handle right away.
  */
-
 struct Buffer
 {
   char data[SOCKETBUFSIZE];
@@ -89,6 +86,18 @@
   int len;
 };
 
+// states the socket can be in
+enum {
+ ST_DEAD,     // socket is dead
+ ST_SETUP,    // initial handshake / setup / login
+ ST_PLAYING,  // logged in an playing
+ ST_CUSTOM,   // waiting for custom reply
+
+ ST_CONFIRM_QUIT,
+ ST_CHANGE_CLASS,
+ ST_GET_PARTY_PASSWORD,
+};
+
 // a handler for a specific type of packet
 enum {
   PF_PLAYER    = 0x01, // must have valid player / will by synchronised
@@ -156,24 +165,23 @@
 #define MAX_PASSWORD_FAILURES 5
 
 ACC_CLASS (client) // should become player when newsocket is a baseclass of player
-struct client : zero_initialised, attachable_base
+struct client : zero_initialised, attachable<client>
 {
-  enum Sock_Status status;
   int ACC (RW, fd);
   unsigned int inbuf_len;                 // number of bytes valid in inbuf
   uint8 *faces_sent;                      // This is a bitmap on sent face status
   statsinfo stats;                 
 
   client_container cc_inv, cc_other;
+  Buffer outputbuffer;                    
 
   char *ACC (RW, host);                   /* Which host it is connected from (ip address) */
+  uint8 ACC (RW, state);                  /* Input state of the player (name, password, etc */
   uint8 ACC (RW, password_fails);         /* how many times the player has failed to give the right password */
-  Buffer outputbuffer;                    
 
   bool ACC (RW, facecache);               /* If true, client is caching images */
   bool ACC (RW, sent_scroll);             
   bool ACC (RW, sound);                   /* does the client want sound */
-  bool ACC (RW, exp64);                   /* Client wants 64 bit exp data, as well as skill data */
   bool ACC (RW, newmapcmd);               /* Send newmap command when entering new map SMACFIGGEN */
   bool ACC (RW, plugincmd);               /* CF+ extend the protocol through a plug-in */
   bool ACC (RW, mapinfocmd);              /* CF+ return map info and send map change info */
@@ -203,25 +211,33 @@
   int ACC (RW, current_x), ACC (RW, current_y);     // CF+ last/current map position
   char ACC (RW, version)[64];             // CF+ client name/version
 
-  player *ACC (RO, pl);//TODO should not be here, preferably
+  player_ptr ACC (RO, pl);
 
   int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
 
   client (int fd, const char *from_ip);
   ~client ();
   void destroy ();
+  bool destroyed () const { return state == ST_DEAD; }
 
   iw  cmd_ev;    void cmd_cb (iw &w);
   iow socket_ev; void socket_cb (iow &w, int got);
 
   std::deque< command, slice_allocator<command> > cmd_queue;
 
-  // resets movement state
+  // large structures at the end please
+  struct Map lastmap;
+  std::bitset<MAXANIMNUM> anims_sent;
+  // if we get an incomplete packet, this is used to hold the data.
+  // we add 2 byte for the header, one for the trailing 0 byte
+  uint8 inbuf[MAXSOCKBUF + 2 + 1];
+
   bool may_execute (const packet_type *pkt) const;
   void execute (const packet_type *pkt, char *data, int datalen);
 
   void queue_command (packet_type *handler, char *data, int datalen);
   bool handle_command ();
+  // resets movement state
   void reset_state ();
 
   bool handle_packet ();
@@ -242,12 +258,7 @@
   // called when the player has been moved
   void floorbox_reset  () { look_position = 0; floorbox_update (); }
 
-  // large structures at the end please
-  struct Map lastmap;
-  std::bitset<MAXANIMNUM> anims_sent;
-  // if we get an incomplete packet, this is used to hold the data.
-  // we add 2 byte for the header, one for the trailing 0 byte
-  uint8 inbuf[MAXSOCKBUF + 2 + 1];
+  static client *create (int fd, const char *peername);
 };
 
 #define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\