--- deliantra/server/include/client.h	2007/03/15 03:30:37	1.39
+++ deliantra/server/include/client.h	2007/04/02 18:04:46	1.42
@@ -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,18 +185,21 @@
   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);             
   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, 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,10 +211,11 @@
                                            * 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. */
   uint16 ACC (RW, look_position);         /* start of drawing of look window */
+  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 */