fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

surround netquake stuff around NQPROT defines so minimal GL can build

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2863 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2008-01-16 06:36:24 +00:00
parent d46a2ca5d5
commit ae54e4712f
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
engine/client/cl_ents.c
View file

@ -1542,13 +1542,18 @@ void CL_LinkPacketEntities (void)
dlight_t *dl; dlight_t *dl;
vec3_t angles; vec3_t angles;
int flicker; int flicker;
qboolean nolerp;
float servertime; float servertime;
CL_CalcClientTime(); CL_CalcClientTime();
servertime = cl.servertime; servertime = cl.servertime;
pack = CL_ProcessPacketEntities(&servertime, !!cl_nolerp.value && (cls.demoplayback != DPB_MVD && cls.demoplayback != DPB_EZTV && cls.demoplayback != DPB_NETQUAKE)); nolerp = !!cl_nolerp.value && cls.demoplayback != DPB_MVD && cls.demoplayback != DPB_EZTV;
#ifdef NQPROT
nolerp = nolerp && cls.demoplayback != DPB_NETQUAKE;
#endif
pack = CL_ProcessPacketEntities(&servertime, nolerp);
if (!pack) if (!pack)
return; return;

13
engine/client/cl_pred.c
View file

@ -544,9 +544,14 @@ static void CL_LerpMove (int pnum, float msgtime)
int i; int i;
int from, to; int from, to;
if (cl_nolerp.value || cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV || cls.demoplayback == DPB_NETQUAKE) if (cl_nolerp.value || cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
return; return;
#ifdef NQPROT
if (cls.demoplayback == DPB_NETQUAKE)
return;
#endif
if (cls.netchan.outgoing_sequence < lastsequence) { if (cls.netchan.outgoing_sequence < lastsequence) {
// reset // reset
lastsequence = -1; lastsequence = -1;
@ -725,10 +730,12 @@ void CL_PredictMovePNum (int pnum)
return; return;
} }
#ifdef NQPROT
if (cls.demoplayback == DPB_NETQUAKE) if (cls.demoplayback == DPB_NETQUAKE)
{ {
cl.ackedinputsequence = cls.netchan.outgoing_sequence; cl.ackedinputsequence = cls.netchan.outgoing_sequence;
} }
#endif
if (!cl.ackedinputsequence) if (!cl.ackedinputsequence)
{ {
@ -820,7 +827,11 @@ fixedorg:
to = &cl.frames[cl.ackedinputsequence & UPDATE_MASK]; to = &cl.frames[cl.ackedinputsequence & UPDATE_MASK];
#ifdef NQPROT
if (Cam_TrackNum(pnum)>=0 && !cl_nolerp.value && cls.demoplayback != DPB_MVD && cls.demoplayback != DPB_EZTV && cls.demoplayback != DPB_NETQUAKE) if (Cam_TrackNum(pnum)>=0 && !cl_nolerp.value && cls.demoplayback != DPB_MVD && cls.demoplayback != DPB_EZTV && cls.demoplayback != DPB_NETQUAKE)
#else
if (Cam_TrackNum(pnum)>=0 && !cl_nolerp.value && cls.demoplayback != DPB_MVD && cls.demoplayback != DPB_EZTV)
#endif
{ {
float f; float f;