From 38852f0301c218a213caae7485d71c7d924657e4 Mon Sep 17 00:00:00 2001 From: havoc Date: Thu, 8 Feb 2007 15:37:08 +0000 Subject: [PATCH] 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 --- cl_input.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cl_input.c b/cl_input.c index 95321d67..1b4e37d3 100644 --- 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; } -- 2.39.2