--- deliantra/server/socket/loop.C	2008/12/27 01:25:00	1.78
+++ deliantra/server/socket/loop.C	2009/09/02 16:54:20	1.81
@@ -51,9 +51,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 +94,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);
@@ -160,10 +165,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 ();