X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_user.c;h=d880a87cc00570988897e9043c69a503056b29e5;hp=bf13b1f8e7b84acce82cb88fd5a59dda436918e5;hb=712073c2b82a8d7289ced8b7cf16535b6c5550b4;hpb=16dee271a7e503a49993c5f934aeb6eb45c19ae1

diff --git a/sv_user.c b/sv_user.c
index bf13b1f8..d880a87c 100644
--- a/sv_user.c
+++ b/sv_user.c
@@ -28,6 +28,9 @@ cvar_t sv_maxairspeed = {0, "sv_maxairspeed", "30", "maximum speed a player can
 cvar_t sv_accelerate = {0, "sv_accelerate", "10", "rate at which a player accelerates to sv_maxspeed"};
 cvar_t sv_airaccelerate = {0, "sv_airaccelerate", "-1", "rate at which a player accelerates to sv_maxairspeed while in the air, if less than 0 the sv_accelerate variable is used instead"};
 cvar_t sv_wateraccelerate = {0, "sv_wateraccelerate", "-1", "rate at which a player accelerates to sv_maxspeed while in the air, if less than 0 the sv_accelerate variable is used instead"};
+cvar_t sv_clmovement_enable = {0, "sv_clmovement_enable", "1", "whether to allow clients to use cl_movement prediction, which can cause choppy movement on the server which may annoy other players"};
+cvar_t sv_clmovement_minping = {0, "sv_clmovement_minping", "100", "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 = {0, "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)"};
 
 static usercmd_t cmd;
 
@@ -528,6 +531,12 @@ qboolean SV_ReadClientMove (void)
 		if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 	}
 
+	// disable clientside movement prediction in some cases
+	if (ceil((move->receivetime - move->time) * 1000.0) < sv_clmovement_minping.integer)
+		host_client->clmovement_disable_minpingtimeout = realtime + sv_clmovement_minping_disabletime.value / 1000.0;
+	if (!sv_clmovement_enable.integer || host_client->clmovement_disable_minpingtimeout > realtime)
+		move->sequence = 0;
+
 	if (!host_client->spawned)
 		memset(move, 0, sizeof(*move));
 	else if (move->sequence && (float)move->time > (float)sv.time + 0.125f) // add a little fuzz factor due to float precision issues