From: divverent Date: Wed, 13 Oct 2010 09:56:29 +0000 (+0000) Subject: "cl_movement_replay 0" to disable the built-in prediction X-Git-Tag: xonotic-v0.1.0preview~134 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=50d9ee0c036a12bcd1d5c67250b400b21ab2a7cc;p=xonotic%2Fdarkplaces.git "cl_movement_replay 0" to disable the built-in prediction From: Jānis Rūcis git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10519 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=6d82f45c9a2d332323be1546f7929a921ade9b02 --- diff --git a/cl_input.c b/cl_input.c index 8c38c69d..86596afa 100644 --- a/cl_input.c +++ b/cl_input.c @@ -423,6 +423,7 @@ cvar_t cl_pitchspeed = {CVAR_SAVE, "cl_pitchspeed","150","keyboard pitch turning cvar_t cl_anglespeedkey = {CVAR_SAVE, "cl_anglespeedkey","1.5","how much +speed multiplies keyboard turning speed"}; cvar_t cl_movement = {CVAR_SAVE, "cl_movement", "0", "enables clientside prediction of your player movement"}; +cvar_t cl_movement_replay = {0, "cl_movement_replay", "1", "use engine prediction"}; cvar_t cl_movement_nettimeout = {CVAR_SAVE, "cl_movement_nettimeout", "0.3", "stops predicting moves when server is lagging badly (avoids major performance problems), timeout in seconds"}; cvar_t cl_movement_minping = {CVAR_SAVE, "cl_movement_minping", "0", "whether to use prediction when ping is lower than this value in milliseconds"}; cvar_t cl_movement_track_canjump = {CVAR_SAVE, "cl_movement_track_canjump", "1", "track if the player released the jump key between two jumps to decide if he is able to jump or not; when off, this causes some \"sliding\" slightly above the floor when the jump key is held too long; if the mod allows repeated jumping by holding space all the time, this has to be set to zero too"}; @@ -1549,6 +1550,9 @@ void CL_ClientMovement_Replay(void) if (cl.movement_predicted && !cl.movement_replay) return; + if (!cl_movement_replay.integer) + return; + // set up starting state for the series of moves memset(&s, 0, sizeof(s)); VectorCopy(cl.entities[cl.playerentity].state_current.origin, s.origin); @@ -2168,6 +2172,7 @@ void CL_InitInput (void) Cvar_RegisterVariable(&cl_movecliptokeyboard); Cvar_RegisterVariable(&cl_movement); + Cvar_RegisterVariable(&cl_movement_replay); Cvar_RegisterVariable(&cl_movement_nettimeout); Cvar_RegisterVariable(&cl_movement_minping); Cvar_RegisterVariable(&cl_movement_track_canjump);