--- deliantra/server/include/client.h	2008/07/27 05:33:52	1.80
+++ deliantra/server/include/client.h	2008/12/26 10:44:17	1.83
@@ -160,16 +160,6 @@
   object_vector_index ACC (RO, active);
   player_ptr ACC (RO, pl);
 
-  /* The following is the setup for a ring buffer for storing output
-   * data that the OS can't handle right away.
-   */
-  struct
-  {
-    char data[SOCKETBUFSIZE];
-    int start;
-    int len;
-  } outputbuffer;
-
   char *ACC (RW, host);                   /* Which host it is connected from (ip address) */
   uint8 ACC (RW, state);                  /* Input state of the player (name, password, etc */
 
@@ -208,10 +198,6 @@
   bool ACC (RW, has_readable_type);       /* If true client accept additional text information */
                                           /* used to arrange text in books, scrolls, or scripted dialogs */
   bool ACC (RW, monitor_spells);          /* Client wishes to be informed when their spell list changes */
-  bool ACC (RW, ext_mapinfos);            /* If true client accepts additional info on maps */
-                                          /* 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);               // trt-style smoothing
   bool ACC (RW, can_msg);                 // trt-style text messages
 
@@ -283,6 +269,17 @@
 
   MTH bool msg_suppressed (const char *msg);
 
+  /* The following is the setup for a ring buffer for storing output
+   * data that the OS can't handle right away.
+   * TODO: this member is enourmously large - optimise?
+   */
+  struct
+  {
+    char data[SOCKETBUFSIZE];
+    int start;
+    int len;
+  } outputbuffer;
+
   bool may_execute (const packet_type *pkt) const;
   void execute (const packet_type *pkt, char *data, int datalen);
 
@@ -369,32 +366,6 @@
           ((__sockPtr)->has_readable_type) && \
           ((__sockPtr)->supported_readables & (1<<(__type))) )
 
-/* Constants in the form EMI_ is for extended map infos.
- * Even if the client select the additionnal infos it wants
- * on the map, there may exist cases where this whole info
- * is not given in one buch but in separate bunches. This 
- * is done performance reasons (imagine some info related to
- * a visible object and another info related to a 4 square
- * width and height area). At the begin of an extended info packet
- * is a bit field. A bit is activated for each extended info
- * present in the data 
- */
-
-/* Meanings:
- * EMI_NOREDRAW  Take extended infos into account but don't redraw,
- *               some additionnal datas will follow in a new packet
- * EMI_SMOOTH    Datas about smoothing  
- */
-#define EMI_NOREDRAW        0x01
-#define EMI_SMOOTH          0x02
-
-/* this last one says the bitfield continue un next byte
- * There may be several on contiguous bytes. So there is 7
- * actual bits used per byte, and the number of bytes
- * is not fixed in protocol
- */
-#define EMI_HASMOREBITS     0x80
-
 #define FACE_TYPES  1
 #define PNG_FACE_INDEX	0
 
@@ -415,7 +386,7 @@
 static inline bool
 msg_is_special (const char *msg, bool nl_special = true)
 {   
-  return msg [strcspn (msg, nl_special ? "<[&\n" : "<[&")];
+  return msg [strcspn (msg, nl_special ? "<&\n" : "<&")];
 }
 
 #endif