From ae54e4712f66c8996a1544294896cda347d6077a Mon Sep 17 00:00:00 2001
From: TimeServ <timeserv@users.sourceforge.net>
Date: Wed, 16 Jan 2008 06:36:24 +0000
Subject: [PATCH] surround netquake stuff around NQPROT defines so minimal GL
 can build

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2863 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/cl_ents.c |  7 ++++++-
 engine/client/cl_pred.c | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/engine/client/cl_ents.c b/engine/client/cl_ents.c
index 40099629..4686208d 100644
--- a/engine/client/cl_ents.c
+++ b/engine/client/cl_ents.c
@@ -1542,13 +1542,18 @@ void CL_LinkPacketEntities (void)
 	dlight_t			*dl;
 	vec3_t				angles;
 	int flicker;
+	qboolean nolerp;
 
 	float servertime;
 
 	CL_CalcClientTime();
 	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)
 		return;
 
diff --git a/engine/client/cl_pred.c b/engine/client/cl_pred.c
index 85ed2224..71f26532 100644
--- a/engine/client/cl_pred.c
+++ b/engine/client/cl_pred.c
@@ -544,9 +544,14 @@ static void CL_LerpMove (int pnum, float msgtime)
 	int		i;
 	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;
 
+#ifdef NQPROT
+	if (cls.demoplayback == DPB_NETQUAKE)
+		return;
+#endif
+
 	if (cls.netchan.outgoing_sequence < lastsequence) {
 		// reset
 		lastsequence = -1;
@@ -725,10 +730,12 @@ void CL_PredictMovePNum (int pnum)
 		return;
 	}
 
+#ifdef NQPROT
 	if (cls.demoplayback == DPB_NETQUAKE)
 	{
 		cl.ackedinputsequence = cls.netchan.outgoing_sequence;
 	}
+#endif
 
 	if (!cl.ackedinputsequence)
 	{
@@ -820,7 +827,11 @@ fixedorg:
 
 	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)
+#else
+	if (Cam_TrackNum(pnum)>=0 && !cl_nolerp.value && cls.demoplayback != DPB_MVD && cls.demoplayback != DPB_EZTV)
+#endif
 	{
 		float f;