--- deliantra/server/socket/loop.C	2007/07/31 20:10:31	1.67
+++ deliantra/server/socket/loop.C	2008/04/23 07:49:57	1.76
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002-2003,2007 Mark Wedel & The Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra 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 3 of the License, or
  * (at your option) any later version.
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 /**
@@ -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;
     }
@@ -116,17 +117,19 @@
   if (!pl || destroyed ())
     return;
 
+  pl->dirty = true;
+
   /* 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 (last_weight != -1 && last_weight != WEIGHT (pl->ob))
+  sint32 weight = pl->ob->client_weight ();
+
+  if (last_weight != weight)
     {
+      pl->ob->update_stats ();
       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));
     }
 
   draw_client_map (pl);
@@ -134,6 +137,8 @@
   if (update_look)
     esrv_draw_look (pl);
 
+  mapinfo_queue_run ();
+
 #if HAVE_TCP_INFO
   // check time of last ack, and, if too old, kill connection
   socklen_t len = sizeof (tcpi);
@@ -155,6 +160,7 @@
                tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked));
 #endif
 
+      // fast-time-out a player by checking for missign acks
       // do this only when player is active
       if (pl && pl->active
           && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))