--- deliantra/server/include/client.h	2007/03/14 01:19:09	1.36
+++ deliantra/server/include/client.h	2007/03/15 16:25:45	1.40
@@ -35,11 +35,11 @@
 struct MapCell
 {
   UUID 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];
-  faceidx smooth[MAP_LAYERS];
-  int count;                  /* This is really darkness in the map1 command */
   unsigned char stat_hp;       // health of something in this space, or 0
   unsigned char flags;
+  uint8_t smooth[MAP_LAYERS];
 };
 
 #define MAX_CLIENT_X MAP_CLIENT_X
@@ -190,13 +190,14 @@
   bool ACC (RW, sent_scroll);             
   bool ACC (RW, sound);                   /* does the client want sound */
   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 */
-  bool ACC (RW, extcmd);                  /* CF+ call into extensions/plugins */
-  bool ACC (RW, extmap);                  /* CF+ extend map comamnd with extra data */
-  bool ACC (RW, buggy_mapscroll);         /* CF+ client crashes on large mapscrolls */
-  bool ACC (RW, force_face0);             /* CF+ client workaround for buggy checksum calculation in gcfclient */
-  bool ACC (RW, force_bad_checksum);      /* CF+ client workaround for buggy checksum calculation in gcfclient */
+  bool ACC (RW, plugincmd);               // extend the protocol through a plug-in */
+  bool ACC (RW, mapinfocmd);              // return map info and send map change info
+  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, update_look);             /* If true, we need to send the look window */
@@ -208,6 +209,7 @@
                                            * with S->C mapextended command */
   bool ACC (RW, EMI_smooth);              /* Send smooth in extendmapinfos */
 
+  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. */
@@ -223,7 +225,12 @@
 
   player_ptr ACC (RO, pl);
 
-  int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
+  int ACC (RW, rtt), ACC (RW, rttvar);    /* round-trip time and -variance, if known */
+
+  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
 
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
@@ -259,6 +266,7 @@
 
   MTH void flush ();
   MTH void write_outputbuffer ();
+  MTH int outputbuffer_len () const { return outputbuffer.len; }
   void send (void *buf_, int len);
 
   void send_packet (const char *buf);
@@ -267,7 +275,8 @@
   void send_packet (packet &sl);
 
   void send_drawinfo (const char *msg, int flags = NDI_BLACK);
-  MTH void send_face (faceidx facenum, bool nocache = false);
+  MTH void send_face (faceidx facenum);
+  MTH void send_image (faceidx facenum);
   MTH void send_faces (object *ob);
   MTH void send_animation (short anim_num);
 
@@ -276,6 +285,8 @@
   // called when the player has been moved
   MTH void floorbox_reset  () { look_position = 0; floorbox_update (); }
 
+  MTH void tick (); // called every server tick to do housekeeping etc.
+
   MTH static client *create (int fd, const char *peername);
 
 protected: