Commit: 47147ff6a81e1cefcc588d216e4575897f124e2b - zatspg-beta (hg)

This is a fork of Zandronum Beta for TSPG.

Commit MetaInfo

• Révision: 47147ff6a81e1cefcc588d216e4575897f124e2b (tree)
• l'heure: 2021-11-19 09:26:31
• Auteur: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Message de Log

Backed out changeset: efc0e1e15b4b
Removes: "Have the server notify the clients about any changes to the skip correction's settings."

Change Summary

• modified: src/cl_main.cpp
• modified: src/network_enums.h
• modified: src/sv_commands.cpp
• modified: src/sv_commands.h
• modified: src/sv_main.cpp
• modified: src/sv_main.h

Modification

diff -r 35bec45566a7 -r 47147ff6a81e src/cl_main.cpp
--- a/src/cl_main.cpp	Wed Nov 17 09:37:40 2021 -0500
+++ b/src/cl_main.cpp	Thu Nov 18 19:26:31 2021 -0500
@@ -2338,24 +2338,6 @@
 				}
 				break;
 
-			case SVC2_SYNCSKIPCORRECTIONINFO:
-				{
-					UCVarValue	Value;
-
-					// Read in and set the value for sv_smoothplayers.
-					Value.Bool = pByteStream->ReadBit();
-					sv_smoothplayers.ForceSet( Value, CVAR_Bool );
-
-					// Read in and set the value for sv_extrapolatetics.
-					Value.Int = pByteStream->ReadShortByte( 7 );
-					sv_extrapolatetics.ForceSet( Value, CVAR_Int );
-
-					// Read in and set the value for sv_backtracethreshold.
-					Value.Float = pByteStream->ReadFloat();
-					sv_backtracethreshold.ForceSet( Value, CVAR_Float );
-				}
-				break;
-
 			default:
 				sprintf( szString, "CLIENT_ParsePacket: Illegible server message: %d\nLast command: %d\n", static_cast<int> (lExtCommand), static_cast<int> (g_lLastCmd) );
 				CLIENT_QuitNetworkGame( szString );

diff -r 35bec45566a7 -r 47147ff6a81e src/network_enums.h
--- a/src/network_enums.h	Wed Nov 17 09:37:40 2021 -0500
+++ b/src/network_enums.h	Thu Nov 18 19:26:31 2021 -0500
@@ -373,7 +373,6 @@
 	ENUM_ELEMENT ( SVC2_SYNCMAPROTATION ),
 	ENUM_ELEMENT ( SVC2_UPDATEMAPROTATION ),
 	ENUM_ELEMENT ( SVC2_STOPALLSOUNDSONTHING ),
-	ENUM_ELEMENT ( SVC2_SYNCSKIPCORRECTIONINFO ),
 	// [BB] Commands necessary for the account system.
 	ENUM_ELEMENT ( SVC2_SRP_USER_START_AUTHENTICATION ),
 	ENUM_ELEMENT ( SVC2_SRP_USER_PROCESS_CHALLENGE ),

diff -r 35bec45566a7 -r 47147ff6a81e src/sv_commands.cpp
--- a/src/sv_commands.cpp	Wed Nov 17 09:37:40 2021 -0500
+++ b/src/sv_commands.cpp	Thu Nov 18 19:26:31 2021 -0500
@@ -5082,17 +5082,6 @@
 }
 
 //*****************************************************************************
