qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 04:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove cl_predict_static, it doesn't need a cvar to control it anymore. Also some minor related cleanups.

Browse source
This commit is contained in:
Ragnvald Maartmann-Moe IV 2002-07-27 00:44:54 +00:00
parent 81af9b14e9
commit 227491d929
3 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
qw/source/cl_cam.c
View file

@ -147,8 +147,7 @@ Cam_DrawViewModel (void)
qboolean
Cam_DrawPlayer (int playernum)
{
if (playernum < 0) {
// client player
if (playernum == cl.playernum) { // client player
if (cl.chase == 0 || chase_active->int_val == 0)
return false;
if (!cl.spectator)

19
qw/source/cl_ents.c
View file

@ -805,6 +805,7 @@ CL_LinkPlayers (void)
player_info_t *info;
player_state_t exact;
player_state_t *state;
qboolean clientplayer;
vec3_t org;
playertime = realtime - cls.latency + 0.02;
@ -828,19 +829,17 @@ CL_LinkPlayers (void)
if (j == cl.playernum) {
VectorCopy (cl.simorg, org);
r_player_entity = &cl_player_ents[j];
} else
clientplayer = true;
} else {
VectorCopy (state->origin, org);
clientplayer = false;
}
CL_NewDlight (j, org, state->effects, state->glow_size,
state->glow_color);
// the player object never gets added
if (j == cl.playernum) {
if (!Cam_DrawPlayer (-1)) // XXX
continue;
} else {
if (!Cam_DrawPlayer (j))
continue;
}
// Draw player?
if (!Cam_DrawPlayer (j))
continue;
if (!state->modelindex)
continue;
@ -860,7 +859,7 @@ CL_LinkPlayers (void)
oldphysent = pmove.numphysent;
CL_SetSolidPlayers (j);
CL_PredictUsercmd (state, &exact, &state->command, false);
CL_PredictUsercmd (state, &exact, &state->command, clientplayer);
pmove.numphysent = oldphysent;
VectorCopy (exact.origin, ent->origin);
}

34
qw/source/cl_pred.c
View file

@ -44,20 +44,22 @@ static const char rcsid[] =
#include "pmove.h"
cvar_t *cl_predict;
cvar_t *cl_predict_static;
cvar_t *cl_pushlatency;
void
CL_PredictUsercmd (player_state_t * from, player_state_t * to, usercmd_t *u,
qboolean spectator)
qboolean clientplayer)
{
// Dabb: if there is no movement to start with, don't predict...
if (!cl_predict_static->int_val && VectorIsZero (from->velocity)) {
VectorCopy (from->origin, to->origin);
VectorCopy (u->angles, to->viewangles);
VectorCopy (from->velocity, to->velocity);
return;
// Despair: Not predicting for the client's player is painful.
if (!clientplayer) {
if (VectorIsZero (from->velocity)) {
VectorCopy (from->origin, to->origin);
VectorCopy (u->angles, to->viewangles);
VectorCopy (from->velocity, to->velocity);
return;
}
}
// split up very long moves
@ -68,8 +70,8 @@ CL_PredictUsercmd (player_state_t * from, player_state_t * to, usercmd_t *u,
split = *u;
split.msec /= 2;
CL_PredictUsercmd (from, &temp, &split, spectator);
CL_PredictUsercmd (&temp, to, &split, spectator);
CL_PredictUsercmd (from, &temp, &split, clientplayer);
CL_PredictUsercmd (&temp, to, &split, clientplayer);
return;
}
@ -81,17 +83,17 @@ CL_PredictUsercmd (player_state_t * from, player_state_t * to, usercmd_t *u,
pmove.oldbuttons = from->oldbuttons;
pmove.waterjumptime = from->waterjumptime;
pmove.dead = cl.stats[STAT_HEALTH] <= 0;
pmove.spectator = spectator;
if (clientplayer)
pmove.spectator = cl.spectator;
else
pmove.spectator = false;
pmove.flying = cl.stats[STAT_FLYMODE];
pmove.cmd = *u;
PlayerMove ();
// for (i=0 ; i<3 ; i++)
// pmove.origin[i] = ((int)(pmove.origin[i] * 8)) * 0.125;
to->waterjumptime = pmove.waterjumptime;
to->oldbuttons = pmove.oldbuttons; // Tonik
// to->oldbuttons = pmove.cmd.buttons;
VectorCopy (pmove.origin, to->origin);
VectorCopy (pmove.angles, to->viewangles);
VectorCopy (pmove.velocity, to->velocity);
@ -154,6 +156,7 @@ CL_PredictMove (void)
return;
}
/* FIXME Despair: always predict clientplayer
// Dabb: if there is no movement to start with, don't predict...
if (!cl_predict_static->int_val
&& VectorIsZero (from->playerstate[cl.playernum].velocity)) {
@ -161,6 +164,7 @@ CL_PredictMove (void)
VectorCopy (from->playerstate[cl.playernum].origin, cl.simorg);
return;
}
*/
// predict forward until cl.time <= to->senttime
oldphysent = pmove.numphysent;
@ -173,7 +177,7 @@ CL_PredictMove (void)
to = &cl.frames[(cls.netchan.incoming_sequence + i) & UPDATE_MASK];
CL_PredictUsercmd (&from->playerstate[cl.playernum],
&to->playerstate[cl.playernum], &to->cmd,
cl.spectator);
true);
cl.onground = onground;
if (to->senttime >= cl.time)
break;
@ -217,8 +221,6 @@ CL_Prediction_Init_Cvars (void)
{
cl_predict = Cvar_Get ("cl_predict", "1", CVAR_NONE, NULL,
"Set to enable client prediction");
cl_predict_static = Cvar_Get ("cl_predict_static", "1", CVAR_NONE, NULL,
"Set to enable static player prediction");
cl_pushlatency = Cvar_Get ("pushlatency", "-999", CVAR_NONE, NULL,
"How much prediction should the client make");
}