More SH Merges

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
@@ -144,28 +145,28 @@ set(GAMEENGINE_SRC
 #    Include/GameClient/AnimateWindowManager.h
 #    Include/GameClient/CampaignManager.h
     Include/GameClient/ChallengeGenerals.h
-#    Include/GameClient/ClientInstance.h
+    Include/GameClient/ClientInstance.h
     Include/GameClient/ClientRandomValue.h
-#    Include/GameClient/Color.h
+    Include/GameClient/Color.h
 #    Include/GameClient/CommandXlat.h
 #    Include/GameClient/ControlBar.h
 #    Include/GameClient/ControlBarResizer.h
 #    Include/GameClient/ControlBarScheme.h
-#    Include/GameClient/Credits.h
+    Include/GameClient/Credits.h
 #    Include/GameClient/DebugDisplay.h
 #    Include/GameClient/Diplomacy.h
 #    Include/GameClient/DisconnectMenu.h
 #    Include/GameClient/Display.h
-#    Include/GameClient/DisplayString.h
-#    Include/GameClient/DisplayStringManager.h
+    Include/GameClient/DisplayString.h
+    Include/GameClient/DisplayStringManager.h
 #    Include/GameClient/Drawable.h
 #    Include/GameClient/DrawableInfo.h
-#    Include/GameClient/DrawGroupInfo.h
+    Include/GameClient/DrawGroupInfo.h
 #    Include/GameClient/EstablishConnectionsMenu.h
 #    Include/GameClient/Eva.h
 #    Include/GameClient/ExtendedMessageBox.h
 #    Include/GameClient/FontDesc.h
-#    Include/GameClient/FXList.h
+    Include/GameClient/FXList.h
 #    Include/GameClient/Gadget.h
 #    Include/GameClient/GadgetCheckBox.h
 #    Include/GameClient/GadgetComboBox.h
@@ -178,61 +179,61 @@ set(GAMEENGINE_SRC
 #    Include/GameClient/GadgetTabControl.h
 #    Include/GameClient/GadgetTextEntry.h
 #    Include/GameClient/GameClient.h
-#    Include/GameClient/GameFont.h
+    Include/GameClient/GameFont.h
 #    Include/GameClient/GameInfoWindow.h
-#    Include/GameClient/GameText.h
-#    Include/GameClient/GameWindow.h
-#    Include/GameClient/GameWindowGlobal.h
+    Include/GameClient/GameText.h
+    Include/GameClient/GameWindow.h
+    Include/GameClient/GameWindowGlobal.h
 #    Include/GameClient/GameWindowID.h
 #    Include/GameClient/GameWindowManager.h
-#    Include/GameClient/GameWindowTransitions.h
-#    Include/GameClient/GlobalLanguage.h
-#    Include/GameClient/GraphDraw.h
+    Include/GameClient/GameWindowTransitions.h
+    Include/GameClient/GlobalLanguage.h
+    Include/GameClient/GraphDraw.h
 #    Include/GameClient/GUICallbacks.h
 #    Include/GameClient/GUICommandTranslator.h
-#    Include/GameClient/HeaderTemplate.h
+    Include/GameClient/HeaderTemplate.h
 #    Include/GameClient/HintSpy.h
 #    Include/GameClient/HotKey.h
 #    Include/GameClient/Image.h
-#    Include/GameClient/IMEManager.h
+    Include/GameClient/IMEManager.h
 #    Include/GameClient/InGameUI.h
-#    Include/GameClient/Keyboard.h
+    Include/GameClient/Keyboard.h
 #    Include/GameClient/KeyDefs.h
-#    Include/GameClient/LanguageFilter.h
-#    Include/GameClient/Line2D.h
-#    Include/GameClient/LoadScreen.h
+    Include/GameClient/LanguageFilter.h
+    Include/GameClient/Line2D.h
+    Include/GameClient/LoadScreen.h
 #    Include/GameClient/LookAtXlat.h
     Include/GameClient/MapUtil.h
 #    Include/GameClient/MessageBox.h
 #    Include/GameClient/MetaEvent.h
 #    Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
 #    Include/GameClient/Module/BeaconClientUpdate.h
 #    Include/GameClient/Module/SwayClientUpdate.h
-#    Include/GameClient/Mouse.h
+    Include/GameClient/Mouse.h
     Include/GameClient/ParabolicEase.h
     Include/GameClient/ParticleSys.h
 #    Include/GameClient/PlaceEventTranslator.h
-#    Include/GameClient/ProcessAnimateWindow.h
-#    Include/GameClient/RadiusDecal.h
+    Include/GameClient/ProcessAnimateWindow.h
+    Include/GameClient/RadiusDecal.h
 #    Include/GameClient/RayEffect.h
-#    Include/GameClient/SelectionInfo.h
+    Include/GameClient/SelectionInfo.h
 #    Include/GameClient/SelectionXlat.h
 #    Include/GameClient/Shadow.h
 #    Include/GameClient/Shell.h
 #    Include/GameClient/ShellHooks.h
 #    Include/GameClient/ShellMenuScheme.h
     Include/GameClient/Smudge.h
     Include/GameClient/Snow.h
-#    Include/GameClient/Statistics.h
+    Include/GameClient/Statistics.h
     Include/GameClient/TerrainRoads.h
     Include/GameClient/TerrainVisual.h
     Include/GameClient/VideoPlayer.h
     Include/GameClient/View.h
     Include/GameClient/Water.h
-#    Include/GameClient/WindowLayout.h
+    Include/GameClient/WindowLayout.h
     Include/GameClient/WindowVideoManager.h
 #    Include/GameClient/WindowXlat.h
-#    Include/GameClient/WinInstanceData.h
+    Include/GameClient/WinInstanceData.h
 #    Include/GameLogic/AI.h
 #    Include/GameLogic/AIDock.h
 #    Include/GameLogic/AIGuard.h
@@ -621,6 +622,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
@@ -696,24 +698,24 @@ set(GAMEENGINE_SRC
     Source/Common/UserPreferences.cpp
 #    Source/Common/version.cpp
     Source/Common/WorkerProcess.cpp
-#    Source/GameClient/ClientInstance.cpp
-#    Source/GameClient/Color.cpp
-#    Source/GameClient/Credits.cpp
+    Source/GameClient/ClientInstance.cpp
+    Source/GameClient/Color.cpp
+    Source/GameClient/Credits.cpp
 #    Source/GameClient/Display.cpp
-#    Source/GameClient/DisplayString.cpp
-#    Source/GameClient/DisplayStringManager.cpp
+    Source/GameClient/DisplayString.cpp
+    Source/GameClient/DisplayStringManager.cpp
 #    Source/GameClient/Drawable.cpp
 #    Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
 #    Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
 #    Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
-#    Source/GameClient/DrawGroupInfo.cpp
+    Source/GameClient/DrawGroupInfo.cpp
 #    Source/GameClient/Eva.cpp
-#    Source/GameClient/FXList.cpp
+    Source/GameClient/FXList.cpp
 #    Source/GameClient/GameClient.cpp
 #    Source/GameClient/GameClientDispatch.cpp
-#    Source/GameClient/GameText.cpp
-#    Source/GameClient/GlobalLanguage.cpp
-#    Source/GameClient/GraphDraw.cpp
+    Source/GameClient/GameText.cpp
+    Source/GameClient/GlobalLanguage.cpp
+    Source/GameClient/GraphDraw.cpp
 #    Source/GameClient/GUI/AnimateWindowManager.cpp
     Source/GameClient/GUI/ChallengeGenerals.cpp
 #    Source/GameClient/GUI/ControlBar/ControlBar.cpp
@@ -741,12 +743,12 @@ set(GAMEENGINE_SRC
 #    Source/GameClient/GUI/Gadget/GadgetTabControl.cpp
 #    Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp
 #    Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
-#    Source/GameClient/GUI/GameFont.cpp
-#    Source/GameClient/GUI/GameWindow.cpp
-#    Source/GameClient/GUI/GameWindowGlobal.cpp
+    Source/GameClient/GUI/GameFont.cpp
+    Source/GameClient/GUI/GameWindow.cpp
+    Source/GameClient/GUI/GameWindowGlobal.cpp
 #    Source/GameClient/GUI/GameWindowManager.cpp
 #    Source/GameClient/GUI/GameWindowManagerScript.cpp
-#    Source/GameClient/GUI/GameWindowTransitions.cpp
+    Source/GameClient/GUI/GameWindowTransitions.cpp
 #    Source/GameClient/GUI/GameWindowTransitionsStyles.cpp
 #    Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
 #    Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
@@ -799,20 +801,20 @@ set(GAMEENGINE_SRC
 #    Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp
 #    Source/GameClient/GUI/GUICallbacks/MessageBox.cpp
 #    Source/GameClient/GUI/GUICallbacks/ReplayControls.cpp
-#    Source/GameClient/GUI/HeaderTemplate.cpp
-#    Source/GameClient/GUI/IMEManager.cpp
-#    Source/GameClient/GUI/LoadScreen.cpp
-#    Source/GameClient/GUI/ProcessAnimateWindow.cpp
+    Source/GameClient/GUI/HeaderTemplate.cpp
+    Source/GameClient/GUI/IMEManager.cpp
+    Source/GameClient/GUI/LoadScreen.cpp
+    Source/GameClient/GUI/ProcessAnimateWindow.cpp
 #    Source/GameClient/GUI/Shell/Shell.cpp
 #    Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
-#    Source/GameClient/GUI/WindowLayout.cpp
+    Source/GameClient/GUI/WindowLayout.cpp
     Source/GameClient/GUI/WindowVideoManager.cpp
-#    Source/GameClient/GUI/WinInstanceData.cpp
+    Source/GameClient/GUI/WinInstanceData.cpp
 #    Source/GameClient/InGameUI.cpp
-#    Source/GameClient/Input/Keyboard.cpp
-#    Source/GameClient/Input/Mouse.cpp
-#    Source/GameClient/LanguageFilter.cpp
-#    Source/GameClient/Line2D.cpp
+    Source/GameClient/Input/Keyboard.cpp
+    Source/GameClient/Input/Mouse.cpp
+    Source/GameClient/LanguageFilter.cpp
+    Source/GameClient/Line2D.cpp
     Source/GameClient/MapUtil.cpp
 #    Source/GameClient/MessageStream/CommandXlat.cpp
 #    Source/GameClient/MessageStream/GUICommandTranslator.cpp
@@ -824,10 +826,10 @@ set(GAMEENGINE_SRC
 #    Source/GameClient/MessageStream/SelectionXlat.cpp
 #    Source/GameClient/MessageStream/WindowXlat.cpp
     Source/GameClient/ParabolicEase.cpp
-#    Source/GameClient/RadiusDecal.cpp
-#    Source/GameClient/SelectionInfo.cpp
+    Source/GameClient/RadiusDecal.cpp
+    Source/GameClient/SelectionInfo.cpp
     Source/GameClient/Snow.cpp
-#    Source/GameClient/Statistics.cpp
+    Source/GameClient/Statistics.cpp
 #    Source/GameClient/System/Anim2D.cpp
 #    Source/GameClient/System/CampaignManager.cpp
     Source/GameClient/System/Debug/AudioDebugDisplay.cpp

Core/GameEngine/Include/Common/OptionPreferences.h

@@ -0,0 +1,116 @@
+/*
+**	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;
+typedef UnsignedInt ScreenEdgeScrollMode;
+
+//-----------------------------------------------------------------------------
+// OptionsPreferences options menu class
+//-----------------------------------------------------------------------------
+class OptionPreferences : public UserPreferences
+{
+public:
+	OptionPreferences();
+	virtual ~OptionPreferences();
+
+	Bool loadFromIniFile();
+
+	UnsignedInt getLANIPAddress(void);
+	UnsignedInt getOnlineIPAddress(void);
+	void setLANIPAddress(AsciiString IP);
+	void setOnlineIPAddress(AsciiString IP);
+	void setLANIPAddress(UnsignedInt IP);
+	void setOnlineIPAddress(UnsignedInt IP);
+	Bool getArchiveReplaysEnabled() const;
+	Bool getAlternateMouseModeEnabled(void);
+	Bool getRetaliationModeEnabled();
+	Bool getDoubleClickAttackMoveEnabled(void);
+	Real getScrollFactor(void);
+	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);
+	Int getFirewallBehavior(void);
+	Short getFirewallPortAllocationDelta(void);
+	UnsignedShort getFirewallPortOverride(void);
+	Bool getFirewallNeedToRefresh(void);
+	Bool usesSystemMapDir(void);
+	AsciiString getPreferred3DProvider(void);
+	AsciiString getSpeakerType(void);
+	Real getSoundVolume(void);
+	Real get3DSoundVolume(void);
+	Real getSpeechVolume(void);
+	Real getMusicVolume(void);
+	Real getMoneyTransactionVolume(void) const;
+	Bool saveCameraInReplays(void);
+	Bool useCameraInReplays(void);
+	Bool getPlayerObserverEnabled() const;
+	Int getStaticGameDetail(void);
+	Int getIdealStaticGameDetail(void);
+	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 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/Radar.h

@@ -106,7 +106,6 @@ class RadarObject : public MemoryPoolObject,
 	const RadarObject *friend_getNext( void ) const { return m_next; }
 
 	Bool isTemporarilyHidden() const;
-	static Bool isTemporarilyHidden(const Object* obj);
 
 protected:
 
@@ -260,12 +259,6 @@ class Radar : public Snapshot,
 																					* in exactly the same priority as the regular
 																					* object list for all other objects */
 
-	// TheSuperHackers @bugfix xezon 22/11/2025 Now stores local heroes in a separate list,
-	// because they are treated with special icons but should otherwise work like all other
-	// radar objects. In retail version, the cached hero object data was able to dangle
-	// for a few frames and cause undefined behavior.
-	RadarObject *m_localHeroObjectList; ///< list of hero objects for the local player
-
 	Real m_terrainAverageZ;								///< average Z for terrain samples
 	Real m_waterAverageZ;									///< average Z for water samples