--- deliantra/server/socket/loop.C	2007/01/02 11:08:36	1.35
+++ deliantra/server/socket/loop.C	2007/03/15 03:30:37	1.42
@@ -1,25 +1,26 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    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>
-*/
+ * CrossFire, A Multiplayer game for X-windows
+ * 
+ * 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>
+ */
 
 /**
  * \file
@@ -31,6 +32,7 @@
  * maintanance (checking for lost connections and if data has arrived.)
  */
 
+#define BG_SCRUB_RATE 4 // how often to send a face in the background
 
 #include <global.h>
 #include <sproto.h>
@@ -88,7 +90,7 @@
   bool skipping = false;
 
   while (!cmd_queue.empty ()
-         && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0))
+         && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0))
     {
       command &cmd = cmd_queue.front ();
 
@@ -137,33 +139,62 @@
 #endif
 
   //TODO: should not be done here, either
-  for (int i = 0; i < clients.size (); ++i)
+  for (unsigned i = 0; i < clients.size (); ++i)
     {
-      client *s = clients [i];
-      player *pl = s->pl;
+      client *ns = clients [i];
 
-      if (pl && pl->ns && !pl->ns->destroyed ())
-        {
-          /* Update the players stats once per tick.  More efficient than
-           * sending them whenever they change, and probably just as useful
-           */
-          esrv_update_stats (pl);
+      ns->tick ();
+      ns->refcnt_chk ();
+    }
+}
 
-          if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
-            {
-              esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
-              if (pl->last_weight != WEIGHT (pl->ob))
-                LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
-                     (unsigned long) pl->last_weight, WEIGHT (pl->ob));
-            }
+void
+client::tick ()
+{
+  if (!pl || destroyed ())
+    return;
 
-          draw_client_map (pl->ob);
+  /* Update the players stats once per tick.  More efficient than
+   * sending them whenever they change, and probably just as useful
+   */
+  esrv_update_stats (pl);
 
-          if (s->update_look)
-            esrv_draw_look (pl->ob);
-        }
+  if (last_weight != -1 && last_weight != WEIGHT (pl->ob))
+    {
+      esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
+      if (last_weight != WEIGHT (pl->ob))
+        LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
+             (unsigned long) last_weight, WEIGHT (pl->ob));
+    }
+
+  draw_client_map (pl->ob);
 
-      s->refcnt_chk ();
+  if (update_look)
+    esrv_draw_look (pl->ob);
+
+  if (askface.empty ())
+    {
+      if (bg_scrub && !--bg_scrub)
+        while (scrub_idx < faces.size () - 1)
+          {
+            ++scrub_idx;
+            if (!faces_sent [scrub_idx])
+              {
+                send_face (scrub_idx);
+                bg_scrub = 1; // send up to one face per tick, unless an image was requested
+                break;
+              }
+          }
     }
-}
+  else
+    while (!askface.empty () && outputbuffer_len () < max_rate)
+      {
+        // use a lifo to send most recently requested images
+        faceidx face = askface.back ();
+        askface.pop_back ();
+
+        send_image (face);
 
+        bg_scrub = BG_SCRUB_RATE;
+      }
+}