提交: 6cbfdc124b0578e0526c898990e28ac67ab3a84e - zandronum-macos-beta (hg)

This is a fork of Zandronum Beta for Mac Os (Silicon and Intel)

Commit MetaInfo

• 修訂: 6cbfdc124b0578e0526c898990e28ac67ab3a84e (tree)
• 時間: 2022-10-10 05:35:32
• 作者: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Added "offlineonly" and "onlineonly" options to the game settings feature of the GAMEMODE lump. This allows some CVars to only be configured for offline or online games, or both.

Change Summary

• modified: docs/zandronum-history.txt
• modified: src/gamemode.cpp
• modified: src/gamemode.h

差異

diff -r 9396eb2fe15d -r 6cbfdc124b05 docs/zandronum-history.txt
--- a/docs/zandronum-history.txt	Sun Oct 09 15:28:27 2022 -0400
+++ b/docs/zandronum-history.txt	Sun Oct 09 16:35:32 2022 -0400
@@ -34,6 +34,7 @@
 +	- Added the CVar "cl_identifymonsters" which allows monsters to be identified with cl_identifytarget. [Kaminsky]
 +	- Added the CCMD "rcon_logout" so that clients with RCON access may logout if they want to. This also changes the old behaviour where a client who already had RCON access could lose it if they resent the wrong password to the server. [Kaminsky]
 +	- Added ACS function: "SetGameplaySetting", allowing modders to change gameplay-related CVars on the fly. [Kaminsky]
++	- Added "offlineonly" and "onlineonly" options to the game settings feature of the GAMEMODE lump. This allows some CVars to only be configured for offline or online games, or both. [Kaminsky]
 -	- Fixed: clients didn't initialize a sector's friction properly in some cases due to a superfluous check that wasn't removed earlier. [Kaminsky]
 -	- Fixed: the server wouldn't initialize compatflags and compatflags2 properly if entered as command line parameters. [Kaminsky]
 -	- Fixed: serverinfo CVars entered on the command line were restored in reverse order. [Kaminsky]

diff -r 9396eb2fe15d -r 6cbfdc124b05 src/gamemode.cpp
--- a/src/gamemode.cpp	Sun Oct 09 15:28:27 2022 -0400
+++ b/src/gamemode.cpp	Sun Oct 09 16:35:32 2022 -0400
@@ -143,6 +143,24 @@
 //*****************************************************************************
 //	FUNCTIONS
 
