From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 23 Feb 2006 10:47:09 +0000 (+0000)
Subject: make cl_movement handling a little more robust (hopefully)
X-Git-Tag: xonotic-v0.1.0preview~4299
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2567e3f2ba76e6baa9dcffd22122866b2d9e4e1d;p=xonotic%2Fdarkplaces.git

make cl_movement handling a little more robust (hopefully)


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

diff --git a/sv_user.c b/sv_user.c
index 2c148e85..d2fafa04 100644
--- a/sv_user.c
+++ b/sv_user.c
@@ -685,7 +685,7 @@ qboolean SV_ReadClientMove (void)
 
 	if (!host_client->spawned)
 		memset(move, 0, sizeof(*move));
-	else if (move->time > sv.time + 0.01) // add a little fuzz factor due to float precision issues
+	else if (move->time > (float)sv.time + 0.001f) // add a little fuzz factor due to float precision issues
 	{
 		Con_DPrintf("client move->time %f > sv.time %f, kicking\n", move->time, sv.time);
 		// if the client is lying about time, we have definitively detected a
@@ -702,10 +702,10 @@ qboolean SV_ReadClientMove (void)
 		host_client->movesequence = move->sequence;
 		if (host_client->movesequence)
 		{
-			double frametime = move->time - oldmovetime;
+			double frametime = bound(0, move->time - oldmovetime, 0.1);
 			double oldframetime = prog->globals.server->frametime;
-			if (frametime > 0.1)
-				frametime = 0.1;
+			//if (move->time - oldmovetime >= 0.1001)
+			//	Con_DPrintf("client move exceeds 100ms!  (time %f -> time %f)\n", oldmovetime, move->time);
 			prog->globals.server->frametime = frametime;
 			SV_Physics_ClientEntity(host_client->edict);
 			prog->globals.server->frametime = oldframetime;