nzp-team
/
fteqw
mirror of https://github.com/nzp-team/fteqw.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Client improvements for NQ support. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3678 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2010-11-28 19:19:06 +00:00
parent a72096dc6d
commit a9ff7b962e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engine/client/cl_ents.c
View File

@ -1004,6 +1004,8 @@ void CLNQ_ParseEntity(unsigned int bits)
state->number = num; state->number = num;
state->dpflags = (bits & NQU_NOLERP)?RENDER_STEP:0;
if (bits & NQU_MODEL) if (bits & NQU_MODEL)
state->modelindex = MSG_ReadByte (); state->modelindex = MSG_ReadByte ();
else else
@ -1746,9 +1748,6 @@ void CL_LinkPacketEntities (void)
servertime = realtime; servertime = realtime;
nolerp = !CL_MayLerp() && cls.demoplayback != DPB_MVD && cls.demoplayback != DPB_EZTV; nolerp = !CL_MayLerp() && cls.demoplayback != DPB_MVD && cls.demoplayback != DPB_EZTV;
#ifdef NQPROT
nolerp = nolerp && cls.demoplayback != DPB_NETQUAKE;
#endif
} }
pack = CL_ProcessPacketEntities(&servertime, nolerp); pack = CL_ProcessPacketEntities(&servertime, nolerp);
if (!pack) if (!pack)

3
engine/client/cl_main.c
View File

@ -1207,6 +1207,7 @@ void CL_Disconnect (void)
cl.spectator = 0; cl.spectator = 0;
cl.sendprespawn = false; cl.sendprespawn = false;
cl.intermission = 0; cl.intermission = 0;
cl.oldgametime = 0;
#ifdef NQPROT #ifdef NQPROT
cls.signon=0; cls.signon=0;
@ -2004,7 +2005,7 @@ void CL_Reconnect_f (void)
if (cls.downloadqw) // don't change when downloading if (cls.downloadqw) // don't change when downloading
return; return;
#ifdef NQPROT #ifdef NQPROT
if (cls.protocol == CP_NETQUAKE) if (cls.protocol == CP_NETQUAKE && Cmd_FromGamecode())
{ {
CL_Changing_f(); CL_Changing_f();
return; return;

4
engine/client/cl_pred.c
View File

@ -760,7 +760,7 @@ void CL_PredictMovePNum (int pnum)
CL_CalcClientTime(); CL_CalcClientTime();
if (cl.intermission && cl.intermission != 3) if (cl.intermission && cl.intermission != 3 && cls.protocol == CP_QUAKEWORLD)
{ {
cl.crouch[pnum] = 0; cl.crouch[pnum] = 0;
return; return;
@ -823,7 +823,7 @@ void CL_PredictMovePNum (int pnum)
} }
if (((cl_nopred.value && cls.demoplayback!=DPB_MVD && cls.demoplayback != DPB_EZTV)|| cl.fixangle[pnum])) if (((cl_nopred.value && cls.demoplayback!=DPB_MVD && cls.demoplayback != DPB_EZTV)|| cl.fixangle[pnum] || cl.paused))
{ {
fixedorg: fixedorg:
VectorCopy (vel, cl.simvel[pnum]); VectorCopy (vel, cl.simvel[pnum]);