From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 14 Sep 2009 05:22:44 +0000 (+0000)
Subject: tightly sync time if cl_nolerp is on
X-Git-Tag: xonotic-v0.1.0preview~1441
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e2322721de8d748c479e6b759826f5d98abe7040;p=xonotic%2Fdarkplaces.git

tightly sync time if cl_nolerp is on


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9191 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/cl_parse.c b/cl_parse.c
index ce231f0d..a9f82d27 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -3112,7 +3112,7 @@ static void CL_NetworkTimeReceived(double newtime)
 	double timehigh;
 	cl.mtime[1] = cl.mtime[0];
 	cl.mtime[0] = newtime;
-	if (cls.timedemo || (cl.islocalgame && !sv_fixedframeratesingleplayer.integer) || cl.mtime[1] == cl.mtime[0] || cls.signon < SIGNONS)
+	if (cl_nolerp.integer || cls.timedemo || (cl.islocalgame && !sv_fixedframeratesingleplayer.integer) || cl.mtime[1] == cl.mtime[0] || cls.signon < SIGNONS)
 		cl.time = cl.mtime[1] = newtime;
 	else if (cls.demoplayback)
 	{