--- deliantra/server/socket/loop.C	2007/06/03 17:05:36	1.50
+++ deliantra/server/socket/loop.C	2007/07/01 03:16:56	1.53
@@ -32,8 +32,6 @@
  * 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>
 #include <sockproto.h>
@@ -49,8 +47,10 @@
 
 #include <loader.h>
 
-#define MAX_QUEUE_DEPTH   500 //TODO
-#define MAX_QUEUE_BACKLOG 3.  //TODO
+#define BG_SCRUB_RATE 4 // how often to send a face in the background
+
+#define MAX_QUEUE_DEPTH   500
+#define MAX_QUEUE_BACKLOG 3.
 
 void
 client::reset_state ()
@@ -65,7 +65,7 @@
 void
 client::queue_command (packet_type *handler, char *data, int datalen)
 {
-  tstamp stamp = now ();
+  tstamp stamp = NOW;
 
   if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
     {
@@ -93,7 +93,7 @@
     {
       command &cmd = cmd_queue.front ();
 
-      if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
+      if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW)
         {
           reset_state ();
           send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
@@ -125,11 +125,6 @@
 void
 doeric_server (void)
 {
-#ifdef CS_LOGSTATS
-  if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
-    write_cs_stats ();
-#endif
-
   //TODO: should not be done here, either
   for (unsigned i = 0; i < clients.size (); ++i)
     {
@@ -164,7 +159,7 @@
   if (update_look)
     esrv_draw_look (pl);
 
-  if (askface.empty () && !partial_face_ofs)
+  if (ixface.empty () && !partial_face_ofs)
     {
       // regularly send a new face when queue is empty
       if (bg_scrub && !--bg_scrub && enable_bg_scrub)
@@ -192,8 +187,8 @@
 
       int avail = rate_avail;
 
-      // if we can split images, transfer up to mss packets if possible
-      // but never more 768 bytes more.
+      // if we can split images, transfer up to mss-sized packets if possible
+      // but never 768 bytes more.
       if (fxix) avail += min (768, mss - (ol % mss));
 
       bg_scrub = BG_SCRUB_RATE;
@@ -204,7 +199,7 @@
             {
               if (facedata *d = face_data (partial_face, faceset))
                 {
-                  // 9 bytes is enough for fx_FFFOOO, 40 leaves some room
+                  // 9 bytes is enough for fx_FFFOOO, 40 leaves some room for image data
                   int chunk = min (min (avail - 40, MAXSOCKBUF - 9), partial_face_ofs);
 
                   if (chunk <= 0)
@@ -223,11 +218,11 @@
               else
                 partial_face_ofs = 0;
             }
-          else if (!askface.empty ())
+          else if (!ixface.empty ())
             {
               // use a lifo to send most recently requested images
-              faceidx facenum = askface.back ();
-              askface.pop_back ();
+              faceidx facenum = ixface.back ();
+              ixface.pop_back ();
 
               if (fxix)
                 {