--- deliantra/server/include/client.h	2012/01/03 11:23:41	1.103
+++ deliantra/server/include/client.h	2012/10/30 17:07:50	1.108
@@ -1,22 +1,22 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
- * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * 
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 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 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 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>
  */
 
@@ -213,7 +213,7 @@
   bool mapinfo_try (char *buf);
 
   struct ixsend {
-    int16_t pri; // unused
+    int16_t pri; // higher means faces are sent earlier, default 0
     faceidx idx;
     uint32_t ofs;  // if != 0, need to send remaining bytes of partial_face
   };
@@ -241,6 +241,7 @@
   // if we get an incomplete packet, this is used to hold the data.
   // we add 2 byte for the header, one for the trailing 0 byte
   uint8 inbuf[MAXSOCKBUF + 2 + 1];
+  void inbuf_handle ();
 
   enum { MSG_BUF_SIZE = 80, MSG_BUF_COUNT = 10 };
   struct msg_buf
@@ -344,18 +345,6 @@
   ACC (RW, tcpi.tcpi_reordering);
 #endif
 
-//+GPL
-
-#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
-        ( ((__type)>0) &&\
-          ((__sockPtr)->has_readable_type) && \
-          ((__sockPtr)->supported_readables & (1<<(__type))) )
-
-#define FACE_TYPES  1
-#define PNG_FACE_INDEX	0
-
-//-GPL
-
 typedef object_vector<client, &client::active> sockvec;
 
 extern sockvec clients;