--- deliantra/server/socket/loop.C	2007/01/06 14:42:31	1.36
+++ deliantra/server/socket/loop.C	2007/03/01 12:28:17	1.40
@@ -1,26 +1,26 @@
 /*
-    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>
-*/
+ * 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
@@ -89,7 +89,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 ();
 
@@ -138,24 +138,26 @@
 #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;
 
       if (pl && pl->ns && !pl->ns->destroyed ())
         {
+          client *ns = pl->ns;
+
           /* 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 (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
+          if (ns->last_weight != -1 && ns->last_weight != WEIGHT (pl->ob))
             {
               esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
-              if (pl->last_weight != WEIGHT (pl->ob))
+              if (ns->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));
+                     (unsigned long) ns->last_weight, WEIGHT (pl->ob));
             }
 
           draw_client_map (pl->ob);