-// [AK]
-void SERVERCOMMANDS_SyncSkipCorrectionInfo( ULONG ulPlayerExtra, ServerCommandFlags flags )
-{
-	NetCommand command ( SVC2_SYNCSKIPCORRECTIONINFO );
-	command.addBit( sv_smoothplayers );
-	command.addShortByte( sv_extrapolatetics, 7 );
-	command.addFloat( sv_backtracethreshold );
-	command.sendCommandToClients( ulPlayerExtra, flags );
-}
-
-//*****************************************************************************
 void APathFollower::SyncWithClient ( const ULONG ulClient )
 {
 	if ( !EnsureActorHasNetID (this) )

diff -r 35bec45566a7 -r 47147ff6a81e src/sv_commands.h
--- a/src/sv_commands.h	Wed Nov 17 09:37:40 2021 -0500
+++ b/src/sv_commands.h	Thu Nov 18 19:26:31 2021 -0500
@@ -435,6 +435,5 @@
 void	SERVERCOMMANDS_AddToMapRotation( const char *pszMapName, int position, ULONG ulMinPlayers, ULONG ulMaxPlayers, ULONG ulPlayerExtra = MAXPLAYERS, ServerCommandFlags flags = 0 );
 void	SERVERCOMMANDS_DelFromMapRotation( const char *pszMapName, bool bClear = false, ULONG ulPlayerExtra = MAXPLAYERS, ServerCommandFlags flags = 0 );
 void	SERVERCOMMANDS_ResetMapRotation( ULONG ulPlayerExtra = MAXPLAYERS, ServerCommandFlags flags = 0 );
-void	SERVERCOMMANDS_SyncSkipCorrectionInfo( ULONG ulPlayerExtra = MAXPLAYERS, ServerCommandFlags flags = 0 );
 
 #endif	// __SV_COMMANDS_H__

diff -r 35bec45566a7 -r 47147ff6a81e src/sv_main.cpp
--- a/src/sv_main.cpp	Wed Nov 17 09:37:40 2021 -0500
+++ b/src/sv_main.cpp	Thu Nov 18 19:26:31 2021 -0500
@@ -315,9 +315,6 @@
 
 			SERVER_Printf( "Skip correction %s.\n", self ? "enabled" : "disabled" );
 			bOldValue = self;
-
-			// [AK] Notify the clients about any changes to the skip correction's settings.
-			SERVERCOMMANDS_SyncSkipCorrectionInfo( );
 		}
 	}
 }
@@ -337,10 +334,6 @@
 		Printf( "A player's movement can only be extrapolated for up to 7 tics.\n" );
 		self = 7;
 	}
-
-	// [AK] Notify the clients about any changes to the skip correction's settings.
-	if ( NETWORK_GetState( ) == NETSTATE_SERVER )
-		SERVERCOMMANDS_SyncSkipCorrectionInfo( );
 }
 
 //*****************************************************************************
@@ -357,10 +350,6 @@
 		Printf( "The maximum threshold is 96 map units.\n" );
 		self = 96.0f;
 	}
-
-	// [AK] Notify the clients about any changes to the skip correction's settings.
-	if ( NETWORK_GetState( ) == NETSTATE_SERVER )
-		SERVERCOMMANDS_SyncSkipCorrectionInfo( );
 }
 
 //*****************************************************************************
@@ -1525,9 +1514,6 @@
 	// [AK] Send the name of the server.
 	SERVERCOMMANDS_SetCVar( sv_hostname, g_lCurrentClient, SVCF_ONLYTHISCLIENT );
 
-	// [AK] Send the current state of the skip correction.
-	SERVERCOMMANDS_SyncSkipCorrectionInfo( g_lCurrentClient, SVCF_ONLYTHISCLIENT );
-
 	// Send dmflags.
 	SERVERCOMMANDS_SetGameDMFlags( g_lCurrentClient, SVCF_ONLYTHISCLIENT );
 

diff -r 35bec45566a7 -r 47147ff6a81e src/sv_main.h
--- a/src/sv_main.h	Wed Nov 17 09:37:40 2021 -0500
+++ b/src/sv_main.h	Thu Nov 18 19:26:31 2021 -0500
@@ -703,7 +703,6 @@
 EXTERN_CVAR( Bool, sv_limitcommands )
 EXTERN_CVAR( Bool, sv_smoothplayers )
 EXTERN_CVAR( Int, sv_extrapolatetics )
-EXTERN_CVAR( Float, sv_backtracethreshold )
 EXTERN_CVAR( Int, sv_allowprivatechat )
 
 // From sv_master.cpp