Skip to content

Commit 60138d9

Browse files
bobtistabobtista
committed
Replace OptionPreferences declaration with include directive in UserPreferences
1 parent c1c9f1f commit 60138d9

File tree

2 files changed

+4
-155
lines changed

2 files changed

+4
-155
lines changed

‎Generals/Code/GameEngine/Include/Common/UserPreferences.h‎

Lines changed: 2 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -72,82 +72,8 @@ class UserPreferences : public PreferenceMap
7272
AsciiString m_filename;
7373
};
7474

75-
//-----------------------------------------------------------------------------
76-
// OptionsPreferences options menu class
77-
//-----------------------------------------------------------------------------
78-
class OptionPreferences : public UserPreferences
79-
{
80-
public:
81-
OptionPreferences( );
82-
virtual ~OptionPreferences();
83-
84-
Bool loadFromIniFile();
85-
86-
UnsignedInt getLANIPAddress(void); // convenience function
87-
UnsignedInt getOnlineIPAddress(void); // convenience function
88-
void setLANIPAddress(AsciiString IP); // convenience function
89-
void setOnlineIPAddress(AsciiString IP); // convenience function
90-
void setLANIPAddress(UnsignedInt IP); // convenience function
91-
void setOnlineIPAddress(UnsignedInt IP); // convenience function
92-
Bool getArchiveReplaysEnabled() const; // convenience function
93-
Bool getAlternateMouseModeEnabled(void); // convenience function
94-
Real getScrollFactor(void); // convenience function
95-
Bool getDrawScrollAnchor(void);
96-
Bool getMoveScrollAnchor(void);
97-
Bool getCursorCaptureEnabledInWindowedGame() const;
98-
Bool getCursorCaptureEnabledInWindowedMenu() const;
99-
Bool getCursorCaptureEnabledInFullscreenGame() const;
100-
Bool getCursorCaptureEnabledInFullscreenMenu() const;
101-
CursorCaptureMode getCursorCaptureMode() const;
102-
Bool getScreenEdgeScrollEnabledInWindowedApp() const;
103-
Bool getScreenEdgeScrollEnabledInFullscreenApp() const;
104-
ScreenEdgeScrollMode getScreenEdgeScrollMode() const;
105-
Bool getSendDelay(void); // convenience function
106-
Int getFirewallBehavior(void); // convenience function
107-
Short getFirewallPortAllocationDelta(void); // convenience function
108-
UnsignedShort getFirewallPortOverride(void); // convenience function
109-
Bool getFirewallNeedToRefresh(void); // convenience function
110-
Bool usesSystemMapDir(void); // convenience function
111-
AsciiString getPreferred3DProvider(void); // convenience function
112-
AsciiString getSpeakerType(void); // convenience function
113-
Real getSoundVolume(void); // convenience function
114-
Real get3DSoundVolume(void); // convenience function
115-
Real getSpeechVolume(void); // convenience function
116-
Real getMusicVolume(void); // convenience function
117-
Real getMoneyTransactionVolume(void) const;
118-
Bool saveCameraInReplays(void);
119-
Bool useCameraInReplays(void);
120-
Bool getPlayerObserverEnabled() const;
121-
Int getStaticGameDetail(void); // detail level selected by the user.
122-
Int getIdealStaticGameDetail(void); // detail level detected for user.
123-
Real getGammaValue(void);
124-
Int getTextureReduction(void);
125-
void getResolution(Int *xres, Int *yres);
126-
Bool get3DShadowsEnabled(void);
127-
Bool get2DShadowsEnabled(void);
128-
Bool getCloudShadowsEnabled(void);
129-
Bool getLightmapEnabled(void);
130-
Bool getSmoothWaterEnabled(void);
131-
Bool getTreesEnabled(void);
132-
Bool getExtraAnimationsDisabled(void);
133-
Bool getDynamicLODEnabled(void);
134-
Bool getFPSLimitEnabled(void);
135-
Bool getNoDynamicLODEnabled(void);
136-
Bool getBuildingOcclusionEnabled(void);
137-
Int getParticleCap(void);
138-
139-
Int getCampaignDifficulty(void);
140-
void setCampaignDifficulty( Int diff );
141-
142-
Int getNetworkLatencyFontSize(void);
143-
Int getRenderFpsFontSize(void);
144-
Int getSystemTimeFontSize(void);
145-
Int getGameTimeFontSize(void);
146-
147-
Real getResolutionFontAdjustment(void);
148-
149-
Bool getShowMoneyPerMinute(void) const;
150-
};
75+
// TheSuperHackers @refactor bobtista 13/11/2025 Moved OptionPreferences to separate files.
76+
#include "Common/OptionPreferences.h"
15177

