--- deliantra/server/socket/loop.C	2007/04/03 00:21:38	1.45
+++ deliantra/server/socket/loop.C	2007/06/03 17:05:36	1.50
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
- * 
- * This program 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.
- * 
- * 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The author can be reached via e-mail to <crossfire@schmorp.de>
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002-2003,2007 Mark Wedel & The 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.
+ * 
+ * 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
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 /**
@@ -87,33 +87,25 @@
 bool
 client::handle_command ()
 {
-  bool skipping = false;
-
-  while (!cmd_queue.empty ()
-         && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0))
+  if (!cmd_queue.empty ()
+      && state == ST_PLAYING
+      && pl->ob->speed_left > 0.f)
     {
       command &cmd = cmd_queue.front ();
 
       if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
         {
-          if (!skipping)
-            {
-              skipping = true;
-              reset_state ();
-              send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
-            }
-
-          cmd_queue.pop_front ();
+          reset_state ();
+          send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
         }
       else
-        {
-          execute (cmd.handler, cmd.data, cmd.datalen);
-          cmd_queue.pop_front ();
-          return true;
-        }
-    }
+        execute (cmd.handler, cmd.data, cmd.datalen);
 
-  return false;
+      cmd_queue.pop_front ();
+      return true;
+    }
+  else
+    return false;
 }
 
 void
@@ -167,20 +159,12 @@
              (unsigned long) last_weight, WEIGHT (pl->ob));
     }
 
-  draw_client_map (pl->ob);
+  draw_client_map (pl);
 
   if (update_look)
-    esrv_draw_look (pl->ob);
-
-  if (partial_face_ofs)
-    {
-    }
+    esrv_draw_look (pl);
 
-  if (partial_face_ofs)
-    {
-      // one hell of a big thing that must be
-    }
-  else if (askface.empty ())
+  if (askface.empty () && !partial_face_ofs)
     {
       // regularly send a new face when queue is empty
       if (bg_scrub && !--bg_scrub && enable_bg_scrub)
@@ -207,27 +191,61 @@
       rate_avail -= ol;
 
       int avail = rate_avail;
-      
+
       // if we can split images, transfer up to mss packets if possible
-      if (fxix) avail += mss - (ol % mss);
+      // but never more 768 bytes more.
+      if (fxix) avail += min (768, mss - (ol % mss));
 
-      while (!askface.empty () && avail > 0)
-        {
-          // use a lifo to send most recently requested images
-          faceidx facenum = askface.back ();
-          askface.pop_back ();
+      bg_scrub = BG_SCRUB_RATE;
 
-          if (fxix && 0)
+      while (avail > 0)
+        {
+          if (partial_face_ofs)
             {
+              if (facedata *d = face_data (partial_face, faceset))
+                {
+                  // 9 bytes is enough for fx_FFFOOO, 40 leaves some room
+                  int chunk = min (min (avail - 40, MAXSOCKBUF - 9), partial_face_ofs);
+
+                  if (chunk <= 0)
+                    break;
+
+                  partial_face_ofs -= chunk;
+
+                  packet sl ("ix");
+
+                  sl << ber32 (partial_face)
+                     << ber32 (partial_face_ofs)
+                     << data (d->data.data () + partial_face_ofs, chunk);
+
+                  send_packet (sl);
+                }
+              else
+                partial_face_ofs = 0;
+            }
+          else if (!askface.empty ())
+            {
+              // use a lifo to send most recently requested images
+              faceidx facenum = askface.back ();
+              askface.pop_back ();
+
+              if (fxix)
+                {
+                  if (facedata *d = face_data (facenum, faceset))
+                    {
+                      partial_face     = facenum;
+                      partial_face_ofs = d->data.size ();
+                    }
+                }
+              else
+                send_image (facenum);
             }
           else
-            send_image (facenum);
+            break;
 
           int consumed = ol - outputbuffer_len ();
           avail      -= consumed;
           rate_avail -= consumed;
-
-          bg_scrub = BG_SCRUB_RATE;
         }
     }
 }