+bool GAMEPLAYSETTING_s::IsOutOfScope( void )
+{
+	if ( Scope != GAMESCOPE_OFFLINEANDONLINE )
+	{
+		// [AK] "offlineonly" settings are not applied in online games.
+		if (( Scope == GAMESCOPE_OFFLINEONLY ) && ( NETWORK_GetState( ) == NETSTATE_SERVER ))
+			return true;
+
+		// [AK] "onlineonly" settings are not applied in offline games.
+		if (( Scope == GAMESCOPE_ONLINEONLY ) && ( NETWORK_GetState( ) != NETSTATE_SERVER ))
+			return true;
+	}
+
+	return false;
+}
+
+//*****************************************************************************
+//
 void GAMEMODE_Tick( void )
 {
 	static GAMESTATE_e oldState = GAMESTATE_UNSPECIFIED;
@@ -242,6 +260,7 @@
 //
 void GAMEMODE_ParseGameSettingBlock( FScanner &sc, const GAMEMODE_e GameMode, bool bLockCVars, bool bResetCVars )
 {
+	GAMESCOPE_e Scope = GAMESCOPE_OFFLINEANDONLINE;
 	sc.MustGetStringName( "{" );
 	
 	// [AK] If this is the start of a "defaultgamesettings" or "defaultlockedgamesettings" block, empty the CVar
@@ -253,9 +272,34 @@
 			g_GameModes[mode].GameplaySettings.Clear( );
 	}
 
-	while ( !sc.CheckString( "}" ))
+	// [AK] Keep looping until we exited out of all blocks.
+	while ( true )
 	{
 		sc.MustGetString( );
+
+		// [AK] "offlineonly" or "onlineonly" indicate the start of a new subblock and scope. CVars added into
+		// either of these subblocks are only set in offline or online games respectively.
+		if (( stricmp( sc.String, "offlineonly" ) == 0 ) || ( stricmp( sc.String, "onlineonly" ) == 0 ))
+		{
+			// [AK] Don't start a new subblock while in the middle of another subblock.
+			if ( Scope != GAMESCOPE_OFFLINEANDONLINE )
+				sc.ScriptError( "Tried to start a new \"%s\" subblock in the middle of an \"%s\" subblock.", sc.String, Scope == GAMESCOPE_OFFLINEONLY ? "offlineonly" : "onlineonly" );
+			
+			Scope = ( stricmp( sc.String, "offlineonly" ) == 0 ) ? GAMESCOPE_OFFLINEONLY : GAMESCOPE_ONLINEONLY;
+			sc.MustGetStringName( "{" );
+			continue;
+		}
+		// [AK] This indicates the closing of a (sub)block.
+		else if ( stricmp( sc.String, "}" ) == 0 )
+		{
+			// [AK] If we're not in an "offlineonly" or "onlineonly" subblock, then exit out of the game settings block entirely.
+			if ( Scope == GAMESCOPE_OFFLINEANDONLINE )
+				break;
+			
+			Scope = GAMESCOPE_OFFLINEANDONLINE;
+			continue;
+		}
+
 		FBaseCVar *pCVar = FindCVar( sc.String, NULL );
 
 		// [AK] Make sure that this CVar exists.
@@ -327,20 +371,40 @@
 			if (( GameMode == NUM_GAMEMODES ) || ( GameMode == static_cast<GAMEMODE_e>( mode )))
 			{
 				bool bPushToList = true;
+				Setting.Scope = Scope;
 
 				// [AK] Check if this CVar is already in the list. We don't want to have multiple copies of the same CVar.
 				for ( unsigned int i = 0; i < g_GameModes[GameMode].GameplaySettings.Size( ); i++ )
 				{
 					if ( g_GameModes[GameMode].GameplaySettings[i].pCVar == Setting.pCVar )
 					{
-						// [AK] A locked CVar always replaces any unlocked copies of the same CVar that already exist.
-						// On the other hand, an unlocked CVar cannot replace any locked copies and will be discarded instead.
-						if (( g_GameModes[GameMode].GameplaySettings[i].bIsLocked ) && ( Setting.bIsLocked == false ))
-							bPushToList = false;
-						else
+						// [AK] Check if these two CVars have the same scope (i.e. offline or online games only), or if the
+						// new CVar that we're trying to add has no scope (i.e. works in both offline and online games).
+						if (( g_GameModes[GameMode].GameplaySettings[i].Scope == Setting.Scope ) || ( Setting.Scope == GAMESCOPE_OFFLINEANDONLINE ))
+						{
+							// [AK] A locked CVar always replaces any unlocked copies of the same CVar that already exist.
+							// On the other hand, an unlocked CVar cannot replace any locked copies.
+							if (( g_GameModes[GameMode].GameplaySettings[i].bIsLocked ) && ( Setting.bIsLocked == false ))
+							{
+								// [AK] If the new/unlocked CVar has no scope, but the old/locked CVar is "offlineonly" or "onlineonly",
+								// then change the new CVar's scope so that it's opposite to the old CVar's. The two CVars can then co-exist.
+								// Otherwise, the new CVar must be discarded.
+								if ( g_GameModes[GameMode].GameplaySettings[i].Scope != Setting.Scope )
+									Setting.Scope = g_GameModes[GameMode].GameplaySettings[i].Scope != GAMESCOPE_OFFLINEONLY ? GAMESCOPE_OFFLINEONLY : GAMESCOPE_ONLINEONLY;
+								else
+									bPushToList = false;
+
+								break;
+							}
+
 							g_GameModes[GameMode].GameplaySettings.Delete( i );
-
-						break;
+						}
+						// [AK] If the old CVar has no scope, but the new CVar is "offlineonly" or "onlineonly", just change the old CVar's
+						// scope so that it becomes opposite to the new CVar's. The two CVars can then co-exist.
+						else if ( g_GameModes[GameMode].GameplaySettings[i].Scope == GAMESCOPE_OFFLINEANDONLINE )
+						{
+							g_GameModes[GameMode].GameplaySettings[i].Scope = Setting.Scope != GAMESCOPE_OFFLINEONLY ? GAMESCOPE_OFFLINEONLY : GAMESCOPE_ONLINEONLY;
+						}
 					}
 				}
 
@@ -1437,6 +1501,11 @@
 		if ( g_GameModes[g_CurrentGameMode].GameplaySettings[i].pCVar != pCVar )
 			continue;
 
+		// [AK] CVars that are "offlineonly" should only be set in offline games, and
+		// CVars that are "onlineonly" should only be set in online games.
+		if ( g_GameModes[g_CurrentGameMode].GameplaySettings[i].IsOutOfScope( ))
+			continue;
+
 		pSetting = &g_GameModes[g_CurrentGameMode].GameplaySettings[i];
 		break;
 	}
@@ -1472,7 +1541,12 @@
 
 		// [AK] If this CVar matches one that's locked on the list, then it's obviously locked.
 		if ( pCVar == g_GameModes[g_CurrentGameMode].GameplaySettings[i].pCVar )
-			return true;
+		{
+			// [AK] CVars that are "offlineonly" are only locked in offline games, and if they're
+			// "onlineonly" then they're only locked in online games.
+			if ( g_GameModes[g_CurrentGameMode].GameplaySettings[i].IsOutOfScope( ) == false )
+				return true;
+		}
 	}
 
 	return false;
@@ -1490,8 +1564,9 @@
 	{
 		GAMEPLAYSETTING_s *const pSetting = &g_GameModes[g_CurrentGameMode].GameplaySettings[i];
 
-		// [AK] Only reset unlocked CVars if we need to.
-		if (( bLockedOnly ) && ( pSetting->bIsLocked == false ))
+		// [AK] Only reset unlocked CVars if we need to. Also, CVars that are "offlineonly" should only
+		// be reset in offline games, and CVars that are "onlineonly" should only be reset in online games.
+		if ((( bLockedOnly ) && ( pSetting->bIsLocked == false )) || ( pSetting->IsOutOfScope( )))
 			continue;
 
 		// [AK] Do we also want to reset this CVar to its default value?

diff -r 9396eb2fe15d -r 6cbfdc124b05 src/gamemode.h
--- a/src/gamemode.h	Sun Oct 09 15:28:27 2022 -0400
+++ b/src/gamemode.h	Sun Oct 09 16:35:32 2022 -0400
@@ -131,6 +131,14 @@
 } GAMELIMIT_e;
 
 //*****************************************************************************
+typedef enum
+{
+	GAMESCOPE_OFFLINEANDONLINE = 0,
+	GAMESCOPE_OFFLINEONLY,
+	GAMESCOPE_ONLINEONLY
+} GAMESCOPE_e;
+
+//*****************************************************************************
 //	STRUCTURES
 
 typedef struct
@@ -151,6 +159,11 @@
 	// [AK] The CVar is locked and cannot be changed from the console.
 	bool bIsLocked;
 
+	// [AK] What kind of game (i.e. offline, online, or both) is the CVar's value applied.
+	GAMESCOPE_e Scope;
+
+	bool IsOutOfScope( void );
+
 } GAMEPLAYSETTING_s;
 
 //*****************************************************************************