no longer sends nearly-empty input packets when cl.time is less than the

previous move time

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7115 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_input.c b/cl_input.c
index c84b3c649c52e781d1f6b879f17398dbc68aa25e..e78a9061eb0a11c5cd98f3335162f6b929d5a70f 100644 (file)
--- a/cl_input.c
+++ b/cl_input.c
@@ -1321,12 +1321,6 @@ void CL_SendMove(void)
        // set the flag indicating that we sent a packet recently
        cl.movement_needupdate = false;
 
-       // don't send a new input packet if the connection is still saturated from
-       // the last one (or chat messages, etc)
-       // note: this behavior comes from QW
-       if (!NetConn_CanSend(cls.netcon))
-               return;
-
        buf.maxsize = sizeof(data);
        buf.cursize = 0;
        buf.data = data;
@@ -1336,6 +1330,12 @@ void CL_SendMove(void)
        // is not advancing)
        if ((cl.cmd.time > cl.movecmd[0].time || cl.mtime[0] <= cl.mtime[1]) && cls.signon == SIGNONS)
        {
+               // don't send a new input packet if the connection is still saturated from
+               // the last one (or chat messages, etc)
+               // note: this behavior comes from QW
+               if (!NetConn_CanSend(cls.netcon))
+                       return;
+
                // send the movement message
                // PROTOCOL_QUAKE        clc_move = 16 bytes total
                // PROTOCOL_QUAKEDP      clc_move = 16 bytes total
@@ -1563,7 +1563,7 @@ void CL_SendMove(void)
                }
        }
 
-       if (cls.protocol != PROTOCOL_QUAKEWORLD)
+       if (cls.protocol != PROTOCOL_QUAKEWORLD && buf.cursize)
        {
                // ack the last few frame numbers
                // (redundent to improve handling of client->server packet loss)
@@ -1597,7 +1597,8 @@ void CL_SendMove(void)
        }
 
        // send the reliable message (forwarded commands) if there is one
-       NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, max(20*(buf.cursize+40), cl_rate.integer));
+       if (buf.cursize || cls.netcon->message.cursize)
+               NetConn_SendUnreliableMessage(cls.netcon, &buf, cls.protocol, max(20*(buf.cursize+40), cl_rate.integer));
 
        if (cls.netcon->message.overflowed)
        {