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

diff --git a/sv_user.c b/sv_user.c
index 0cc8d24c..407428a9 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 ();
@@ -456,7 +460,7 @@ qboolean SV_ReadClientMove (void)
 		move->sequence = MSG_ReadLong ();
 	move->time = MSG_ReadFloat ();
 	if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
-	move->receivetime = sv.time;
+	move->receivetime = (float)sv.time;
 
 	// calculate average ping time
 	host_client->ping = move->receivetime - move->time;
@@ -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;
@@ -629,9 +644,10 @@ SV_ReadClientMessage
 ===================
 */
 extern void SV_SendServerinfo(client_t *client);
+extern sizebuf_t vm_tempstringsbuf;
 void SV_ReadClientMessage(void)
 {
-	int cmd, num;
+	int cmd, num, start;
 	char *s;
 
 	//MSG_BeginReading ();
@@ -677,30 +693,15 @@ void SV_ReadClientMessage(void)
 				Cmd_ExecuteString (s, src_client);
 			else if (SV_ParseClientCommandQC)
 			{
-				PRVM_G_INT(OFS_PARM0) = PRVM_SetEngineString(s);
+				int restorevm_tempstringsbuf_cursize;
+				restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize;
+				PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(s);
 				prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
 				PRVM_ExecuteProgram ((func_t)(SV_ParseClientCommandQC - prog->functions), "QC function SV_ParseClientCommand is missing");
+				vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 			}
-			else if (strncasecmp(s, "status", 6) == 0
-			 || strncasecmp(s, "name", 4) == 0
-			 || strncasecmp(s, "say", 3) == 0
-			 || strncasecmp(s, "say_team", 8) == 0
-			 || strncasecmp(s, "tell", 4) == 0
-			 || strncasecmp(s, "color", 5) == 0
-			 || strncasecmp(s, "kill", 4) == 0
-			 || strncasecmp(s, "pause", 5) == 0
-			 || strncasecmp(s, "kick", 4) == 0
-			 || strncasecmp(s, "ping", 4) == 0
-			 || strncasecmp(s, "ban", 3) == 0
-			 || strncasecmp(s, "pmodel", 6) == 0
-			 || strncasecmp(s, "rate", 4) == 0
-			 || strncasecmp(s, "playermodel", 11) == 0
-			 || strncasecmp(s, "playerskin", 10) == 0
-			 || (gamemode == GAME_NEHAHRA && (strncasecmp(s, "max", 3) == 0 || strncasecmp(s, "monster", 7) == 0 || strncasecmp(s, "scrag", 5) == 0 || strncasecmp(s, "gimme", 5) == 0 || strncasecmp(s, "wraith", 6) == 0))
-			 || (gamemode != GAME_NEHAHRA && (strncasecmp(s, "god", 3) == 0 || strncasecmp(s, "notarget", 8) == 0 || strncasecmp(s, "fly", 3) == 0 || strncasecmp(s, "give", 4) == 0 || strncasecmp(s, "noclip", 6) == 0)))
-				Cmd_ExecuteString (s, src_client);
 			else
-				Con_Printf("%s tried to %s\n", host_client->name, s);
+				Cmd_ExecuteString (s, src_client);
 			break;
 
 		case clc_disconnect:
@@ -713,6 +714,58 @@ void SV_ReadClientMessage(void)
 				SV_DropClient (false);
 			break;
 
+		case clc_ackdownloaddata:
+			start = MSG_ReadLong();
+			num = MSG_ReadShort();
+			if (host_client->download_file && host_client->download_started)
+			{
+				if (host_client->download_expectedposition == start)
+				{
+					int size = (int)FS_FileSize(host_client->download_file);
+					// a data block was successfully received by the client,
+					// update the expected position on the next data block
+					host_client->download_expectedposition = start + num;
+					// if this was the last data block of the file, it's done
+					if (host_client->download_expectedposition >= FS_FileSize(host_client->download_file))
+					{
+						// tell the client that the download finished
+						// we need to calculate the crc now
+						//
+						// note: at this point the OS probably has the file
+						// entirely in memory, so this is a faster operation
+						// now than it was when the download started.
+						//
+						// it is also preferable to do this at the end of the
+						// download rather than the start because it reduces
+						// potential for Denial Of Service attacks against the
+						// server.
+						int crc;
+						unsigned char *temp;
+						FS_Seek(host_client->download_file, 0, SEEK_SET);
+						temp = Mem_Alloc(tempmempool, size);
+						FS_Read(host_client->download_file, temp, size);
+						crc = CRC_Block(temp, size);
+						Mem_Free(temp);
+						// calculated crc, send the file info to the client
+						// (so that it can verify the data)
+						Host_ClientCommands(va("\ncl_downloadfinished %i %i %s\n", size, crc, host_client->download_name));
+						Con_DPrintf("Download of %s by %s has finished\n", host_client->download_name, host_client->name);
+						FS_Close(host_client->download_file);
+						host_client->download_file = NULL;
+						host_client->download_name[0] = 0;
+						host_client->download_expectedposition = 0;
+						host_client->download_started = false;
+					}
+				}
+				else
+				{
+					// a data block was lost, reset to the expected position
+					// and resume sending from there
+					FS_Seek(host_client->download_file, host_client->download_expectedposition, SEEK_SET);
+				}
+			}
+			break;
+
 		case clc_ackframe:
 			if (msg_badread) Con_Printf("SV_ReadClientMessage: badread at %s:%i\n", __FILE__, __LINE__);
 			num = MSG_ReadLong();