Commit: bc71b20f4906d81e64102dcc86962b8de5846737 - zatspg-beta (hg)

This is a fork of Zandronum Beta for TSPG.

Commit MetaInfo

• Révision: bc71b20f4906d81e64102dcc86962b8de5846737 (tree)
• l'heure: 2021-11-22 07:23:55
• Auteur: Joshua Surace <doomjoshuaboy@live...>
• Commiter: Joshua Surace

Message de Log

Backed out changeset: 22b486393cf7
Removes: "Increase the client's ping proportionally to the number of expected backup commands."

Change Summary

• modified: src/sv_main.cpp
• modified: src/sv_main.h

Modification

diff -r ed48c3edd000 -r bc71b20f4906 src/sv_main.cpp
--- a/src/sv_main.cpp	Fri Nov 19 07:39:38 2021 -0500
+++ b/src/sv_main.cpp	Mon Nov 22 09:23:55 2021 +1100
@@ -2119,7 +2119,6 @@
 	g_aClients[lClient].IgnoredAddresses.clear();
 	g_aClients[lClient].ScreenWidth = 0;
 	g_aClients[lClient].ScreenHeight = 0;
-	g_aClients[lClient].ulExtraDelay = 0;
 	g_aClients[lClient].ulClientGameTic = 0;
 	// [CK] Since the client is not up to date at all, the farthest the client
 	// should be able to go back is the gametic they connected with.
@@ -6239,27 +6238,12 @@
 	}
 	else
 	{
-		// [AK] Adjust the client's old ping based on the extra delay there is due to them sending us backup
-		// commands. We must do this so that the ping calculation below produces a consistent result.
-		ULONG oldPing = p->ulPing - g_aClients[g_lCurrentClient].ulExtraDelay;
-
-		p->ulPing = ( p->ulPingAverages * oldPing + currentPing ) / ( 1 + p->ulPingAverages );
+		ULONG oldPing = p->ulPing;
+		ULONG ulPingAverages = p->ulPingAverages;
+		p->ulPing = ( p->ulPingAverages * p->ulPing + currentPing ) / ( 1 + p->ulPingAverages );
 		// [BB] The most recent ping measurement should always have a noticeable influence on the average ping.
 		if ( p->ulPingAverages < 20 )
 			p->ulPingAverages++;
-
-		// [AK] If the client is sending us backup commands, we always have to delay their input enough so that
-		// we get all the commands at the right time. Therefore, we also increase the client's ping proportionally
-		// to the number of expected backup commands to indicate this delay to everyone.
-		if (( p->bSpectating == false ) && ( g_aClients[g_lCurrentClient].ulNumExpectedCMDs > 1 ))
-		{
-			g_aClients[g_lCurrentClient].ulExtraDelay = ( g_aClients[g_lCurrentClient].ulNumExpectedCMDs - 1 ) * ticLength;
-			p->ulPing += g_aClients[g_lCurrentClient].ulExtraDelay;
-		}
-		else
-		{
-			g_aClients[g_lCurrentClient].ulExtraDelay = 0;
-		}
 	}
 
 	return ( false );

diff -r ed48c3edd000 -r bc71b20f4906 src/sv_main.h
--- a/src/sv_main.h	Fri Nov 19 07:39:38 2021 -0500
+++ b/src/sv_main.h	Mon Nov 22 09:23:55 2021 +1100
@@ -480,10 +480,6 @@
 	// means we're expecting them to also send us backups of older commands.
 	ULONG			ulNumExpectedCMDs;
 
-	// [AK] How much artificial delay there is in the client's inputs due to them sending us backup commands.
-	// Each backup command received per tic delays the client's ping by ~29 ms.
-	ULONG			ulExtraDelay;
-
 	// [AK] A list of specials this player executed while being extrapolated.
 	TArray<CLIENT_SAVED_SPECIAL_s>	ExtrapolatedSpecials;