--- deliantra/server/include/client.h	2007/02/04 00:39:32	1.27
+++ deliantra/server/include/client.h	2007/03/11 02:12:44	1.32
@@ -36,7 +36,7 @@
 {
   UUID player;                 // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient
   int count;                    /* This is really darkness in the map1 command */
-  uint16 faces[MAP_LAYERS];
+  faceidx faces[MAP_LAYERS];
   uint16 smooth[MAP_LAYERS];
   unsigned char stat_hp;        // health of something in this space, or 0
   unsigned char flags;
@@ -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
@@ -169,11 +171,9 @@
 {
   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;
   int ACC (RO, active);
 
-  client_container cc_inv, cc_other;
   Buffer outputbuffer;                    
 
   char *ACC (RW, host);                   /* Which host it is connected from (ip address) */
@@ -219,11 +219,12 @@
   uint16 ACC (RW, look_position);         /* start of drawing of look window */
   uint8 ACC (RW, mapx), ACC (RW, mapy);             /* How large a map the client wants */
   uint8 ACC (RW, itemcmd);                /* What version of the 'item' protocol command to use */
-  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
+  uint8 ACC (RW, faceset);                // CF+ selected faceset
 
   player_ptr ACC (RO, pl);
 
@@ -232,14 +233,16 @@
   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;
 
   // large structures at the end please
   struct Map lastmap;
   std::bitset<MAXANIMNUM> anims_sent;
+  uint8 ACC (RW, faces_sent[MAX_FACES]);  // This is a bitmap on sent face status
   // 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];
@@ -320,7 +323,8 @@
 #define PNG_FACE_INDEX	0
 
 #define VERSION_CS 1023        /* version >= 1023 understand setup cmd */
-#define VERSION_SC 1027
+#define VERSION_SC 1026
+//#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible
 #define VERSION_INFO "Crossfire+ Server"
 
 typedef object_vector<client, &client::active> sockvec;
@@ -331,7 +335,5 @@
   for (int _i = 0; _i < clients.size (); ++_i)  \
     declvar (client *, var, clients [_i])
 
-extern int nrofpixmaps; //TODO: hrmpf, should go
-
 #endif