--- deliantra/server/include/client.h	2007/03/15 16:25:45	1.40
+++ deliantra/server/include/client.h	2007/04/18 09:38:58	1.47
@@ -34,7 +34,7 @@
 
 struct MapCell
 {
-  UUID player;                 // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient
+  tag_t player;                 // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient
   int count;                   /* This is really darkness in the map1 command */
   faceidx faces[MAP_LAYERS];
   unsigned char stat_hp;       // health of something in this space, or 0
@@ -68,7 +68,7 @@
  * instead of having a bunch of different fields that needed to
  * get toggled.
  */
-enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
+enum { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
 
 /* The following is the setup for a ring buffer for storing output
  * data that the OS can't handle right away.
@@ -185,6 +185,11 @@
   sint16 ACC (RW, last_resist[NROFATTACKS]);/* last resist values sent to client */
   sint64 ACC (RW, last_skill_exp[NUM_SKILLS]);/* shadow register. if != exp. obj update client */
 
+  bool ACC (RW, force_face0);             // client workaround for buggy checksum calculation in gcfclient
+  bool ACC (RW, force_bad_checksum);      // client workaround for buggy checksum calculation in gcfclient
+  bool ACC (RW, force_image_newmap);      // client workaround for client not redrawing map on image upload
+  bool ACC (RW, enable_bg_scrub);         // client workaround, gcfclient becomes unusable if you send it images
+
   bool ACC (RW, afk);                     /* player is afk */
   bool ACC (RW, facecache);               /* If true, client is caching images */
   bool ACC (RW, sent_scroll);             
@@ -195,11 +200,9 @@
   bool ACC (RW, extcmd);                  // call into extensions/plugins
   bool ACC (RW, extmap);                  // extend map comamnd with extra data
   bool ACC (RW, buggy_mapscroll);         // client crashes on large mapscrolls
-  bool ACC (RW, force_face0);             // client workaround for buggy checksum calculation in gcfclient
-  bool ACC (RW, force_bad_checksum);      // client workaround for buggy checksum calculation in gcfclient
-  bool ACC (RW, force_image_newmap);      // client workaround for client not redrawing map on image upload
   bool ACC (RW, darkness);                /* True if client wants darkness information */
   bool ACC (RW, image2);                  /* Client wants image2/face2 commands */
+  bool ACC (RW, fxix);                    // client implements fx and ix (face|image extended) commands
   bool ACC (RW, update_look);             /* If true, we need to send the look window */
   bool ACC (RW, has_readable_type);       /* If true client accept additional text information */
                                           /* used to arrange text in books, scrolls, or scripted dialogs */
@@ -208,12 +211,14 @@
                                           /* Below are flags for extedend infos to pass to client 
                                            * with S->C mapextended command */
   bool ACC (RW, EMI_smooth);              /* Send smooth in extendmapinfos */
+  bool ACC (RW, smoothing);               // cfplus-style smoothing
 
   bool ACC (RW, force_newmap);            // force a newmap before next map update
   uint32 ACC (RW, supported_readables);   /* each bit is a readable supported by client */
   uint32 ACC (RW, cs_version), ACC (RW, sc_version);        /* versions of the client */
-  enum MapMode mapmode;         /* Type of map commands the client wants. */
   uint16 ACC (RW, look_position);         /* start of drawing of look window */
+  uint16 ACC (RW, mss);                   // likely tcp maximum segment size
+  uint8 ACC (RW, mapmode);                /* Type of map commands the client wants. */
   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 */
 
@@ -227,10 +232,17 @@
 
   int ACC (RW, rtt), ACC (RW, rttvar);    /* round-trip time and -variance, if known */
 
+  int ACC (RW, rate_avail);               // current rate balance
   int ACC (RW, max_rate);                 // max. # of bytes to send per tick
   faceidx ACC (RW, scrub_idx);            // which face to send next
   int ACC (RW, bg_scrub);                 // how many ticks till the next background face send
-  std::vector<faceidx> askface;           // which faces have been requested by the client
+
+  faceidx partial_face;
+  uint32 partial_face_ofs;  // if != 0, need to send remaining bytes of partial_face
+  std::vector<faceidx, slice_allocator<faceidx> > askface; // which faces have been requested by the client
+
+  std::vector<faceidx, slice_allocator<faceidx> > fxface;  // which faces to send using fx
+  MTH void flush_fx (); // send fx if required
 
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;