--- deliantra/server/socket/loop.C	2006/12/17 19:14:00	1.28
+++ deliantra/server/socket/loop.C	2007/01/20 13:47:17	1.39
@@ -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
@@ -48,7 +49,7 @@
 #include <loader.h>
 
 #define MAX_QUEUE_DEPTH   500 //TODO
-#define MAX_QUEUE_BACKLOG 5.  //TODO
+#define MAX_QUEUE_BACKLOG 3.  //TODO
 
 void
 client::reset_state ()
@@ -88,7 +89,7 @@
   bool skipping = false;
 
   while (!cmd_queue.empty ()
-         && !(pl && pl->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 ();
 
@@ -118,8 +119,7 @@
 flush_sockets (void)
 {
   for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
-    if ((*i)->status != Ns_Dead)
-      (*i)->flush ();
+    (*i)->flush ();
 }
 
 /**
@@ -137,71 +137,27 @@
     write_cs_stats ();
 #endif
 
-  /* Go through the players.  Let the loop set the next pl value,
-   * since we may remove some
-   */
-  //TODO: must be handled cleanly elsewhere
-  for (player *pl = first_player; pl; )
-    {
-      player *npl = pl->next;
-
-      //TODO: must be handled cleanly elsewhere
-      if (!pl->socket || pl->socket->status == Ns_Dead)
-        {
-          save_player (pl->ob, 0);
-
-          if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
-            {
-              terminate_all_pets (pl->ob);
-              pl->ob->remove ();
-            }
-
-          leave (pl, 1);
-          final_free_player (pl);
-        }
-
-      pl = npl;
-    }
-
-  for (sockvec::iterator i = clients.begin (); i != clients.end (); )
-    {
-      client *s = *i;
-
-      if (s->status == Ns_Dead)
-        {
-          clients.erase (i);
-          delete s;
-        }
-      else
-        ++i;
-    }
-
-  /* We need to do some of the processing below regardless */
-
-  /* Check for any input on the sockets */
-  for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
+  //TODO: should not be done here, either
+  for (int i = 0; i < clients.size (); ++i)
     {
-      client *s = *i;
+      client *s = clients [i];
       player *pl = s->pl;
 
-      //TODO: this could probably be nuked completely
-      s->handle_packet ();
-      s->handle_command ();
-
-      //TODO: should not be done here, either
-      if (s->status != Ns_Dead && 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);
@@ -209,6 +165,8 @@
           if (s->update_look)
             esrv_draw_look (pl->ob);
         }
+
+      s->refcnt_chk ();
     }
 }