--- deliantra/server/include/client.h	2007/02/04 00:39:32	1.27
+++ deliantra/server/include/client.h	2007/03/01 12:28:16	1.30
@@ -100,8 +100,10 @@
 
 // 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
+  PF_PLAYER   = 0x01, // must have valid player / will by synchronised
+  PF_PLAYING  = 0x02, // must be in playing state
+  PF_COMMAND0 = 0x04, // command starts at offset 0
+  PF_COMMAND6 = 0x08, // command starts at offset 6
 };
 
 struct packet_type
@@ -173,7 +175,6 @@
   statsinfo stats;
   int ACC (RO, active);
 
-  client_container cc_inv, cc_other;
   Buffer outputbuffer;                    
 
   char *ACC (RW, host);                   /* Which host it is connected from (ip address) */
@@ -222,6 +223,7 @@
   uint8 ACC (RW, faceset);                /* Set the client is using, default 0 */
 
   maptile *ACC (RW, current_map);         // CF+ last/current player map
+  region *ACC (RW, current_region);       // CF+ last/current player region
   int ACC (RW, current_x), ACC (RW, current_y);     // CF+ last/current map position
   char ACC (RW, version)[64];             // CF+ client name/version
 
@@ -232,8 +234,9 @@
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
-  iw  cmd_ev;    void cmd_cb (iw &w);
   iow socket_ev; void socket_cb (iow &w, int got);
+  iw  cmd_ev;    void cmd_cb (iw &w);
+  client_container cc_inv, cc_other;
 
   std::deque< command, slice_allocator<command> > cmd_queue;