refactor(preferences): Move OptionPreferences class into separate files

Core/GameEngine/CMakeLists.txt

@@ -82,6 +82,7 @@ set(GAMEENGINE_SRC
 #    Include/Common/MultiplayerSettings.h
 #    Include/Common/NameKeyGenerator.h
     Include/Common/ObjectStatusTypes.h
+    Include/Common/OptionPreferences.h
 #    Include/Common/OSDisplay.h
 #    Include/Common/Overridable.h
 #    Include/Common/Override.h
@@ -613,6 +614,7 @@ set(GAMEENGINE_SRC
 #    Source/Common/MiniLog.cpp
 #    Source/Common/MultiplayerSettings.cpp
 #    Source/Common/NameKeyGenerator.cpp
+    Source/Common/OptionPreferences.cpp
 #    Source/Common/PartitionSolver.cpp
 #    Source/Common/PerfTimer.cpp
     Source/Common/RandomValue.cpp

Core/GameEngine/Include/Common/OptionPreferences.h

@@ -0,0 +1,137 @@
+/*
+**	Command & Conquer Generals Zero Hour(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+////////////////////////////////////////////////////////////////////////////////
+//																																						//
+//  (c) 2001-2003 Electronic Arts Inc.																				//
+//																																						//
+////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////////////
+// FILE: OptionPreferences.h
+// Author: Matthew D. Campbell, April 2002
+// Description: Saving/Loading of option preferences
+///////////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "Common/UserPreferences.h"
+
+typedef UnsignedInt CursorCaptureMode;
+enum CursorCaptureMode_ CPP_11(: CursorCaptureMode)
+{
+	CursorCaptureMode_EnabledInWindowedGame = 1<<0,
+	CursorCaptureMode_EnabledInWindowedMenu = 1<<1,
+	CursorCaptureMode_EnabledInFullscreenGame = 1<<2,
+	CursorCaptureMode_EnabledInFullscreenMenu = 1<<3,
+
+	CursorCaptureMode_Default =
+		CursorCaptureMode_EnabledInWindowedGame |
+		CursorCaptureMode_EnabledInFullscreenGame |
+		CursorCaptureMode_EnabledInFullscreenMenu,
+};
+
+typedef UnsignedInt ScreenEdgeScrollMode;
+enum ScreenEdgeScrollMode_ CPP_11(: ScreenEdgeScrollMode)
+{
+	ScreenEdgeScrollMode_EnabledInWindowedApp = 1<<0,
+	ScreenEdgeScrollMode_EnabledInFullscreenApp = 1<<1,
+
+	ScreenEdgeScrollMode_Default = ScreenEdgeScrollMode_EnabledInFullscreenApp,
+};
+
+//-----------------------------------------------------------------------------
+// OptionPreferences options menu class
+//-----------------------------------------------------------------------------
+class OptionPreferences : public UserPreferences
+{
+public:
+	OptionPreferences();
+	virtual ~OptionPreferences();
+
+	Bool loadFromIniFile();
+
+	UnsignedInt getLANIPAddress(void);				// convenience function
+	UnsignedInt getOnlineIPAddress(void);			// convenience function
+	void setLANIPAddress(AsciiString IP);			// convenience function
+	void setOnlineIPAddress(AsciiString IP);	// convenience function
+	void setLANIPAddress(UnsignedInt IP);			// convenience function
+	void setOnlineIPAddress(UnsignedInt IP);	// convenience function
+	Bool getArchiveReplaysEnabled() const;		// convenience function
+	Bool getAlternateMouseModeEnabled(void);	// convenience function
+	Bool getRetaliationModeEnabled();					// convenience function
+	Bool getDoubleClickAttackMoveEnabled(void);	// convenience function
+	Real getScrollFactor(void);								// convenience function
+	Bool getDrawScrollAnchor(void);
+	Bool getMoveScrollAnchor(void);
+	Bool getCursorCaptureEnabledInWindowedGame() const;
+	Bool getCursorCaptureEnabledInWindowedMenu() const;
+	Bool getCursorCaptureEnabledInFullscreenGame() const;
+	Bool getCursorCaptureEnabledInFullscreenMenu() const;
+	CursorCaptureMode getCursorCaptureMode() const;
+	Bool getScreenEdgeScrollEnabledInWindowedApp() const;
+	Bool getScreenEdgeScrollEnabledInFullscreenApp() const;
+	ScreenEdgeScrollMode getScreenEdgeScrollMode() const;
+	Bool getSendDelay(void);									// convenience function
+	Int getFirewallBehavior(void);						// convenience function
+	Short getFirewallPortAllocationDelta(void);	// convenience function
+	UnsignedShort getFirewallPortOverride(void); // convenience function
+	Bool getFirewallNeedToRefresh(void);			// convenience function
+	Bool usesSystemMapDir(void);							// convenience function
+	AsciiString getPreferred3DProvider(void);	// convenience function
+	AsciiString getSpeakerType(void);					// convenience function
+	Real getSoundVolume(void);								// convenience function
+	Real get3DSoundVolume(void);							// convenience function
+	Real getSpeechVolume(void);								// convenience function
+	Real getMusicVolume(void);								// convenience function
+	Real getMoneyTransactionVolume(void) const;
+	Bool saveCameraInReplays(void);
+	Bool useCameraInReplays(void);
+	Bool getPlayerObserverEnabled() const;
+	Int getStaticGameDetail(void);	// detail level selected by the user.
+	Int getIdealStaticGameDetail(void);	// detail level detected for user.
+	Real getGammaValue(void);
+	Int getTextureReduction(void);
+	void getResolution(Int *xres, Int *yres);
+	Bool get3DShadowsEnabled(void);
+	Bool get2DShadowsEnabled(void);
+	Bool getCloudShadowsEnabled(void);
+	Bool getLightmapEnabled(void);
+	Bool getSmoothWaterEnabled(void);
+	Bool getTreesEnabled(void);
+	Bool getExtraAnimationsDisabled(void);
+	Bool getUseHeatEffects(void);
+	Bool getDynamicLODEnabled(void);
+	Bool getFPSLimitEnabled(void);
+	Bool getNoDynamicLODEnabled(void);
+	Bool getBuildingOcclusionEnabled(void);
+	Int getParticleCap(void);
+
+	Int getCampaignDifficulty(void);
+	void setCampaignDifficulty( Int diff );
+
+	Int getNetworkLatencyFontSize(void);
+	Int getRenderFpsFontSize(void);
+	Int getSystemTimeFontSize(void);
+	Int getGameTimeFontSize(void);
+	Int getPlayerInfoListFontSize(void);
+
+	Real getResolutionFontAdjustment(void);
+
+	Bool getShowMoneyPerMinute(void) const;
+};

Core/GameEngine/Include/Common/UserPreferences.h

@@ -36,8 +36,6 @@
 #include "Common/STLTypedefs.h"
 
 class Money;
-typedef UnsignedInt CursorCaptureMode;
-typedef UnsignedInt ScreenEdgeScrollMode;
 
 //-----------------------------------------------------------------------------
 // PUBLIC TYPES ///////////////////////////////////////////////////////////////
@@ -72,87 +70,6 @@ class UserPreferences : public PreferenceMap
 	AsciiString m_filename;
 };
 
-//-----------------------------------------------------------------------------
-// OptionsPreferences options menu class
-//-----------------------------------------------------------------------------
-class OptionPreferences : public UserPreferences
-{
-public:
-	OptionPreferences(  );
-	virtual ~OptionPreferences();
-
-	Bool loadFromIniFile();
-
-	UnsignedInt getLANIPAddress(void);				// convenience function
-	UnsignedInt getOnlineIPAddress(void);			// convenience function
-	void setLANIPAddress(AsciiString IP);			// convenience function
-	void setOnlineIPAddress(AsciiString IP);	// convenience function
-	void setLANIPAddress(UnsignedInt IP);			// convenience function
-	void setOnlineIPAddress(UnsignedInt IP);	// convenience function
-	Bool getArchiveReplaysEnabled() const;		// convenience function
-	Bool getAlternateMouseModeEnabled(void);	// convenience function
-	Bool getRetaliationModeEnabled();					// convenience function
-	Bool getDoubleClickAttackMoveEnabled(void);	// convenience function
-	Real getScrollFactor(void);								// convenience function
-	Bool getDrawScrollAnchor(void);
-	Bool getMoveScrollAnchor(void);
-	Bool getCursorCaptureEnabledInWindowedGame() const;
-	Bool getCursorCaptureEnabledInWindowedMenu() const;
-	Bool getCursorCaptureEnabledInFullscreenGame() const;
-	Bool getCursorCaptureEnabledInFullscreenMenu() const;
-	CursorCaptureMode getCursorCaptureMode() const;
-	Bool getScreenEdgeScrollEnabledInWindowedApp() const;
-	Bool getScreenEdgeScrollEnabledInFullscreenApp() const;
-	ScreenEdgeScrollMode getScreenEdgeScrollMode() const;
-	Bool getSendDelay(void);									// convenience function
-	Int getFirewallBehavior(void);						// convenience function
-	Short getFirewallPortAllocationDelta(void);	// convenience function
-	UnsignedShort getFirewallPortOverride(void); // convenience function
-	Bool getFirewallNeedToRefresh(void);			// convenience function
-	Bool usesSystemMapDir(void);							// convenience function
-	AsciiString getPreferred3DProvider(void);	// convenience function
-	AsciiString getSpeakerType(void);					// convenience function
-	Real getSoundVolume(void);								// convenience function
-	Real get3DSoundVolume(void);							// convenience function
-	Real getSpeechVolume(void);								// convenience function
-	Real getMusicVolume(void);								// convenience function
-	Real getMoneyTransactionVolume(void) const;
-	Bool saveCameraInReplays(void);
-	Bool useCameraInReplays(void);
-	Bool getPlayerObserverEnabled() const;
-	Int	 getStaticGameDetail(void);	// detail level selected by the user.
-	Int	 getIdealStaticGameDetail(void);	// detail level detected for user.
- 	Real getGammaValue(void);
-	Int	 getTextureReduction(void);
-	void getResolution(Int *xres, Int *yres);
-	Bool get3DShadowsEnabled(void);
-	Bool get2DShadowsEnabled(void);
-	Bool getCloudShadowsEnabled(void);
-	Bool getLightmapEnabled(void);
-	Bool getSmoothWaterEnabled(void);
-	Bool getTreesEnabled(void);
-	Bool getExtraAnimationsDisabled(void);
-	Bool getUseHeatEffects(void);
-	Bool getDynamicLODEnabled(void);
-	Bool getFPSLimitEnabled(void);
-	Bool getNoDynamicLODEnabled(void);
-	Bool getBuildingOcclusionEnabled(void);
-	Int getParticleCap(void);
-
-	Int	 getCampaignDifficulty(void);
-	void setCampaignDifficulty( Int diff );
-
-	Int getNetworkLatencyFontSize(void);
-	Int getRenderFpsFontSize(void);
-	Int getSystemTimeFontSize(void);
-	Int getGameTimeFontSize(void);
-	Int getPlayerInfoListFontSize(void);
-
-	Real getResolutionFontAdjustment(void);
-
-	Bool getShowMoneyPerMinute(void) const;
-};
-
 //-----------------------------------------------------------------------------
 // LANPreferences class
 //-----------------------------------------------------------------------------

Core/GameEngine/Source/Common/Audio/GameAudio.cpp

@@ -56,6 +56,7 @@
 #include "Common/GameMusic.h"
 #include "Common/GameSounds.h"
 #include "Common/MiscAudio.h"
+#include "Common/OptionPreferences.h"
 #include "Common/OSDisplay.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"