test a

diff --git a/server.h b/server.h
index 503d1b146aac2320fea96c8f8bfeebda599d5bad..79fce3b1e87d1b7372cb98a9dcc2899d2f09fed0 100644 (file)
--- a/server.h
+++ b/server.h
@@ -421,6 +421,7 @@ extern cvar_t sv_clmovement_enable;
 extern cvar_t sv_clmovement_minping;
 extern cvar_t sv_clmovement_minping_disabletime;
 extern cvar_t sv_clmovement_inputtimeout;
+extern cvar_t sv_clmovement_inputtimeout_strict;
 extern cvar_t sv_clmovement_maxnetfps;
 extern cvar_t sv_cullentities_nevercullbmodels;
 extern cvar_t sv_cullentities_pvs;

diff --git a/sv_main.c b/sv_main.c
index ea6cce396b6cec932f255446b12e5c926fb9ff8b..107551c4f714aa34dcad2efc2f104c6496d70a40 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -77,6 +77,7 @@ cvar_t sv_clmovement_enable = {CF_SERVER, "sv_clmovement_enable", "1", "whether
 cvar_t sv_clmovement_minping = {CF_SERVER, "sv_clmovement_minping", "0", "if client ping is below this time in milliseconds, then their ability to use cl_movement prediction is disabled for a while (as they don't need it)"};
 cvar_t sv_clmovement_minping_disabletime = {CF_SERVER, "sv_clmovement_minping_disabletime", "1000", "when client falls below minping, disable their prediction for this many milliseconds (should be at least 1000 or else their prediction may turn on/off frequently)"};
 cvar_t sv_clmovement_inputtimeout = {CF_SERVER, "sv_clmovement_inputtimeout", "0.1", "when a client does not send input for this many seconds (max 0.1), force them to move anyway (unlike QuakeWorld)"};
+cvar_t sv_clmovement_inputtimeout_strict = {CF_SERVER, "sv_clmovement_inputtimeout_strict", "1", "prevent lagaporting (in other players' perspectives) and speeding up (in lagging player's perspective) when inputtimeout is exceeded"};
 cvar_t sv_cullentities_nevercullbmodels = {CF_SERVER, "sv_cullentities_nevercullbmodels", "0", "if enabled the clients are always notified of moving doors and lifts and other submodels of world (warning: eats a lot of network bandwidth on some levels!)"};
 cvar_t sv_cullentities_pvs = {CF_SERVER, "sv_cullentities_pvs", "1", "fast but loose culling of hidden entities"};
 cvar_t sv_cullentities_stats = {CF_SERVER, "sv_cullentities_stats", "0", "displays stats on network entities culled by various methods for each client"};
@@ -575,6 +576,7 @@ void SV_Init (void)
        Cvar_RegisterVariable (&sv_clmovement_minping);
        Cvar_RegisterVariable (&sv_clmovement_minping_disabletime);
        Cvar_RegisterVariable (&sv_clmovement_inputtimeout);
+       Cvar_RegisterVariable (&sv_clmovement_inputtimeout_strict);
        Cvar_RegisterVariable (&sv_cullentities_nevercullbmodels);
        Cvar_RegisterVariable (&sv_cullentities_pvs);
        Cvar_RegisterVariable (&sv_cullentities_stats);

diff --git a/sv_phys.c b/sv_phys.c
index a72a7ca6acf5b8a0142c5df48bc506834fb4635c..41fc614607226b7aa254f0bf35c7136074f31456 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -3062,8 +3062,18 @@ static void SV_Physics_ClientEntity_PostThink(prvm_edict_t *ent)
        // synchronous physics
        if (host_client->clmovement_inputtimeout > sv.frametime)
                host_client->clmovement_inputtimeout -= sv.frametime;
-       else
-               host_client->clmovement_inputtimeout = 0;
+       else if (host_client->clmovement_inputtimeout > 0)
+               host_client->clmovement_inputtimeout = -666; // sync phys next frame if no moves by then
+       else if (host_client->clmovement_inputtimeout == -666)
+       {
+               // bones_was_here: sync physics ran this frame due to expired inputtimeout,
+               // so advance cmd.time to prevent warping caused by running sync AND async physics
+               if (sv_clmovement_inputtimeout_strict.integer)
+                       host_client->cmd.time = min(host_client->cmd.time + sv.frametime, sv.time);
+
+               // show that this cl_movement client has a connection problem
+               host_client->ping += sv.frametime;
+       }
 }
 
 static void SV_Physics_ClientEntity(prvm_edict_t *ent)