qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-30 08:20:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

cl_predict_players2 is gone (cl_predict_players is still there)

Browse source
This commit is contained in:
Bill Currie 2001-09-07 17:44:02 +00:00
parent c762151df6
commit 714f429276
2 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qw/source/cl_ents.c
View file

@ -58,7 +58,6 @@
#include "view.h" #include "view.h"
extern cvar_t *cl_predict_players; extern cvar_t *cl_predict_players;
extern cvar_t *cl_predict_players2;
extern cvar_t *cl_solid_players; extern cvar_t *cl_solid_players;
static struct predicted_player { static struct predicted_player {
@ -865,8 +864,7 @@ CL_LinkPlayers (void)
// only predict half the move to minimize overruns // only predict half the move to minimize overruns
msec = 500 * (playertime - state->state_time); msec = 500 * (playertime - state->state_time);
if (msec <= 0 || (!cl_predict_players->int_val && if (msec <= 0 || (!cl_predict_players->int_val)) {
!cl_predict_players2->int_val)) {
VectorCopy (state->origin, (*ent)->origin); VectorCopy (state->origin, (*ent)->origin);
} else { // predict players movement } else { // predict players movement
state->command.msec = msec = min (msec, 255); state->command.msec = msec = min (msec, 255);
@ -972,7 +970,7 @@ CL_SetUpPlayerPrediction (qboolean dopred)
// only predict half the move to minimize overruns // only predict half the move to minimize overruns
msec = 500 * (playertime - state->state_time); msec = 500 * (playertime - state->state_time);
if (msec <= 0 || if (msec <= 0 ||
(!cl_predict_players->int_val && !cl_predict_players2->int_val) (!cl_predict_players->int_val)
|| !dopred) { || !dopred) {
VectorCopy (state->origin, pplayer->origin); VectorCopy (state->origin, pplayer->origin);
// Con_DPrintf ("nopredict\n"); // Con_DPrintf ("nopredict\n");

8
qw/source/cl_main.c
View file

@ -148,7 +148,6 @@ cvar_t *m_forward;
cvar_t *m_side; cvar_t *m_side;
cvar_t *cl_predict_players; cvar_t *cl_predict_players;
cvar_t *cl_predict_players2;
cvar_t *cl_solid_players; cvar_t *cl_solid_players;
cvar_t *localid; cvar_t *localid;
@ -1253,12 +1252,9 @@ CL_Init_Cvars (void)
"display current packet loss to server"); "display current packet loss to server");
show_time = Cvar_Get ("show_time", "0", CVAR_NONE, NULL, show_time = Cvar_Get ("show_time", "0", CVAR_NONE, NULL,
"display the current time"); "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, cl_predict_players = Cvar_Get ("cl_predict_players", "1", CVAR_NONE, NULL,
"If this and cl_predict_players2 is 0, no " "If this is 0, no player prediction is "
"player prediction is done"); "done");
cl_solid_players = Cvar_Get ("cl_solid_players", "1", CVAR_NONE, NULL, cl_solid_players = Cvar_Get ("cl_solid_players", "1", CVAR_NONE, NULL,
"Are players solid? If off, you can walk " "Are players solid? If off, you can walk "
"through them with difficulty"); "through them with difficulty");