--- deliantra/server/socket/loop.C	2006/12/21 06:12:37	1.30
+++ deliantra/server/socket/loop.C	2006/12/21 23:37:06	1.31
@@ -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)->destroyed)
-      (*i)->flush ();
+    (*i)->flush ();
 }
 
 /**
@@ -146,7 +145,7 @@
       player *npl = pl->next;
 
       //TODO: must be handled cleanly elsewhere
-      if (!pl->socket || pl->socket->destroyed)
+      if (!pl->ns || pl->ns->destroyed ())
         {
           save_player (pl->ob, 0);
 
@@ -167,7 +166,7 @@
     {
       client *s = *i;
 
-      if (s->destroyed)
+      if (s->destroyed ())
         {
           clients.erase (i);
           delete s;
@@ -185,7 +184,7 @@
       player *pl = s->pl;
 
       //TODO: should not be done here, either
-      if (!s->destroyed && 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