--- deliantra/server/socket/loop.C	2007/04/02 19:56:11	1.44
+++ deliantra/server/socket/loop.C	2007/04/03 01:06:09	1.46
@@ -172,7 +172,7 @@
   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)
@@ -182,6 +182,8 @@
             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;
               }
@@ -197,29 +199,62 @@
       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));
 
-      fprintf (stderr, "ra %6d a %6d ", rate_avail, avail);
+      bg_scrub = BG_SCRUB_RATE;
 
-      while (!askface.empty () && avail > 0)
+      while (avail > 0)
         {
-          // use a lifo to send most recently requested images
-          faceidx face = askface.back ();
-          askface.pop_back ();
-
-          send_image (face);
-
-          bg_scrub = BG_SCRUB_RATE;
+          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;
         }
-
-      fprintf (stderr, "ra %6d a %6d\n", rate_avail, avail);
-
     }
 }