--- deliantra/server/include/client.h	2008/12/27 01:25:00	1.84
+++ deliantra/server/include/client.h	2010/03/26 01:04:44	1.93
@@ -1,22 +1,21 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * 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
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -65,6 +64,8 @@
   };
 #endif
 
+//+GPL
+
 // (possibly) max. number of objects "per page" in the ground container
 #define FLOORBOX_PAGESIZE 50
 
@@ -148,6 +149,8 @@
   int datalen;
 };
 
+//-GPL
+
 /* how many times we are allowed to give the wrong password before being kicked. */
 #define MAX_PASSWORD_FAILURES 5
 
@@ -182,14 +185,13 @@
   bool ACC (RW, newmapcmd);               /* Send newmap command when entering new map SMACFIGGEN */
   bool ACC (RW, plugincmd);               // extend the protocol through a plug-in */
   bool ACC (RW, mapinfocmd);              // return map info and send map change info
-  uint8_t ACC (RW, extcmd);                  // call into extensions/plugins
-  bool ACC (RW, extmap);                  // extend map command with extra data
+  uint8_t ACC (RW, extcmd);               // call into extensions/plugins
   bool ACC (RW, update_look);             /* If true, we need to send the look window */
+  bool ACC (RW, update_spells);           // If true, we need to esrv_update_spells
   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, smoothing);               // deliantra-style smoothing
-  bool ACC (RW, can_msg);                 // deliantra-style text messages
 
   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 */
@@ -208,6 +210,7 @@
 
   tstamp ACC (RW, last_send);             // last data send on socket.
 
+  float ACC (RW, socket_timeout);         /* after how many seconds of no ack do we declare dead */
   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
@@ -257,7 +260,7 @@
     char msg[MSG_BUF_SIZE];
   } msgbuf[MSG_BUF_COUNT];
 
-  MTH bool msg_suppressed (const char *msg);
+  MTH bool msg_suppressed (const_utf8_string msg);
 
   /* The following is the setup for a ring buffer for storing output
    * data that the OS can't handle right away.
@@ -289,17 +292,17 @@
   MTH int outputbuffer_len () const { return outputbuffer.len; }
   void send (void *buf_, int len);
 
-  void send_packet (const char *buf);
-  void send_packet (const char *buf, int len);
-  void send_packet_printf (const char *format, ...);
+  void send_packet (const_octet_string buf);
+  void send_packet (const_octet_string buf, int len);
+  void send_packet_printf (const_utf8_string format, ...) attribute ((format (printf, 2, 3)));
   void send_packet (packet &sl);
 
-  void send_drawinfo (const char *msg, int flags = NDI_BLACK);
+  void send_drawinfo (const_utf8_string msg, int flags = NDI_BLACK);
 
   MTH void send_face (faceidx facenum, int pri = 0);
   MTH void send_faces (object *ob);
   MTH void send_animation (short anim_num);
-  void send_msg (int color, const char *type, const char *msg);
+  void send_msg (int color, const_utf8_string type, const_utf8_string msg);
 
   MTH void play_sound (faceidx sound, int dx = 0, int dy = 0);
   // called when something under the player changes
@@ -350,6 +353,8 @@
   ACC (RW, tcpi.tcpi_reordering);
 #endif
 
+//+GPL
+
 #define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
         ( ((__type)>0) &&\
           ((__sockPtr)->has_readable_type) && \
@@ -363,6 +368,8 @@
 //#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible
 #define VERSION_INFO "Deliantra Server"
 
+//-GPL
+
 typedef object_vector<client, &client::active> sockvec;
 
 extern sockvec clients;
@@ -373,7 +380,7 @@
 
 // returns true when the message needs special (read: perl) treatment
 static inline bool
-msg_is_special (const char *msg, bool nl_special = true)
+msg_is_special (const_any_string msg, bool nl_special = true)
 {   
   return msg [strcspn (msg, nl_special ? "<&\n" : "<&")];
 }