Commit: 4bb3026890ef34e60a16feae33eee6e0b3f4d1b0 - zandronum-tspg (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG).

Commit MetaInfo

• Revision: 4bb3026890ef34e60a16feae33eee6e0b3f4d1b0 (tree)
• Time: 2021-07-18 13:48:16
• Author: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Changed some of the skip correction code.

Change Summary

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

Incremental Difference

diff -r 232b5f652798 -r 4bb3026890ef src/p_tick.cpp
--- a/src/p_tick.cpp	Sat Jul 17 23:56:55 2021 -0400
+++ b/src/p_tick.cpp	Sun Jul 18 00:48:16 2021 -0400
@@ -411,6 +411,15 @@
 					const bool bMovement = client->MoveCMDs[0]->isMoveCmd( );
 					client->MoveCMDs[0]->process( ulIdx );
 
+					if ( bMovement )
+					{
+						if ( client->LastMoveCMD != NULL )
+							delete client->LastMoveCMD;
+
+						// [AK] This becomes the last movement command we received from the client.
+						client->LastMoveCMD = new ClientMoveCommand( *static_cast<ClientMoveCommand *>( client->MoveCMDs[0] ));
+					}
+
 					delete client->MoveCMDs[0];
 					client->MoveCMDs.Delete(0);
 

diff -r 232b5f652798 -r 4bb3026890ef src/sv_main.cpp
--- a/src/sv_main.cpp	Sat Jul 17 23:56:55 2021 -0400
+++ b/src/sv_main.cpp	Sun Jul 18 00:48:16 2021 -0400
@@ -5088,25 +5088,18 @@
 	{
 		if (( sv_smoothplayers ) && ( cmd->isMoveCmd( )))
 		{
-			ULONG ulNewClientTic = cmd->getClientTic( );
-
 			// [AK] It's possible this was a command that arrived late and we already extrapolated
 			// the player's movement at this tic. In this case, we'll store these commands into a
 			// separate buffer so we can backtrace the player's actual movement.
-			if ( g_aClients[g_lCurrentClient].LastMoveCMD != NULL )
+			if (( g_aClients[g_lCurrentClient].LastMoveCMD != NULL ) && ( g_aClients[g_lCurrentClient].ulExtrapolatedTics > 0 ))
 			{
 				ULONG ulMaxClientTic = g_aClients[g_lCurrentClient].LastMoveCMD->getClientTic( ) + g_aClients[g_lCurrentClient].ulExtrapolatedTics;
 
 				// [AK] We want to try filling this buffer only when the client is suffering from a ping
 				// spike, not when they're experiencing packet loss.
-				if (( ulNewClientTic < ulMaxClientTic ) || (( g_aClients[g_lCurrentClient].ulExtrapolatedTics > 1 ) && ( ulNewClientTic == ulMaxClientTic )))
+				if ( cmd->getClientTic( ) <= ulMaxClientTic )
 					buffer = &g_aClients[g_lCurrentClient].LateMoveCMDs;
-
-				delete g_aClients[g_lCurrentClient].LastMoveCMD;
 			}
-
-			// [AK] This becomes the last movement command we received from the client.
-			g_aClients[g_lCurrentClient].LastMoveCMD = new CommandType( *cmd );
 		}
 
 		buffer->Push( cmd );