--- deliantra/server/include/client.h	2008/04/22 07:01:46	1.75
+++ deliantra/server/include/client.h	2008/12/26 10:44:17	1.83
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -70,7 +70,7 @@
 
 struct MapCell
 {
-  tag_t 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
@@ -160,23 +160,13 @@
   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 */
 
   sint8 ACC (RW, last_level);             /* Last level we sent to client */
   uint16 ACC (RW, last_flags);            /* fire/run on flags for last tick */
   float ACC (RW, last_weapon_sp);         /* if diff than weapon_sp, update client */
-  //sint32 ACC (RW, last_weight);           /* Last weight as sent to client; -1 means do not send weight */
+  sint32 ACC (RW, last_weight);           /* Last weight as sent to client; -1 means do not send weight */
   sint32 ACC (RW, last_weight_limit);     /* Last weight limit transmitted to client */
   uint32 ACC (RW, last_path_attuned);     /* Last spell attunment sent to client */
   uint32 ACC (RW, last_path_repelled);    /* Last spell repelled sent to client */
@@ -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
 
@@ -224,8 +210,8 @@
   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 */
 
-  maptile *ACC (RW, current_map);         // CF+ last/current player map
-  region *ACC (RW, current_region);       // CF+ last/current player region
+  maptile_ptr ACC (RW, current_map);      // CF+ last/current player map
+  region_ptr ACC (RW, current_region);    // CF+ last/current player region
   int ACC (RW, current_x), ACC (RW, current_y);     // CF+ last/current map position
   shstr ACC (RW, version);                // CF+ client name/version
   uint8 ACC (RW, faceset);                // CF+ selected faceset
@@ -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
 
@@ -411,5 +382,12 @@
   for (int _i = 0; _i < clients.size (); ++_i)  \
     statementvar (client *, var, clients [_i])
 
+// returns true when the message needs special (read: perl) treatment
+static inline bool
+msg_is_special (const char *msg, bool nl_special = true)
+{   
+  return msg [strcspn (msg, nl_special ? "<&\n" : "<&")];
+}
+
 #endif