added cl_nettimesyncmode 4, this is not the default, just another option to experimen...

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

diff --git a/cl_parse.c b/cl_parse.c
index eb33a388fdf413e19ef9e24485bd8ea5f7032b21..3ed64190095e5fa52d9eec27e9d9176a01a58c47 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -167,7 +167,7 @@ cvar_t cl_sound_ric3 = {0, "cl_sound_ric3", "weapons/ric3.wav", "sound to play w
 cvar_t cl_sound_r_exp3 = {0, "cl_sound_r_exp3", "weapons/r_exp3.wav", "sound to play during TE_EXPLOSION and related effects (empty cvar disables sound)"};
 cvar_t cl_serverextension_download = {0, "cl_serverextension_download", "0", "indicates whether the server supports the download command"};
 cvar_t cl_joinbeforedownloadsfinish = {0, "cl_joinbeforedownloadsfinish", "1", "if non-zero the game will begin after the map is loaded before other downloads finish"};
-cvar_t cl_nettimesyncmode = {0, "cl_nettimesyncmode", "2", "selects method of time synchronization in client with regard to server packets, values are: 0 = no sync, 1 = exact sync (reset timing each packet), 2 = loose sync (reset timing only if it is out of bounds), 3 = tight sync and bounding"};
+cvar_t cl_nettimesyncmode = {0, "cl_nettimesyncmode", "2", "selects method of time synchronization in client with regard to server packets, values are: 0 = no sync, 1 = exact sync (reset timing each packet), 2 = loose sync (reset timing only if it is out of bounds), 3 = tight sync and bounding, 4 = bounded loose sync (reset if significantly wrong, otherwise bound)"};
 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"};
 
 static qboolean QW_CL_CheckOrDownloadFile(const char *filename);
@@ -2785,6 +2785,14 @@ static void CL_NetworkTimeReceived(double newtime)
                        if (cl.time < cl.mtime[1] || cl.time > cl.mtime[0] + (cl.mtime[0] - cl.mtime[1]))
                                cl.time = cl.mtime[1];
                }
+               else if (cl_nettimesyncmode.integer == 4)
+               {
+                       // if it's significantly out of bounds, reset it to cl.mtime[1]
+                       if (cl.time > cl.mtime[0] + (cl.mtime[0] - cl.mtime[1]))
+                               cl.time = cl.mtime[1];
+                       // clamp it to the valid range
+                       cl.time = bound(cl.mtime[1], cl.time, cl.mtime[0]);
+               }
                else if (cl_nettimesyncmode.integer)
                        cl.time = cl.mtime[1];
        }