patch from div0 that fixes rate limiting code to make use of sv_maxrate (as it was...

[xonotic/darkplaces.git] / sv_user.c

diff --git a/sv_user.c b/sv_user.c
index 480c46a630ca853340bee51d33bf36f8f6819ff0..e8998013f46fc9468e3cb08d4cbd009f86566ed5 100644 (file)
--- a/sv_user.c
+++ b/sv_user.c
@@ -559,10 +559,14 @@ qboolean SV_ReadClientMove (void)
                {
                        double frametime = bound(0, move->time - oldmovetime, 0.1);
                        double oldframetime = prog->globals.server->frametime;
+                       double oldframetime2 = sv.frametime;
                        //if (move->time - oldmovetime >= 0.1001)
                        //      Con_DPrintf("client move exceeds 100ms!  (time %f -> time %f)\n", oldmovetime, move->time);
+                       // the server and qc frametime values must be changed temporarily
+                       sv.frametime = frametime;
                        prog->globals.server->frametime = frametime;
                        SV_Physics_ClientEntity(host_client->edict);
+                       sv.frametime = oldframetime2;
                        prog->globals.server->frametime = oldframetime;
                        host_client->clmovement_skipphysicsframes = sv_clmovement_waitforinput.integer;
                }
@@ -702,6 +706,7 @@ void SV_ReadClientMessage(void)
                         || strncasecmp(s, "pause", 5) == 0
                         || strncasecmp(s, "kick", 4) == 0
                         || strncasecmp(s, "ping", 4) == 0
+                        || strncasecmp(s, "pings", 5) == 0
                         || strncasecmp(s, "ban", 3) == 0
                         || strncasecmp(s, "pmodel", 6) == 0
                         || strncasecmp(s, "rate", 4) == 0