--- deliantra/server/socket/loop.C	2006/12/17 19:14:00	1.28
+++ deliantra/server/socket/loop.C	2006/12/22 16:34:00	1.32
@@ -88,7 +88,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 +118,7 @@
 flush_sockets (void)
 {
   for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
-    if ((*i)->status != Ns_Dead)
-      (*i)->flush ();
+    (*i)->flush ();
 }
 
 /**
@@ -137,37 +136,11 @@
     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)
+      if (s->destroyed ())
         {
           clients.erase (i);
           delete s;
@@ -184,12 +157,8 @@
       client *s = *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 (!s->destroyed () && pl)
         {
           /* Update the players stats once per tick.  More efficient than
            * sending them whenever they change, and probably just as useful