--- deliantra/server/socket/loop.C	2008/04/23 07:25:55	1.75
+++ deliantra/server/socket/loop.C	2009/10/12 14:00:59	1.82
@@ -1,22 +1,23 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002-2003,2007 Mark Wedel & The Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * 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.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 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, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and 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 <support@deliantra.net>
  */
@@ -51,9 +52,6 @@
 #define MAX_QUEUE_DEPTH   50
 #define MAX_QUEUE_BACKLOG 3.
 
-// disconnect a socket after this many seconds without an ack
-#define SOCKET_TIMEOUT 16.
-
 void
 client::reset_state ()
 {
@@ -97,8 +95,16 @@
 
       if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW)
         {
-          reset_state ();
-          send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
+          reset_state (); // the command might actually reset some movement state etc.
+
+          if (pl)
+            pl->failmsg (
+               "Cannot keep up with your commands, ignoring them! "
+               "H<Your character cannot keep up with the instructions you give G<him|her>. "
+               "Try issuing commands slower, or, if G<he|she> is incapacitated (paralyzed and so on), "
+               "wait till your character can act again.\n\nIf G<he|she> is permanently stuck, then "
+               "try the B<suicide> command (or use B<chat> to ask somebody to B<invite> you out).>"
+            );
         }
       else
         execute (cmd.handler, cmd.data, cmd.datalen);
@@ -127,7 +133,10 @@
   sint32 weight = pl->ob->client_weight ();
 
   if (last_weight != weight)
-    esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
+    {
+      pl->ob->update_stats ();
+      esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
+    }
 
   draw_client_map (pl);
 
@@ -157,10 +166,10 @@
                tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked));
 #endif
 
-      // fast-time-out a player by checking for missign acks
+      // fast-time-out a player by checking for missing acks
       // do this only when player is active
       if (pl && pl->active
-          && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
+          && tcpi.tcpi_last_ack_recv > int (socket_timeout * 1000))
         {
           send_msg (NDI_RED | NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
           write_outputbuffer ();
@@ -181,13 +190,13 @@
   max_send = min (max_send, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss);
 #endif
 
-  // if we can split images, round to next-lowest mss
-  if (fxix) max_send -= max_send % mss;
+  // round to next-lowest mss
+  max_send -= max_send % mss;
 
   if (ixface.empty ())
     {
       // regularly send a new face when queue is empty
-      if (bg_scrub && !--bg_scrub && enable_bg_scrub)
+      if (bg_scrub && !--bg_scrub)
         while (scrub_idx < faces.size () - 1)
           {
             ++scrub_idx;
@@ -219,36 +228,28 @@
 
           if (facedata *d = face_data (ix.idx, faceset))
             {
-              if (fxix)
-                {
-                  // estimate the packet header overhead "ix " + idx + (new)ofs
-                  int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
-                  int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
-
-                  // only transfer something if the amount of data transferred
-                  // has a healthy relation to the header overhead
-                  if (chunk < 64)
-                    break;
+              // estimate the packet header overhead "ix " + idx + (new)ofs
+              int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
+              int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
+
+              // only transfer something if the amount of data transferred
+              // has a healthy relation to the header overhead
+              if (chunk < 64)
+                break;
 
-                  chunk = min (chunk, (int)ix.ofs);
+              chunk = min (chunk, (int)ix.ofs);
 
-                  ix.ofs -= chunk;
+              ix.ofs -= chunk;
 
-                  //fprintf (stderr, "i%dx %6d: %5d+%4d   (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
+              //fprintf (stderr, "i%dx %6d: %5d+%4d   (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
 
-                  packet sl ("ix");
+              packet sl ("ix");
 
-                  sl << ber32 (ix.idx)
-                     << ber32 (ix.ofs)
-                     << data (d->data.data () + ix.ofs, chunk);
+              sl << ber32 (ix.idx)
+                 << ber32 (ix.ofs)
+                 << data (d->data.data () + ix.ofs, chunk);
 
-                  send_packet (sl);
-                }
-              else
-                {
-                  send_image (ix.idx);
-                  ix.ofs = 0;
-                }
+              send_packet (sl);
             }
           else
             ix.ofs = 0;