--- deliantra/server/include/client.h	2007/07/01 03:16:56	1.57
+++ deliantra/server/include/client.h	2007/07/12 19:36:58	1.61
@@ -1,23 +1,22 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
  * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT 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 2 of the License, or (at your option)
- * any later version.
+ * Crossfire TRT 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.
  * 
- * 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.
+ * 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of 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 <crossfire@schmorp.de>
  */
@@ -193,15 +192,19 @@
   tstamp ACC (RW, last_send);             // last data send on socket.
 
   int ACC (RW, rtt), ACC (RW, rttvar);    /* round-trip time and -variance, if known */
+  int ACC (RW, outq);                     // current socket outq length, or 0 if indeterminable
 
   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
   int ACC (RW, bg_scrub);                 // how many ticks till the next background face send
 
-  faceidx partial_face;
-  uint32 partial_face_ofs;  // if != 0, need to send remaining bytes of partial_face
-  std::vector<faceidx, slice_allocator<faceidx> > ixface; // which faces to send to the client using ix
+  struct ixsend {
+    int16_t pri; // unused
+    faceidx idx;
+    uint32_t ofs;  // if != 0, need to send remaining bytes of partial_face
+  };
+  std::vector<ixsend, slice_allocator<ixsend> > ixface; // which faces to send to the client using ix
 
   std::vector<faceidx, slice_allocator<faceidx> > fxface; // which faces to send using fx
   MTH void flush_fx (); // send fx if required
@@ -259,6 +262,16 @@
   void send_packet (packet &sl);
 
   void send_drawinfo (const char *msg, int flags = NDI_BLACK);
+
+  MTH bool must_send_face (faceidx facenum)
+  {
+    if (faces_sent[facenum])
+      return false;
+
+    faces_sent[facenum] = true;
+    return true;
+  }
+
   MTH void send_face (faceidx facenum);
   MTH void send_image (faceidx facenum);
   MTH void send_faces (object *ob);