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

Cvar merge... segfault problems... also unknown problems in vid_svga.c

Browse source
This commit is contained in:
Dan Olson 2000-05-16 04:47:41 +00:00
parent 5c58a21a1c
commit 1d26c02826
74 changed files with 4288 additions and 1509 deletions
Download patch file Download diff file Expand all files Collapse all files

32
source/cl_ents.c
View file

@ -30,11 +30,19 @@
#include "sys.h"
#include "quakedef.h"
extern cvar_t cl_predict_players;
extern cvar_t cl_predict_players2;
extern cvar_t cl_solid_players;
/* extern cvar_t cl_predict_players;
CVAR_FIXME */
extern cvar_t *cl_predict_players;
/* extern cvar_t cl_predict_players2;
CVAR_FIXME */
extern cvar_t *cl_predict_players2;
/* extern cvar_t cl_solid_players;
CVAR_FIXME */
extern cvar_t *cl_solid_players;
extern cvar_t gl_flashblend;
/* extern cvar_t gl_flashblend;
CVAR_FIXME */
extern cvar_t *gl_flashblend;
static struct predicted_player {
int flags;
@ -825,7 +833,9 @@ void CL_LinkPlayers (void)
// FIXME: Use a findvar or something for gl_flashblend --KB
// spawn light flashes, even ones coming from invisible objects
if (!gl_flashblend.value || j != cl.playernum) {
/* if (!gl_flashblend.value || j != cl.playernum) {
CVAR_FIXME */
if (!gl_flashblend->value || j != cl.playernum) {
if ((state->effects & (EF_BLUE | EF_RED)) == (EF_BLUE | EF_RED))
CL_NewDlight (j, state->origin[0], state->origin[1], state->origin[2], 200 + (rand()&31), 0.1, 3);
else if (state->effects & EF_BLUE)
@ -874,7 +884,9 @@ void CL_LinkPlayers (void)
// only predict half the move to minimize overruns
msec = 500*(playertime - state->state_time);
if (msec <= 0 || (!cl_predict_players.value && !cl_predict_players2.value))
/* if (msec <= 0 || (!cl_predict_players.value && !cl_predict_players2.value))
CVAR_FIXME */
if (msec <= 0 || (!cl_predict_players->value && !cl_predict_players2->value))
{
VectorCopy (state->origin, ent->origin);
//Con_DPrintf ("nopredict\n");
@ -995,7 +1007,9 @@ void CL_SetUpPlayerPrediction(qboolean dopred)
// only predict half the move to minimize overruns
msec = 500*(playertime - state->state_time);
if (msec <= 0 ||
(!cl_predict_players.value && !cl_predict_players2.value) ||
/* (!cl_predict_players.value && !cl_predict_players2.value) ||
CVAR_FIXME */
(!cl_predict_players->value && !cl_predict_players2->value) ||
!dopred)
{
VectorCopy (state->origin, pplayer->origin);
@ -1034,7 +1048,9 @@ void CL_SetSolidPlayers (int playernum)
struct predicted_player *pplayer;
physent_t *pent;
if (!cl_solid_players.value)
/* if (!cl_solid_players.value)
CVAR_FIXME */
if (!cl_solid_players->value)
return;
pent = pmove.physents + pmove.numphysent;