--- deliantra/server/include/client.h	2006/12/15 20:07:02	1.2
+++ deliantra/server/include/client.h	2006/12/19 04:58:04	1.9
@@ -1,4 +1,3 @@
-
 /*
     CrossFire, A Multiplayer game for the X Window System
 
@@ -19,23 +18,16 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The author can be reached via e-mail to crossfire.de
-*/
-
-/*
-    newserver.h defines various structures and values that are use for the
-    new client server communication method.  Values defined here are only
-    used on the server side code.  For shared client/server values, see
-    newclient.h
+    The author can be reached via e-mail to crossfire@schmorp.de
 */
 
 #ifndef CLIENT_H
 #define CLIENT_H
 
-/* Reduce this from 50 to 5 - as it is now, there will never be more
- * than 3 anyways.
- */
+#include <deque>
+#include <bitset>
 
+// (possibly) max. number of objects "per page" in the ground container
 #define NUM_LOOK_OBJECTS 50
 
 struct MapCell
@@ -96,6 +88,32 @@
   int len;
 };
 
+// a handler for a specific type of packet
+enum {
+  PF_PLAYER    = 0x01, // must have valid player / will by synchronised
+  PF_PLAYING   = 0x02, // must be in playing state
+};
+
+struct packet_type
+{
+  const char *name;
+  void *cb;
+  int flags;
+};
+
+struct command
+{
+  tstamp stamp;
+  const packet_type *handler;
+  char *data;
+  int datalen;
+
+  ~command ()
+  {
+    sfree<char> (data, datalen + 1);
+  }
+};
+
 /* how many times we are allowed to give the wrong password before being kicked. */
 #define MAX_PASSWORD_FAILURES 5
 
@@ -104,16 +122,13 @@
 {
   enum Sock_Status status;
   int ACC (RW, fd);
-  unsigned int inbuf_len;                 // number of bytes valid in inbuf
-  struct Map lastmap;
-  size_t faces_sent_len;        /* This is the number of elements allocated in faces_sent[] */
-  uint8 *faces_sent;            /* This is a bitmap on sent face status */
-  uint8 anims_sent[MAXANIMNUM];
+  unsigned int inbuf_len;                // number of bytes valid in inbuf
+  uint8 *faces_sent;                     // This is a bitmap on sent face status
   struct statsinfo stats;
 
-  char *ACC (RW, host);                   /* Which host it is connected from (ip address) */
-  uint8 ACC (RW, password_fails);         /* how many times the player has failed to give the right password */
-  Buffer outputbuffer;          /* For undeliverable data */
+  char *ACC (RW, host);                  /* Which host it is connected from (ip address) */
+  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);
@@ -148,18 +163,29 @@
   int ACC (RW, current_x), ACC (RW, current_y);     // CF+ last/current map position
   char ACC (RW, version)[64];              // CF+ client name/version
 
-  /* If we get an incomplete packet, this is used to hold the data. */
-  uint8 inbuf[MAXSOCKBUF];
   player *ACC (RO, pl);//TODO should not be here, preferably
 
   int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
 
-  iow socket_ev; void socket_cb (iow &w, int got);
-
   client (int fd, const char *from_ip);
   ~client ();
+  void destroy ();
+
+  iw  cmd_ev;    void cmd_cb (iw &w);
+  iow socket_ev; void socket_cb (iow &w, int got);
 
-  int read_packet ();                     // returns length of packet or 0
+  std::deque< command, slice_allocator<command> > cmd_queue;
+
+  // resets movement state
+  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 ();
+  void reset_state ();
+
+  bool handle_packet ();
+  int next_packet ();                     // returns length of packet or 0
   void skip_packet (int len);             // we have processed the packet, skip it
 
   void flush ();
@@ -168,7 +194,16 @@
 
   void send_packet (const char *buf);
   void send_packet (const char *buf, int len);
+  void send_packet_printf (const char *format, ...);
   void send_packet (packet &sl);
+
+  // 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];
+
 };
 
 #define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\