From a9ff7b962e2757b37d8b9624d7101d5add037083 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Sun, 28 Nov 2010 19:19:06 +0000
Subject: [PATCH] Client improvements for NQ support.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3678 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/cl_ents.c | 5 ++---
 engine/client/cl_main.c | 3 ++-
 engine/client/cl_pred.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/engine/client/cl_ents.c b/engine/client/cl_ents.c
index 0a35afef4..b05c5230d 100644
--- a/engine/client/cl_ents.c
+++ b/engine/client/cl_ents.c
@@ -1004,6 +1004,8 @@ void CLNQ_ParseEntity(unsigned int bits)
 
 	state->number = num;
 
+	state->dpflags = (bits & NQU_NOLERP)?RENDER_STEP:0;
+
 	if (bits & NQU_MODEL)
 		state->modelindex = MSG_ReadByte ();
 	else
@@ -1746,9 +1748,6 @@ void CL_LinkPacketEntities (void)
 			servertime = realtime;
 
 		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);
 	if (!pack)
diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index 3fc0be762..55dec5b45 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -1207,6 +1207,7 @@ void CL_Disconnect (void)
 	cl.spectator = 0;
 	cl.sendprespawn = false;
 	cl.intermission = 0;
+	cl.oldgametime = 0;
 
 #ifdef NQPROT
 	cls.signon=0;
@@ -2004,7 +2005,7 @@ void CL_Reconnect_f (void)
 	if (cls.downloadqw)  // don't change when downloading
 		return;
 #ifdef NQPROT
-	if (cls.protocol == CP_NETQUAKE)
+	if (cls.protocol == CP_NETQUAKE && Cmd_FromGamecode())
 	{
 		CL_Changing_f();
 		return;
diff --git a/engine/client/cl_pred.c b/engine/client/cl_pred.c
index 34b136d59..fc932b69c 100644
--- a/engine/client/cl_pred.c
+++ b/engine/client/cl_pred.c
@@ -760,7 +760,7 @@ void CL_PredictMovePNum (int pnum)
 
 	CL_CalcClientTime();
 
-	if (cl.intermission && cl.intermission != 3)
+	if (cl.intermission && cl.intermission != 3 && cls.protocol == CP_QUAKEWORLD)
 	{
 		cl.crouch[pnum] = 0;
 		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:
 		VectorCopy (vel, cl.simvel[pnum]);