15278
//-----------------------------------------------------------------------------
15379
// LANPreferences class

‎GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h‎

Lines changed: 2 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -72,85 +72,8 @@ class UserPreferences : public PreferenceMap
7272
AsciiString m_filename;
7373
};
7474

75-
//-----------------------------------------------------------------------------
76-
// OptionsPreferences options menu class
77-
//-----------------------------------------------------------------------------
78-
class OptionPreferences : public UserPreferences
79-
{
80-
public:
81-
OptionPreferences( );
82-
virtual ~OptionPreferences();
83-
84-
Bool loadFromIniFile();
85-
86-
UnsignedInt getLANIPAddress(void); // convenience function
87-
UnsignedInt getOnlineIPAddress(void); // convenience function
88-
void setLANIPAddress(AsciiString IP); // convenience function
89-
void setOnlineIPAddress(AsciiString IP); // convenience function
90-
void setLANIPAddress(UnsignedInt IP); // convenience function
91-
void setOnlineIPAddress(UnsignedInt IP); // convenience function
92-
Bool getArchiveReplaysEnabled() const; // convenience function
93-
Bool getAlternateMouseModeEnabled(void); // convenience function
94-
Bool getRetaliationModeEnabled(); // convenience function
95-
Bool getDoubleClickAttackMoveEnabled(void); // convenience function
96-
Real getScrollFactor(void); // convenience function
97-
Bool getDrawScrollAnchor(void);
98-
Bool getMoveScrollAnchor(void);
99-
Bool getCursorCaptureEnabledInWindowedGame() const;
100-
Bool getCursorCaptureEnabledInWindowedMenu() const;
101-
Bool getCursorCaptureEnabledInFullscreenGame() const;
102-
Bool getCursorCaptureEnabledInFullscreenMenu() const;
103-
CursorCaptureMode getCursorCaptureMode() const;
104-
Bool getScreenEdgeScrollEnabledInWindowedApp() const;
105-
Bool getScreenEdgeScrollEnabledInFullscreenApp() const;
106-
ScreenEdgeScrollMode getScreenEdgeScrollMode() const;
107-
Bool getSendDelay(void); // convenience function
108-
Int getFirewallBehavior(void); // convenience function
109-
Short getFirewallPortAllocationDelta(void); // convenience function
110-
UnsignedShort getFirewallPortOverride(void); // convenience function
111-
Bool getFirewallNeedToRefresh(void); // convenience function
112-
Bool usesSystemMapDir(void); // convenience function
113-
AsciiString getPreferred3DProvider(void); // convenience function
114-
AsciiString getSpeakerType(void); // convenience function
115-
Real getSoundVolume(void); // convenience function
116-
Real get3DSoundVolume(void); // convenience function
117-
Real getSpeechVolume(void); // convenience function
118-
Real getMusicVolume(void); // convenience function
119-
Real getMoneyTransactionVolume(void) const;
120-
Bool saveCameraInReplays(void);
121-
Bool useCameraInReplays(void);
122-
Bool getPlayerObserverEnabled() const;
123-
Int getStaticGameDetail(void); // detail level selected by the user.
124-
Int getIdealStaticGameDetail(void); // detail level detected for user.
125-
Real getGammaValue(void);
126-
Int getTextureReduction(void);
127-
void getResolution(Int *xres, Int *yres);
128-
Bool get3DShadowsEnabled(void);
129-
Bool get2DShadowsEnabled(void);
130-
Bool getCloudShadowsEnabled(void);
131-
Bool getLightmapEnabled(void);
132-
Bool getSmoothWaterEnabled(void);
133-
Bool getTreesEnabled(void);
134-
Bool getExtraAnimationsDisabled(void);
135-
Bool getUseHeatEffects(void);
136-
Bool getDynamicLODEnabled(void);
137-
Bool getFPSLimitEnabled(void);
138-
Bool getNoDynamicLODEnabled(void);
139-
Bool getBuildingOcclusionEnabled(void);
140-
Int getParticleCap(void);
141-
142-
Int getCampaignDifficulty(void);
143-
void setCampaignDifficulty( Int diff );
144-
145-
Int getNetworkLatencyFontSize(void);
146-
Int getRenderFpsFontSize(void);
147-
Int getSystemTimeFontSize(void);
148-
Int getGameTimeFontSize(void);
149-
150-
Real getResolutionFontAdjustment(void);
151-
152-
Bool getShowMoneyPerMinute(void) const;
153-
};
75+
// TheSuperHackers @refactor bobtista 13/11/2025 Moved OptionPreferences to separate files.
76+
#include "Common/OptionPreferences.h"
15477

15578
//-----------------------------------------------------------------------------
15679
// LANPreferences class

0 commit comments

Comments
 (0)