--- deliantra/server/socket/loop.C	2007/11/08 19:43:30	1.70
+++ deliantra/server/socket/loop.C	2008/04/22 07:28:05	1.74
@@ -52,7 +52,7 @@
 #define MAX_QUEUE_BACKLOG 3.
 
 // disconnect a socket after this many seconds without an ack
-#define SOCKET_TIMEOUT 8.
+#define SOCKET_TIMEOUT 16.
 
 void
 client::reset_state ()
@@ -77,7 +77,7 @@
     }
   else
     {
-      cmd_queue.push_back (command ());
+      cmd_queue.resize (cmd_queue.size () + 1);
       command &cmd = cmd_queue.back ();
       cmd.stamp   = stamp;
       cmd.handler = handler;
@@ -103,6 +103,7 @@
       else
         execute (cmd.handler, cmd.data, cmd.datalen);
 
+      sfree<char> (cmd.data, cmd.datalen + 1);
       cmd_queue.pop_front ();
       return true;
     }
@@ -121,13 +122,10 @@
    */
   esrv_update_stats (pl);
 
-  if (last_weight != -1 && last_weight != WEIGHT (pl->ob))
-    {
-      esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
-      if (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) last_weight, WEIGHT (pl->ob));
-    }
+  sint32 weight = pl->ob->client_weight ();
+
+  if (last_weight != weight)
+    esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
 
   draw_client_map (pl);