X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sv_user.c;h=e8998013f46fc9468e3cb08d4cbd009f86566ed5;hb=bf7fdc26371e2823650c8af6d78ef1e28513f7eb;hp=0cc8d24cf9060b9bdc2532a849c9983bc9d462d3;hpb=cb642c507a7bc68ddf0f021347372d7dbb1d76d5;p=xonotic%2Fdarkplaces.git

diff --git a/sv_user.c b/sv_user.c
index 0cc8d24c..e8998013 100644
--- a/sv_user.c
+++ b/sv_user.c
@@ -28,6 +28,10 @@ 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)"};
+cvar_t sv_clmovement_waitforinput = {0, "sv_clmovement_waitforinput", "2", "when a client does not send input for this many frames, force them to move anyway (unlike QuakeWorld)"};
 
 static usercmd_t cmd;
 
@@ -273,7 +277,7 @@ void SV_WaterMove (void)
 	speed = VectorLength(host_client->edict->fields.server->velocity);
 	if (speed)
 	{
-		newspeed = speed - sv.frametime * speed * sv_friction.value;
+		newspeed = speed - sv.frametime * speed * sv_waterfriction.value;
 		if (newspeed < 0)
 			newspeed = 0;
 		temp = newspeed/speed;
@@ -355,7 +359,7 @@ void SV_AirMove (void)
 		// noclip
 		VectorCopy (wishvel, host_client->edict->fields.server->velocity);
 	}
-	else if ( onground )
+	else if (onground && (!sv_gameplayfix_qwplayerphysics.integer || !(host_client->edict->fields.server->button2 || !((int)host_client->edict->fields.server->flags & FL_JUMPRELEASED))))
 	{
 		SV_UserFriction ();
 		SV_Accelerate ();
@@ -528,11 +532,17 @@ 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_disabletimeout = realtime + sv_clmovement_minping_disabletime.value / 1000.0;
+	if (!sv_clmovement_enable.integer || host_client->clmovement_disabletimeout > realtime)
+		move->sequence = 0;
+
 	if (!host_client->spawned)
 		memset(move, 0, sizeof(*move));
-	else if (move->time > (float)sv.time + 0.001f) // add a little fuzz factor due to float precision issues
+	else if (move->sequence && (float)move->time > (float)sv.time + 0.125f) // add a little fuzz factor due to float precision issues
 	{
-		Con_DPrintf("client move->time %f > sv.time %f, kicking\n", move->time, sv.time);
+		Con_DPrintf("client move->time %f > sv.time %f, kicking\n", (float)move->time, (float)sv.time);
 		// if the client is lying about time, we have definitively detected a
 		// speed cheat attempt of the worst sort, and we can immediately kick
 		// the offending player off.
@@ -545,15 +555,20 @@ qboolean SV_ReadClientMove (void)
 	{
 		// apply the latest accepted move to the entity fields
 		host_client->movesequence = move->sequence;
-		if (host_client->movesequence)
+		if (host_client->movesequence && sv_clmovement_waitforinput.integer > 0)
 		{
 			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;
 		}
 	}
 	return kickplayer;
@@ -691,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