Commit: 272303b859971bbb4890f973d490f60752a0db8a - zatspg-beta (hg)

This is a fork of Zandronum Beta for TSPG.

Commit MetaInfo

• Révision: 272303b859971bbb4890f973d490f60752a0db8a (tree)
• l'heure: 2021-11-19 23:23:35
• Auteur: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Message de Log

Moved some code from P_Ticker over to SERVER_HandleSkipCorrection.

Change Summary

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

Modification

diff -r bef9a71cd25d -r 272303b85997 src/p_tick.cpp
--- a/src/p_tick.cpp	Mon Nov 22 09:32:33 2021 +1100
+++ b/src/p_tick.cpp	Fri Nov 19 09:23:35 2021 -0500
@@ -324,17 +324,9 @@
 					continue;
 
 				CLIENT_s *client = SERVER_GetClient( ulIdx );
-				ULONG ulNumMoveCMDs = 0;
-
-				// [AK] Count how many movement commands are inside the client's tic buffer.
-				for ( unsigned int i = 0; i < client->MoveCMDs.Size( ); i++ )
-				{
-					if ( client->MoveCMDs[i]->isMoveCmd( ))
-						ulNumMoveCMDs++;
-				}
 
 				// [AK] Handle the skip correction.
-				SERVER_HandleSkipCorrection( ulIdx, ulNumMoveCMDs );
+				SERVER_HandleSkipCorrection( ulIdx );
 
 				while ( client->MoveCMDs.Size( ) != 0 )
 				{

diff -r bef9a71cd25d -r 272303b85997 src/sv_main.cpp
--- a/src/sv_main.cpp	Mon Nov 22 09:32:33 2021 +1100
+++ b/src/sv_main.cpp	Fri Nov 19 09:23:35 2021 -0500
@@ -5407,9 +5407,10 @@
 
 //*****************************************************************************
 //
-void SERVER_HandleSkipCorrection( ULONG ulClient, ULONG ulNumMoveCMDs )
+void SERVER_HandleSkipCorrection( ULONG ulClient )
 {
 	CLIENT_s *pClient = &g_aClients[ulClient];
+	ULONG ulNumMoveCMDs = 0;
 	FString debugMessage;
 
 	// [AK] Don't handle the skip correction if it's supposed to be disabled.
@@ -5421,6 +5422,13 @@
 	if (( players[ulClient].mo == NULL ) || ( pClient->lLastMoveTickProcess == gametic ))
 		return;
 
+	// [AK] Count how many movement commands are inside the client's tic buffer.
+	for ( unsigned int i = 0; i < pClient->MoveCMDs.Size( ); i++ )
+	{
+		if ( pClient->MoveCMDs[i]->isMoveCmd( ))
+			ulNumMoveCMDs++;
+	}
+
 	// When a player is experiencing ping spikes or packet loss and we don't have any commands
 	// left in their buffer, we will try to predict where they will be for at least the next few tics
 	// until we start receiveing commands from them again. In case the player suffers from a ping spike, we

diff -r bef9a71cd25d -r 272303b85997 src/sv_main.h
--- a/src/sv_main.h	Mon Nov 22 09:32:33 2021 +1100
+++ b/src/sv_main.h	Fri Nov 19 09:23:35 2021 -0500
@@ -639,7 +639,7 @@
 void		SERVER_KillCheat( const char* what );
 void STACK_ARGS SERVER_PrintWarning( const char* format, ... ) GCCPRINTF( 1, 2 );
 void		SERVER_FlagsetChanged( FIntCVar& flagset, int maxflags = 2 );
-void		SERVER_HandleSkipCorrection( ULONG ulClient, ULONG ulNumMoveCMDs );
+void		SERVER_HandleSkipCorrection( ULONG ulClient );
 bool		SERVER_IsExtrapolatingPlayer( ULONG ulClient );
 bool		SERVER_IsBacktracingPlayer( ULONG ulClient );
 void		SERVER_ResetClientTicBuffer( ULONG ulClient );