--- deliantra/server/socket/loop.C	2007/05/12 22:04:20	1.47
+++ deliantra/server/socket/loop.C	2007/06/09 22:54:04	1.51
@@ -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>
  */
 
 /**
@@ -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)
     {
@@ -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.f))
+  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 (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
@@ -133,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)
     {
@@ -167,10 +154,10 @@
              (unsigned long) last_weight, WEIGHT (pl->ob));
     }
 
-  draw_client_map (pl->ob);
+  draw_client_map (pl);
 
   if (update_look)
-    esrv_draw_look (pl->ob);
+    esrv_draw_look (pl);
 
   if (askface.empty () && !partial_face_ofs)
     {