From 714f429276a0a33eb9fc29a12cae47f7440c0c96 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Fri, 7 Sep 2001 17:44:02 +0000 Subject: [PATCH] cl_predict_players2 is gone (cl_predict_players is still there) --- qw/source/cl_ents.c | 6 ++---- qw/source/cl_main.c | 8 ++------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/qw/source/cl_ents.c b/qw/source/cl_ents.c index 8a469596c..06e1340fa 100644 --- a/qw/source/cl_ents.c +++ b/qw/source/cl_ents.c @@ -58,7 +58,6 @@ #include "view.h" extern cvar_t *cl_predict_players; -extern cvar_t *cl_predict_players2; extern cvar_t *cl_solid_players; static struct predicted_player { @@ -865,8 +864,7 @@ CL_LinkPlayers (void) // only predict half the move to minimize overruns msec = 500 * (playertime - state->state_time); - if (msec <= 0 || (!cl_predict_players->int_val && - !cl_predict_players2->int_val)) { + if (msec <= 0 || (!cl_predict_players->int_val)) { VectorCopy (state->origin, (*ent)->origin); } else { // predict players movement state->command.msec = msec = min (msec, 255); @@ -972,7 +970,7 @@ CL_SetUpPlayerPrediction (qboolean dopred) // only predict half the move to minimize overruns msec = 500 * (playertime - state->state_time); if (msec <= 0 || - (!cl_predict_players->int_val && !cl_predict_players2->int_val) + (!cl_predict_players->int_val) || !dopred) { VectorCopy (state->origin, pplayer->origin); // Con_DPrintf ("nopredict\n"); diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c index 8d367762e..3ed78488f 100644 --- a/qw/source/cl_main.c +++ b/qw/source/cl_main.c @@ -148,7 +148,6 @@ cvar_t *m_forward; cvar_t *m_side; cvar_t *cl_predict_players; -cvar_t *cl_predict_players2; cvar_t *cl_solid_players; cvar_t *localid; @@ -1253,12 +1252,9 @@ CL_Init_Cvars (void) "display current packet loss to server"); show_time = Cvar_Get ("show_time", "0", CVAR_NONE, NULL, "display the current time"); - cl_predict_players2 = Cvar_Get ("cl_predict_players2", "1", CVAR_NONE, - NULL, "If this and cl_predict_players are " - "0, no player prediction is done"); cl_predict_players = Cvar_Get ("cl_predict_players", "1", CVAR_NONE, NULL, - "If this and cl_predict_players2 is 0, no " - "player prediction is done"); + "If this is 0, no player prediction is " + "done"); cl_solid_players = Cvar_Get ("cl_solid_players", "1", CVAR_NONE, NULL, "Are players solid? If off, you can walk " "through them with difficulty");