disabled use of certain prediction code when the server has blocked prediction

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

diff --git a/cl_input.c b/cl_input.c
index 95321d6743f53d37c7b454e063a6a6d3ae6c6791..1b4e37d33e053679d1369dd5f9aabbbbd0abef27 100644 (file)
--- a/cl_input.c
+++ b/cl_input.c
@@ -1272,7 +1272,7 @@ void CL_SendMove(void)
                return;
 
 #if 0
-       if (cl_movement.integer && cls.signon == SIGNONS && cls.protocol != PROTOCOL_QUAKEWORLD)
+       if (cl.movement_predicted && cls.signon == SIGNONS && cls.protocol != PROTOCOL_QUAKEWORLD)
        {
                if (!cl.movement_needupdate)
                        return;
@@ -1299,7 +1299,7 @@ void CL_SendMove(void)
        // conditions for sending a move:
        // if the move advances time or if the game is paused (in which case time
        // is not advancing)
-       if ((cl.cmd.time > cl.movecmd[0].time || cl.mtime[0] == cl.mtime[1]) && cls.signon == SIGNONS)
+       if ((cl.cmd.time > cl.movecmd[0].time || cl.mtime[0] <= cl.mtime[1]) && cls.signon == SIGNONS)
        {
                // send the movement message
                // PROTOCOL_QUAKE        clc_move = 16 bytes total
@@ -1388,7 +1388,7 @@ void CL_SendMove(void)
                                // configurable number of unacknowledged moves
                                maxusercmds = bound(1, cl_netinputpacketlosstolerance.integer + 1, CL_MAX_USERCMDS);
                                // when movement prediction is off, there's not much point in repeating old input as it will just be ignored
-                               if (!cl_movement.integer)
+                               if (!cl.movement_predicted)
                                        maxusercmds = 1;
                        }