--- deliantra/server/socket/loop.C	2007/03/16 02:37:54	1.43
+++ deliantra/server/socket/loop.C	2007/05/18 19:46:22	1.48
@@ -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
@@ -172,8 +164,9 @@
   if (update_look)
     esrv_draw_look (pl->ob);
 
-  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)
         while (scrub_idx < faces.size () - 1)
           {
@@ -181,21 +174,79 @@
             if (!faces_sent [scrub_idx])
               {
                 send_face (scrub_idx);
+                flush_fx ();
+
                 bg_scrub = 1; // send up to one face per tick, unless an image was requested
                 break;
               }
           }
+
+      rate_avail = max_rate - outputbuffer_len ();
     }
   else
-    while (!askface.empty () && outputbuffer_len () < max_rate)
-      {
-        // use a lifo to send most recently requested images
-        faceidx face = askface.back ();
-        askface.pop_back ();
+    {
+      int ol = outputbuffer_len ();
 
-        send_image (face);
+      rate_avail = min (max_rate, rate_avail + max_rate);
+      rate_avail -= ol;
 
-        bg_scrub = BG_SCRUB_RATE;
-      }
+      int avail = rate_avail;
+
+      // if we can split images, transfer up to mss packets if possible
+      // but never more 768 bytes more.
+      if (fxix) avail += min (768, mss - (ol % mss));
+
+      bg_scrub = BG_SCRUB_RATE;
+
+      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
+            break;
+
+          int consumed = ol - outputbuffer_len ();
+          avail      -= consumed;
+          rate_avail -= consumed;
+        }
+    }
 }