From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 18 Apr 2007 09:17:33 +0000 (+0000)
Subject: added cl_nettimesyncboundmode 5 which is div0's slight refinement of 4
X-Git-Tag: xonotic-v0.1.0preview~3304
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=db0bd7d8c664ab4a5b1088a683e9f1eebb3f0ac5;p=xonotic%2Fdarkplaces.git

added cl_nettimesyncboundmode 5 which is div0's slight refinement of 4


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

diff --git a/cl_parse.c b/cl_parse.c
index 13bdccbc..bc497bcf 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -168,7 +168,7 @@ cvar_t cl_sound_r_exp3 = {0, "cl_sound_r_exp3", "weapons/r_exp3.wav", "sound to
 cvar_t cl_serverextension_download = {0, "cl_serverextension_download", "0", "indicates whether the server supports the download command"};
 cvar_t cl_joinbeforedownloadsfinish = {CVAR_SAVE, "cl_joinbeforedownloadsfinish", "1", "if non-zero the game will begin after the map is loaded before other downloads finish"};
 cvar_t cl_nettimesyncfactor = {CVAR_SAVE, "cl_nettimesyncfactor", "0", "rate at which client time adapts to match server time, 1 = instantly, 0.125 = slowly, 0 = not at all (bounding still applies)"};
-cvar_t cl_nettimesyncboundmode = {CVAR_SAVE, "cl_nettimesyncboundmode", "4", "method of restricting client time to valid values, 0 = no correction, 1 = tight bounding (jerky with packet loss), 2 = loose bounding (corrects it if out of bounds), 3 = leniant bounding (ignores temporary errors due to varying framerate), 4 = slow adjustment method from Quake3"};
+cvar_t cl_nettimesyncboundmode = {CVAR_SAVE, "cl_nettimesyncboundmode", "5", "method of restricting client time to valid values, 0 = no correction, 1 = tight bounding (jerky with packet loss), 2 = loose bounding (corrects it if out of bounds), 3 = leniant bounding (ignores temporary errors due to varying framerate), 4 = slow adjustment method from Quake3, 5 = slightly nicer version of Quake3 method"};
 cvar_t cl_nettimesyncboundtolerance = {CVAR_SAVE, "cl_nettimesyncboundtolerance", "0.25", "how much error is tolerated by bounding check, as a fraction of frametime, 0.25 = up to 25% margin of error tolerated, 1 = use only new time, 0 = use only old time (same effect as setting cl_nettimesyncfactor to 1)"};
 cvar_t cl_iplog_name = {CVAR_SAVE, "cl_iplog_name", "darkplaces_iplog.txt", "name of iplog file containing player addresses for iplog_list command and automatic ip logging when parsing status command"};
 
@@ -2809,6 +2809,15 @@ static void CL_NetworkTimeReceived(double newtime)
 			else
 				cl.time += 0.001 * slowmo.value; // creep forward 1ms
 		}
+		else if (cl_nettimesyncboundmode.integer == 5)
+		{
+			if (fabs(cl.time - cl.mtime[1]) > 0.5)
+				cl.time = cl.mtime[1]; // reset
+			else if (fabs(cl.time - cl.mtime[1]) > 0.1)
+				cl.time += 0.5 * (cl.mtime[1] - cl.time); // fast
+			else
+				cl.time = bound(cl.time - 0.002 * slowmo.value, cl.mtime[1], cl.time + 0.001 * slowmo.value); // slow adjust
+		}
 	}
 	// this packet probably contains a player entity update, so we will need
 	// to update the prediction