diff --git a/Core/GameEngine/CMakeLists.txt b/Core/GameEngine/CMakeLists.txt
index 0154ecbde98..86a3d479721 100644
--- a/Core/GameEngine/CMakeLists.txt
+++ b/Core/GameEngine/CMakeLists.txt
@@ -141,87 +141,87 @@ set(GAMEENGINE_SRC
Include/Common/XferDeepCRC.h
Include/Common/XferLoad.h
Include/Common/XferSave.h
-# Include/GameClient/Anim2D.h
-# Include/GameClient/AnimateWindowManager.h
+ Include/GameClient/Anim2D.h
+ Include/GameClient/AnimateWindowManager.h
# Include/GameClient/CampaignManager.h
Include/GameClient/ChallengeGenerals.h
Include/GameClient/ClientInstance.h
Include/GameClient/ClientRandomValue.h
Include/GameClient/Color.h
-# Include/GameClient/CommandXlat.h
+ Include/GameClient/CommandXlat.h
# Include/GameClient/ControlBar.h
-# Include/GameClient/ControlBarResizer.h
+ Include/GameClient/ControlBarResizer.h
# Include/GameClient/ControlBarScheme.h
Include/GameClient/Credits.h
-# Include/GameClient/DebugDisplay.h
-# Include/GameClient/Diplomacy.h
-# Include/GameClient/DisconnectMenu.h
-# Include/GameClient/Display.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/Drawable.h
-# Include/GameClient/DrawableInfo.h
+ Include/GameClient/DrawableInfo.h
Include/GameClient/DrawGroupInfo.h
-# Include/GameClient/EstablishConnectionsMenu.h
+ Include/GameClient/EstablishConnectionsMenu.h
# Include/GameClient/Eva.h
-# Include/GameClient/ExtendedMessageBox.h
-# Include/GameClient/FontDesc.h
+ Include/GameClient/ExtendedMessageBox.h
+ Include/GameClient/FontDesc.h
Include/GameClient/FXList.h
# Include/GameClient/Gadget.h
-# Include/GameClient/GadgetCheckBox.h
-# Include/GameClient/GadgetComboBox.h
-# Include/GameClient/GadgetListBox.h
-# Include/GameClient/GadgetProgressBar.h
-# Include/GameClient/GadgetPushButton.h
-# Include/GameClient/GadgetRadioButton.h
-# Include/GameClient/GadgetSlider.h
-# Include/GameClient/GadgetStaticText.h
-# Include/GameClient/GadgetTabControl.h
-# Include/GameClient/GadgetTextEntry.h
+ Include/GameClient/GadgetCheckBox.h
+ Include/GameClient/GadgetComboBox.h
+ Include/GameClient/GadgetListBox.h
+ Include/GameClient/GadgetProgressBar.h
+ Include/GameClient/GadgetPushButton.h
+ Include/GameClient/GadgetRadioButton.h
+ Include/GameClient/GadgetSlider.h
+ Include/GameClient/GadgetStaticText.h
+ Include/GameClient/GadgetTabControl.h
+ Include/GameClient/GadgetTextEntry.h
# Include/GameClient/GameClient.h
Include/GameClient/GameFont.h
-# Include/GameClient/GameInfoWindow.h
+ Include/GameClient/GameInfoWindow.h
Include/GameClient/GameText.h
Include/GameClient/GameWindow.h
Include/GameClient/GameWindowGlobal.h
-# Include/GameClient/GameWindowID.h
-# Include/GameClient/GameWindowManager.h
+ Include/GameClient/GameWindowID.h
+ Include/GameClient/GameWindowManager.h
Include/GameClient/GameWindowTransitions.h
Include/GameClient/GlobalLanguage.h
Include/GameClient/GraphDraw.h
# Include/GameClient/GUICallbacks.h
-# Include/GameClient/GUICommandTranslator.h
+ Include/GameClient/GUICommandTranslator.h
Include/GameClient/HeaderTemplate.h
-# Include/GameClient/HintSpy.h
-# Include/GameClient/HotKey.h
-# Include/GameClient/Image.h
+ Include/GameClient/HintSpy.h
+ Include/GameClient/HotKey.h
+ Include/GameClient/Image.h
Include/GameClient/IMEManager.h
# Include/GameClient/InGameUI.h
Include/GameClient/Keyboard.h
-# Include/GameClient/KeyDefs.h
+ Include/GameClient/KeyDefs.h
Include/GameClient/LanguageFilter.h
Include/GameClient/Line2D.h
Include/GameClient/LoadScreen.h
-# Include/GameClient/LookAtXlat.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/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/ParabolicEase.h
Include/GameClient/ParticleSys.h
-# Include/GameClient/PlaceEventTranslator.h
+ Include/GameClient/PlaceEventTranslator.h
Include/GameClient/ProcessAnimateWindow.h
Include/GameClient/RadiusDecal.h
-# Include/GameClient/RayEffect.h
+ Include/GameClient/RayEffect.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/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
@@ -232,7 +232,7 @@ set(GAMEENGINE_SRC
Include/GameClient/Water.h
Include/GameClient/WindowLayout.h
Include/GameClient/WindowVideoManager.h
-# Include/GameClient/WindowXlat.h
+ Include/GameClient/WindowXlat.h
Include/GameClient/WinInstanceData.h
# Include/GameLogic/AI.h
# Include/GameLogic/AIDock.h
@@ -694,112 +694,112 @@ set(GAMEENGINE_SRC
Source/GameClient/ClientInstance.cpp
Source/GameClient/Color.cpp
Source/GameClient/Credits.cpp
-# Source/GameClient/Display.cpp
+ Source/GameClient/Display.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/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
+ Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
+ Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
Source/GameClient/DrawGroupInfo.cpp
# Source/GameClient/Eva.cpp
Source/GameClient/FXList.cpp
# Source/GameClient/GameClient.cpp
-# Source/GameClient/GameClientDispatch.cpp
+ Source/GameClient/GameClientDispatch.cpp
Source/GameClient/GameText.cpp
Source/GameClient/GlobalLanguage.cpp
Source/GameClient/GraphDraw.cpp
-# Source/GameClient/GUI/AnimateWindowManager.cpp
+ Source/GameClient/GUI/AnimateWindowManager.cpp
Source/GameClient/GUI/ChallengeGenerals.cpp
# Source/GameClient/GUI/ControlBar/ControlBar.cpp
# Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
# Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp
# Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp
-# Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
-# Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
+ Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
+ Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
# Source/GameClient/GUI/ControlBar/ControlBarOCLTimer.cpp
-# Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
-# Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
+ Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
+ Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
# Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
# Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp
-# Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
+ Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
# Source/GameClient/GUI/DisconnectMenu/DisconnectMenu.cpp
-# Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp
-# Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
-# Source/GameClient/GUI/Gadget/GadgetComboBox.cpp
-# Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
-# Source/GameClient/GUI/Gadget/GadgetListBox.cpp
-# Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp
+ Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp
+ Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
+ Source/GameClient/GUI/Gadget/GadgetComboBox.cpp
+ Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
+ Source/GameClient/GUI/Gadget/GadgetListBox.cpp
+ Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp
# Source/GameClient/GUI/Gadget/GadgetPushButton.cpp
-# Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp
-# Source/GameClient/GUI/Gadget/GadgetStaticText.cpp
-# Source/GameClient/GUI/Gadget/GadgetTabControl.cpp
-# Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp
-# Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
+ Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp
+ Source/GameClient/GUI/Gadget/GadgetStaticText.cpp
+ 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/GameWindowManager.cpp
+ Source/GameClient/GUI/GameWindowManager.cpp
# Source/GameClient/GUI/GameWindowManagerScript.cpp
Source/GameClient/GUI/GameWindowTransitions.cpp
# Source/GameClient/GUI/GameWindowTransitionsStyles.cpp
# Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
# Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
-# Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp
-# Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp
-# Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp
-# Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp
-# Source/GameClient/GUI/GUICallbacks/InGameChat.cpp
-# Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp
+ Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp
+ Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp
+ Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp
+ Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp
+ Source/GameClient/GUI/GUICallbacks/InGameChat.cpp
+ Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp
# Source/GameClient/GUI/GUICallbacks/Menus/ChallengeMenu.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp
# Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp
# Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp
# Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp
# Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp
# Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
# Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp
# Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
# Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp
# Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
# Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp
# Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp
# Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp
# Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp
# Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
-# Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp
+ Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp
# Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp
-# Source/GameClient/GUI/GUICallbacks/MessageBox.cpp
-# Source/GameClient/GUI/GUICallbacks/ReplayControls.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/Shell/Shell.cpp
-# Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
+ Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
Source/GameClient/GUI/WindowLayout.cpp
Source/GameClient/GUI/WindowVideoManager.cpp
Source/GameClient/GUI/WinInstanceData.cpp
@@ -812,7 +812,7 @@ set(GAMEENGINE_SRC
# Source/GameClient/MessageStream/CommandXlat.cpp
# Source/GameClient/MessageStream/GUICommandTranslator.cpp
# Source/GameClient/MessageStream/HintSpy.cpp
-# Source/GameClient/MessageStream/HotKey.cpp
+ Source/GameClient/MessageStream/HotKey.cpp
# Source/GameClient/MessageStream/LookAtXlat.cpp
# Source/GameClient/MessageStream/MetaEvent.cpp
# Source/GameClient/MessageStream/PlaceEventTranslator.cpp
@@ -823,13 +823,13 @@ set(GAMEENGINE_SRC
Source/GameClient/SelectionInfo.cpp
Source/GameClient/Snow.cpp
Source/GameClient/Statistics.cpp
-# Source/GameClient/System/Anim2D.cpp
+ Source/GameClient/System/Anim2D.cpp
# Source/GameClient/System/CampaignManager.cpp
Source/GameClient/System/Debug/AudioDebugDisplay.cpp
-# Source/GameClient/System/DebugDisplay.cpp
-# Source/GameClient/System/Image.cpp
+ Source/GameClient/System/DebugDisplay.cpp
+ Source/GameClient/System/Image.cpp
Source/GameClient/System/ParticleSys.cpp
-# Source/GameClient/System/RayEffect.cpp
+ Source/GameClient/System/RayEffect.cpp
Source/GameClient/System/Smudge.cpp
Source/GameClient/Terrain/TerrainRoads.cpp
Source/GameClient/Terrain/TerrainVisual.cpp
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h b/Core/GameEngine/Include/GameClient/Anim2D.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h
rename to Core/GameEngine/Include/GameClient/Anim2D.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h b/Core/GameEngine/Include/GameClient/AnimateWindowManager.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
rename to Core/GameEngine/Include/GameClient/AnimateWindowManager.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h b/Core/GameEngine/Include/GameClient/CommandXlat.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h
rename to Core/GameEngine/Include/GameClient/CommandXlat.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarResizer.h b/Core/GameEngine/Include/GameClient/ControlBarResizer.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarResizer.h
rename to Core/GameEngine/Include/GameClient/ControlBarResizer.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h b/Core/GameEngine/Include/GameClient/DebugDisplay.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h
rename to Core/GameEngine/Include/GameClient/DebugDisplay.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Diplomacy.h b/Core/GameEngine/Include/GameClient/Diplomacy.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/Diplomacy.h
rename to Core/GameEngine/Include/GameClient/Diplomacy.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h b/Core/GameEngine/Include/GameClient/DisconnectMenu.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h
rename to Core/GameEngine/Include/GameClient/DisconnectMenu.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h b/Core/GameEngine/Include/GameClient/Display.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/Display.h
rename to Core/GameEngine/Include/GameClient/Display.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DrawableInfo.h b/Core/GameEngine/Include/GameClient/DrawableInfo.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/DrawableInfo.h
rename to Core/GameEngine/Include/GameClient/DrawableInfo.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h b/Core/GameEngine/Include/GameClient/EstablishConnectionsMenu.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/EstablishConnectionsMenu.h
rename to Core/GameEngine/Include/GameClient/EstablishConnectionsMenu.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h b/Core/GameEngine/Include/GameClient/ExtendedMessageBox.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h
rename to Core/GameEngine/Include/GameClient/ExtendedMessageBox.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/FontDesc.h b/Core/GameEngine/Include/GameClient/FontDesc.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/FontDesc.h
rename to Core/GameEngine/Include/GameClient/FontDesc.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GUICommandTranslator.h b/Core/GameEngine/Include/GameClient/GUICommandTranslator.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/GUICommandTranslator.h
rename to Core/GameEngine/Include/GameClient/GUICommandTranslator.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetCheckBox.h b/Core/GameEngine/Include/GameClient/GadgetCheckBox.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/GadgetCheckBox.h
rename to Core/GameEngine/Include/GameClient/GadgetCheckBox.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetComboBox.h b/Core/GameEngine/Include/GameClient/GadgetComboBox.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/GadgetComboBox.h
rename to Core/GameEngine/Include/GameClient/GadgetComboBox.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetListBox.h b/Core/GameEngine/Include/GameClient/GadgetListBox.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/GadgetListBox.h
rename to Core/GameEngine/Include/GameClient/GadgetListBox.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetProgressBar.h b/Core/GameEngine/Include/GameClient/GadgetProgressBar.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/GadgetProgressBar.h
rename to Core/GameEngine/Include/GameClient/GadgetProgressBar.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetPushButton.h b/Core/GameEngine/Include/GameClient/GadgetPushButton.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/GadgetPushButton.h
rename to Core/GameEngine/Include/GameClient/GadgetPushButton.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetRadioButton.h b/Core/GameEngine/Include/GameClient/GadgetRadioButton.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/GadgetRadioButton.h
rename to Core/GameEngine/Include/GameClient/GadgetRadioButton.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetSlider.h b/Core/GameEngine/Include/GameClient/GadgetSlider.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/GadgetSlider.h
rename to Core/GameEngine/Include/GameClient/GadgetSlider.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetStaticText.h b/Core/GameEngine/Include/GameClient/GadgetStaticText.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/GadgetStaticText.h
rename to Core/GameEngine/Include/GameClient/GadgetStaticText.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTabControl.h b/Core/GameEngine/Include/GameClient/GadgetTabControl.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTabControl.h
rename to Core/GameEngine/Include/GameClient/GadgetTabControl.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTextEntry.h b/Core/GameEngine/Include/GameClient/GadgetTextEntry.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTextEntry.h
rename to Core/GameEngine/Include/GameClient/GadgetTextEntry.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameInfoWindow.h b/Core/GameEngine/Include/GameClient/GameInfoWindow.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/GameInfoWindow.h
rename to Core/GameEngine/Include/GameClient/GameInfoWindow.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h b/Core/GameEngine/Include/GameClient/GameWindowID.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h
rename to Core/GameEngine/Include/GameClient/GameWindowID.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowManager.h b/Core/GameEngine/Include/GameClient/GameWindowManager.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowManager.h
rename to Core/GameEngine/Include/GameClient/GameWindowManager.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h b/Core/GameEngine/Include/GameClient/HintSpy.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h
rename to Core/GameEngine/Include/GameClient/HintSpy.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h b/Core/GameEngine/Include/GameClient/HotKey.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h
rename to Core/GameEngine/Include/GameClient/HotKey.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h b/Core/GameEngine/Include/GameClient/Image.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/Image.h
rename to Core/GameEngine/Include/GameClient/Image.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h b/Core/GameEngine/Include/GameClient/KeyDefs.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h
rename to Core/GameEngine/Include/GameClient/KeyDefs.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h b/Core/GameEngine/Include/GameClient/LookAtXlat.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h
rename to Core/GameEngine/Include/GameClient/LookAtXlat.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/MessageBox.h b/Core/GameEngine/Include/GameClient/MessageBox.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/MessageBox.h
rename to Core/GameEngine/Include/GameClient/MessageBox.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h b/Core/GameEngine/Include/GameClient/MetaEvent.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h
rename to Core/GameEngine/Include/GameClient/MetaEvent.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h b/Core/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
rename to Core/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h b/Core/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h
rename to Core/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h b/Core/GameEngine/Include/GameClient/Module/SwayClientUpdate.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h
rename to Core/GameEngine/Include/GameClient/Module/SwayClientUpdate.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h b/Core/GameEngine/Include/GameClient/PlaceEventTranslator.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h
rename to Core/GameEngine/Include/GameClient/PlaceEventTranslator.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h b/Core/GameEngine/Include/GameClient/RayEffect.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h
rename to Core/GameEngine/Include/GameClient/RayEffect.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h b/Core/GameEngine/Include/GameClient/Shadow.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h
rename to Core/GameEngine/Include/GameClient/Shadow.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h b/Core/GameEngine/Include/GameClient/Shell.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h
rename to Core/GameEngine/Include/GameClient/Shell.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ShellHooks.h b/Core/GameEngine/Include/GameClient/ShellHooks.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/ShellHooks.h
rename to Core/GameEngine/Include/GameClient/ShellHooks.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ShellMenuScheme.h b/Core/GameEngine/Include/GameClient/ShellMenuScheme.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/ShellMenuScheme.h
rename to Core/GameEngine/Include/GameClient/ShellMenuScheme.h
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h b/Core/GameEngine/Include/GameClient/WindowXlat.h
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h
rename to Core/GameEngine/Include/GameClient/WindowXlat.h
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp b/Core/GameEngine/Source/GameClient/Display.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp
rename to Core/GameEngine/Source/GameClient/Display.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp b/Core/GameEngine/Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
rename to Core/GameEngine/Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp b/Core/GameEngine/Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
rename to Core/GameEngine/Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp b/Core/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
rename to Core/GameEngine/Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/AnimateWindowManager.cpp b/Core/GameEngine/Source/GameClient/GUI/AnimateWindowManager.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/AnimateWindowManager.cpp
rename to Core/GameEngine/Source/GameClient/GUI/AnimateWindowManager.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp b/Core/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
rename to Core/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp b/Core/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
rename to Core/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp b/Core/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
rename to Core/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp b/Core/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
rename to Core/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp b/Core/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
rename to Core/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp b/Core/GameEngine/Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp
rename to Core/GameEngine/Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/InGameChat.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
similarity index 99%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
index 1e029a562d9..87f585d41ea 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
+++ b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
@@ -550,7 +550,6 @@ void HandleBuddyResponses()
UnicodeString snippet = message.m_message;
snippet.truncateTo(11);
-
UnicodeString s;
s.format(TheGameText->fetch("Buddy:MessageNotification"), nick.str(), snippet.str());
lastNotificationWasStatus = FALSE;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/MessageBox.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ReplayControls.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/ReplayControls.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ReplayControls.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/ReplayControls.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp b/Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
rename to Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp b/Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp
rename to Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetComboBox.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp b/Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
rename to Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp b/Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp
rename to Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp b/Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp
rename to Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp b/Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp
rename to Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetStaticText.cpp b/Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetStaticText.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetStaticText.cpp
rename to Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetStaticText.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTabControl.cpp b/Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetTabControl.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTabControl.cpp
rename to Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetTabControl.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp b/Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp
rename to Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp b/Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
rename to Core/GameEngine/Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp b/Core/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
similarity index 99%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
index 773c22dd94e..2ffe2dab159 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
+++ b/Core/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
@@ -4062,6 +4062,3 @@ GameWindow *GameWindowManagerDummy::winCreateFromScript(AsciiString filenameStri
GameWindowDummy::~GameWindowDummy()
{
}
-
-
-
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp b/Core/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
rename to Core/GameEngine/Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp b/Core/GameEngine/Source/GameClient/GameClientDispatch.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/GameClientDispatch.cpp
rename to Core/GameEngine/Source/GameClient/GameClientDispatch.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp b/Core/GameEngine/Source/GameClient/MessageStream/HotKey.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/HotKey.cpp
rename to Core/GameEngine/Source/GameClient/MessageStream/HotKey.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp b/Core/GameEngine/Source/GameClient/System/Anim2D.cpp
similarity index 99%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp
rename to Core/GameEngine/Source/GameClient/System/Anim2D.cpp
index 0922aba5453..9c458e411bc 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Anim2D.cpp
+++ b/Core/GameEngine/Source/GameClient/System/Anim2D.cpp
@@ -297,7 +297,6 @@ Anim2D::Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem
{
// sanity
DEBUG_ASSERTCRASH( animTemplate != nullptr, ("Anim2D::Anim2D - null template") );
-
m_currentFrame = 0;
// set the template
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp b/Core/GameEngine/Source/GameClient/System/DebugDisplay.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/System/DebugDisplay.cpp
rename to Core/GameEngine/Source/GameClient/System/DebugDisplay.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/Image.cpp b/Core/GameEngine/Source/GameClient/System/Image.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/System/Image.cpp
rename to Core/GameEngine/Source/GameClient/System/Image.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/System/RayEffect.cpp b/Core/GameEngine/Source/GameClient/System/RayEffect.cpp
similarity index 100%
rename from GeneralsMD/Code/GameEngine/Source/GameClient/System/RayEffect.cpp
rename to Core/GameEngine/Source/GameClient/System/RayEffect.cpp
diff --git a/Generals/Code/GameEngine/CMakeLists.txt b/Generals/Code/GameEngine/CMakeLists.txt
index 73b6cc223bf..3efb4fdc0b4 100644
--- a/Generals/Code/GameEngine/CMakeLists.txt
+++ b/Generals/Code/GameEngine/CMakeLists.txt
@@ -128,86 +128,86 @@ set(GAMEENGINE_SRC
# Include/Common/XferDeepCRC.h
# Include/Common/XferLoad.h
# Include/Common/XferSave.h
- Include/GameClient/Anim2D.h
- Include/GameClient/AnimateWindowManager.h
+# Include/GameClient/Anim2D.h
+# Include/GameClient/AnimateWindowManager.h
# Include/GameClient/ChallengeGenerals.h
Include/GameClient/CampaignManager.h
# Include/GameClient/ClientInstance.h
# Include/GameClient/ClientRandomValue.h
# Include/GameClient/Color.h
- Include/GameClient/CommandXlat.h
+# Include/GameClient/CommandXlat.h
Include/GameClient/ControlBar.h
- Include/GameClient/ControlBarResizer.h
+# Include/GameClient/ControlBarResizer.h
Include/GameClient/ControlBarScheme.h
# Include/GameClient/Credits.h
- Include/GameClient/DebugDisplay.h
- Include/GameClient/Diplomacy.h
- Include/GameClient/DisconnectMenu.h
- Include/GameClient/Display.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/Drawable.h
- Include/GameClient/DrawableInfo.h
+# Include/GameClient/DrawableInfo.h
# Include/GameClient/DrawGroupInfo.h
- Include/GameClient/EstablishConnectionsMenu.h
+# Include/GameClient/EstablishConnectionsMenu.h
Include/GameClient/Eva.h
- Include/GameClient/ExtendedMessageBox.h
- Include/GameClient/FontDesc.h
+# Include/GameClient/ExtendedMessageBox.h
+# Include/GameClient/FontDesc.h
# Include/GameClient/FXList.h
Include/GameClient/Gadget.h
- Include/GameClient/GadgetCheckBox.h
- Include/GameClient/GadgetComboBox.h
- Include/GameClient/GadgetListBox.h
- Include/GameClient/GadgetProgressBar.h
- Include/GameClient/GadgetPushButton.h
- Include/GameClient/GadgetRadioButton.h
- Include/GameClient/GadgetSlider.h
- Include/GameClient/GadgetStaticText.h
- Include/GameClient/GadgetTabControl.h
- Include/GameClient/GadgetTextEntry.h
+# Include/GameClient/GadgetCheckBox.h
+# Include/GameClient/GadgetComboBox.h
+# Include/GameClient/GadgetListBox.h
+# Include/GameClient/GadgetProgressBar.h
+# Include/GameClient/GadgetPushButton.h
+# Include/GameClient/GadgetRadioButton.h
+# Include/GameClient/GadgetSlider.h
+# Include/GameClient/GadgetStaticText.h
+# Include/GameClient/GadgetTabControl.h
+# Include/GameClient/GadgetTextEntry.h
Include/GameClient/GameClient.h
# Include/GameClient/GameFont.h
- Include/GameClient/GameInfoWindow.h
+# Include/GameClient/GameInfoWindow.h
# Include/GameClient/GameText.h
# Include/GameClient/GameWindow.h
# Include/GameClient/GameWindowGlobal.h
- Include/GameClient/GameWindowID.h
- Include/GameClient/GameWindowManager.h
+# Include/GameClient/GameWindowID.h
+# Include/GameClient/GameWindowManager.h
# Include/GameClient/GameWindowTransitions.h
# Include/GameClient/GlobalLanguage.h
# Include/GameClient/GraphDraw.h
Include/GameClient/GUICallbacks.h
- Include/GameClient/GUICommandTranslator.h
+# Include/GameClient/GUICommandTranslator.h
# Include/GameClient/HeaderTemplate.h
- Include/GameClient/HintSpy.h
- Include/GameClient/HotKey.h
- Include/GameClient/Image.h
+# Include/GameClient/HintSpy.h
+# Include/GameClient/HotKey.h
+# Include/GameClient/Image.h
# Include/GameClient/IMEManager.h
Include/GameClient/InGameUI.h
# Include/GameClient/Keyboard.h
- Include/GameClient/KeyDefs.h
+# Include/GameClient/KeyDefs.h
# Include/GameClient/LanguageFilter.h
# Include/GameClient/Line2D.h
# Include/GameClient/LoadScreen.h
- Include/GameClient/LookAtXlat.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/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/ParticleSys.h
- Include/GameClient/PlaceEventTranslator.h
+# Include/GameClient/PlaceEventTranslator.h
# Include/GameClient/ProcessAnimateWindow.h
# Include/GameClient/RadiusDecal.h
- Include/GameClient/RayEffect.h
+# Include/GameClient/RayEffect.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/Shadow.h
+# Include/GameClient/Shell.h
+# Include/GameClient/ShellHooks.h
+# Include/GameClient/ShellMenuScheme.h
# Include/GameClient/Statistics.h
# Include/GameClient/TerrainRoads.h
# Include/GameClient/TerrainVisual.h
@@ -216,7 +216,7 @@ set(GAMEENGINE_SRC
# Include/GameClient/Water.h
# Include/GameClient/WindowLayout.h
# Include/GameClient/WindowVideoManager.h
- Include/GameClient/WindowXlat.h
+# Include/GameClient/WindowXlat.h
# Include/GameClient/WinInstanceData.h
Include/GameLogic/AI.h
Include/GameLogic/AIDock.h
@@ -638,111 +638,111 @@ set(GAMEENGINE_SRC
# Source/GameClient/ClientInstance.cpp
# Source/GameClient/Color.cpp
# Source/GameClient/Credits.cpp
- Source/GameClient/Display.cpp
+# Source/GameClient/Display.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/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
+# Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
+# Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
# Source/GameClient/DrawGroupInfo.cpp
Source/GameClient/Eva.cpp
# Source/GameClient/FXList.cpp
Source/GameClient/GameClient.cpp
- Source/GameClient/GameClientDispatch.cpp
+# Source/GameClient/GameClientDispatch.cpp
# Source/GameClient/GameText.cpp
# Source/GameClient/GlobalLanguage.cpp
# Source/GameClient/GraphDraw.cpp
- Source/GameClient/GUI/AnimateWindowManager.cpp
+# Source/GameClient/GUI/AnimateWindowManager.cpp
# Source/GameClient/GUI/ChallengeGenerals.cpp
Source/GameClient/GUI/ControlBar/ControlBar.cpp
Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp
Source/GameClient/GUI/ControlBar/ControlBarCommandProcessing.cpp
- Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
- Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
+# Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
+# Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
Source/GameClient/GUI/ControlBar/ControlBarOCLTimer.cpp
- Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
- Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
+# Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
+# Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp
- Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
+# Source/GameClient/GUI/ControlBar/ControlBarUnderConstruction.cpp
Source/GameClient/GUI/DisconnectMenu/DisconnectMenu.cpp
- Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp
- Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
- Source/GameClient/GUI/Gadget/GadgetComboBox.cpp
- Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
- Source/GameClient/GUI/Gadget/GadgetListBox.cpp
- Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp
+# Source/GameClient/GUI/EstablishConnectionsMenu/EstablishConnectionsMenu.cpp
+# Source/GameClient/GUI/Gadget/GadgetCheckBox.cpp
+# Source/GameClient/GUI/Gadget/GadgetComboBox.cpp
+# Source/GameClient/GUI/Gadget/GadgetHorizontalSlider.cpp
+# Source/GameClient/GUI/Gadget/GadgetListBox.cpp
+# Source/GameClient/GUI/Gadget/GadgetProgressBar.cpp
Source/GameClient/GUI/Gadget/GadgetPushButton.cpp
- Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp
- Source/GameClient/GUI/Gadget/GadgetStaticText.cpp
- Source/GameClient/GUI/Gadget/GadgetTabControl.cpp
- Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp
- Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
+# Source/GameClient/GUI/Gadget/GadgetRadioButton.cpp
+# Source/GameClient/GUI/Gadget/GadgetStaticText.cpp
+# 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/GameWindowManager.cpp
+# Source/GameClient/GUI/GameWindowManager.cpp
Source/GameClient/GUI/GameWindowManagerScript.cpp
# Source/GameClient/GUI/GameWindowTransitions.cpp
Source/GameClient/GUI/GameWindowTransitionsStyles.cpp
Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
- Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp
- Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp
- Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp
- Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp
- Source/GameClient/GUI/GUICallbacks/InGameChat.cpp
- Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp
+# Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp
+# Source/GameClient/GUI/GUICallbacks/ExtendedMessageBox.cpp
+# Source/GameClient/GUI/GUICallbacks/GeneralsExpPoints.cpp
+# Source/GameClient/GUI/GUICallbacks/IMECandidate.cpp
+# Source/GameClient/GUI/GUICallbacks/InGameChat.cpp
+# Source/GameClient/GUI/GUICallbacks/InGamePopupMessage.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/CreditsMenu.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/DifficultySelect.cpp
Source/GameClient/GUI/GUICallbacks/Menus/DisconnectWindow.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/EstablishConnectionsWindow.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/KeyboardOptionsMenu.cpp
Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp
Source/GameClient/GUI/GUICallbacks/Menus/MainMenu.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/MapSelectMenu.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/NetworkDirectConnect.cpp
Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/PopupCommunicator.cpp
Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/PopupLadderSelect.cpp
Source/GameClient/GUI/GUICallbacks/Menus/PopupPlayerInfo.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp
Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/QuitMenu.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/SinglePlayerMenu.cpp
Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp
Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/WOLCustomScoreScreen.cpp
Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/WOLLadderScreen.cpp
Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/WOLLocaleSelectPopup.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/WOLLoginMenu.cpp
Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/WOLMessageWindow.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/WOLQMScoreScreen.cpp
Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
- Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp
+# Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp
Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp
- Source/GameClient/GUI/GUICallbacks/MessageBox.cpp
- Source/GameClient/GUI/GUICallbacks/ReplayControls.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/Shell/Shell.cpp
- Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
+# Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
# Source/GameClient/GUI/WindowLayout.cpp
# Source/GameClient/GUI/WindowVideoManager.cpp
# Source/GameClient/GUI/WinInstanceData.cpp
@@ -755,7 +755,7 @@ set(GAMEENGINE_SRC
Source/GameClient/MessageStream/CommandXlat.cpp
Source/GameClient/MessageStream/GUICommandTranslator.cpp
Source/GameClient/MessageStream/HintSpy.cpp
- Source/GameClient/MessageStream/HotKey.cpp
+# Source/GameClient/MessageStream/HotKey.cpp
Source/GameClient/MessageStream/LookAtXlat.cpp
Source/GameClient/MessageStream/MetaEvent.cpp
Source/GameClient/MessageStream/PlaceEventTranslator.cpp
@@ -764,13 +764,13 @@ set(GAMEENGINE_SRC
# Source/GameClient/RadiusDecal.cpp
# Source/GameClient/SelectionInfo.cpp
# Source/GameClient/Statistics.cpp
- Source/GameClient/System/Anim2D.cpp
+# Source/GameClient/System/Anim2D.cpp
Source/GameClient/System/CampaignManager.cpp
# "Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp"
- Source/GameClient/System/DebugDisplay.cpp
- Source/GameClient/System/Image.cpp
+# Source/GameClient/System/DebugDisplay.cpp
+# Source/GameClient/System/Image.cpp
# Source/GameClient/System/ParticleSys.cpp
- Source/GameClient/System/RayEffect.cpp
+# Source/GameClient/System/RayEffect.cpp
# Source/GameClient/Terrain/TerrainRoads.cpp
# Source/GameClient/Terrain/TerrainVisual.cpp
# Source/GameClient/VideoPlayer.cpp
diff --git a/Generals/Code/GameEngine/Include/GameClient/Anim2D.h b/Generals/Code/GameEngine/Include/GameClient/Anim2D.h
deleted file mode 100644
index fc19631f91f..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/Anim2D.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Anim2D.h /////////////////////////////////////////////////////////////////////////////////
-// Author: Colin Day, July 2002
-// Desc: A collection of 2D images to make animation
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Common/Snapshot.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
-class Anim2DCollection;
-class Image;
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-enum Anim2DMode CPP_11(: Int)
-{
-
- ANIM_2D_INVALID = 0,
- ANIM_2D_ONCE,
- ANIM_2D_ONCE_BACKWARDS,
- ANIM_2D_LOOP,
- ANIM_2D_LOOP_BACKWARDS,
- ANIM_2D_PING_PONG,
- ANIM_2D_PING_PONG_BACKWARDS,
- // dont' forget to add new animation mode names to Anim2DModeNames[] below
-
- ANIM_2D_NUM_MODES
-
-};
-#ifdef DEFINE_ANIM_2D_MODE_NAMES
-static const char *const Anim2DModeNames[] =
-{
- "NONE",
- "ONCE",
- "ONCE_BACKWARDS",
- "LOOP",
- "LOOP_BACKWARDS",
- "PING_PONG",
- "PING_PONG_BACKWARDS",
- nullptr
-};
-static_assert(ARRAY_SIZE(Anim2DModeNames) == ANIM_2D_NUM_MODES + 1, "Incorrect array size");
-#endif
-
-// ------------------------------------------------------------------------------------------------
-/** A template of a 2D animation */
-// ------------------------------------------------------------------------------------------------
-class Anim2DTemplate : public MemoryPoolObject
-{
- MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(Anim2DTemplate, "Anim2DTemplate")
-public:
-
- Anim2DTemplate( AsciiString name );
- //virtual ~Anim2DTemplate();
-
- AsciiString getName() const { return m_name; }
- const Image *getFrame( UnsignedShort frameNumber ) const;
- UnsignedShort getNumFrames() const { return m_numFrames; }
- UnsignedShort getNumFramesBetweenUpdates() const { return m_framesBetweenUpdates; }
- Anim2DMode getAnimMode() const { return m_animMode; }
- Bool isRandomizedStartFrame() const { return m_randomizeStartFrame; }
-
- // list access for use by the Anim2DCollection only
- void friend_setNextTemplate( Anim2DTemplate *animTemplate ) { m_nextTemplate = animTemplate; }
- Anim2DTemplate *friend_getNextTemplate() const { return m_nextTemplate; };
-
- // INI methods
- const FieldParse *getFieldParse() const { return s_anim2DFieldParseTable; }
- void storeImage( const Image *image ); ///< store image in next available slot
- void allocateImages( UnsignedShort numFrames ); ///< allocate the array of image pointers to use
-
-protected:
-
- static void parseImage( INI *ini, void *instance, void *store, const void *userData );
- static void parseNumImages( INI *ini, void *instance, void *store, const void *userData );
- static void parseImageSequence( INI *ini, void *instance, void *store, const void *userData );
-
-protected:
- enum { NUM_FRAMES_INVALID = 0 }; ///< initialization value for num frames
-
- Anim2DTemplate* m_nextTemplate; ///< next animation in collections animation list
- AsciiString m_name; ///< name of this 2D animation
- const Image** m_images; ///< array of image pointers that make up this animation
- UnsignedShort m_numFrames; ///< total number of frames in this animation
- UnsignedShort m_framesBetweenUpdates; ///< frames between frame updates
- Anim2DMode m_animMode; ///< the animation mode
- Bool m_randomizeStartFrame; ///< randomize animation instance start frames
-
-protected:
- static const FieldParse s_anim2DFieldParseTable[]; ///< the parse table for INI definition
-
-};
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-enum Anim2DStatus CPP_11(: Int)
-{
- ANIM_2D_STATUS_NONE = 0x00,
- ANIM_2D_STATUS_FROZEN = 0x01,
- ANIM_2D_STATUS_REVERSED = 0x02, // used for ping pong direction tracking
- ANIM_2D_STATUS_COMPLETE = 0x04, // set when uni-directional things reach their last frame
-};
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-class Anim2D : public MemoryPoolObject,
- public Snapshot
-{
-
-friend class Anim2DCollection;
-
- MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE( Anim2D, "Anim2D" );
-
-public:
-
- Anim2D( Anim2DTemplate *animTemplate, Anim2DCollection *collectionSystem );
- // virtual destructor prototype provided by memory pool object
-
- UnsignedShort getCurrentFrame() const { return m_currentFrame; } ///< get our current frame #
- void setCurrentFrame( UnsignedShort frame ); ///< set the current frame #
- void randomizeCurrentFrame(); ///< randomize the current frame #
- void reset(); ///< reset the current frame to the "start"
- void setStatus( UnsignedByte statusBits ); ///< set status bit(s)
- void clearStatus( UnsignedByte statusBits ); ///< clear status bit(s)
- UnsignedByte getStatus() const { return m_status; } ///< return status bits(s)
- void setAlpha( Real alpha ) { m_alpha = alpha; } ///< set alpha value
- Real getAlpha() const { return m_alpha; } ///< return the current alpha value
-
- //Allows you to play a segment of an animation.
- void setMinFrame( UnsignedShort frame ) { m_minFrame = frame; }
- void setMaxFrame( UnsignedShort frame ) { m_maxFrame = frame; }
-
- // info about the size of the current frame
- UnsignedInt getCurrentFrameWidth() const; ///< return natural width of image in the current frame
- UnsignedInt getCurrentFrameHeight() const; ///< return natural height of image in the current frame
- const Anim2DTemplate *getAnimTemplate() const { return m_template; } ///< return our template
-
- void draw( Int x, Int y ); ///< draw image at location using natural width/height
- void draw( Int x, Int y, Int width, Int height ); ///< draw image at location using forced width/height
-
-protected:
-
- // snapshot methods
- virtual void crc( Xfer *xfer ) override { }
- virtual void xfer( Xfer *xfer ) override;
- virtual void loadPostProcess() override { }
-
- void tryNextFrame(); ///< we've just drawn ... try to update our frame if necessary
-
- UnsignedShort m_currentFrame; ///< current frame of our animation
- UnsignedInt m_lastUpdateFrame; ///< last frame we updated on
- Anim2DTemplate *m_template; ///< pointer back to the template that defines this animation
- UnsignedByte m_status; ///< status bits (see Anim2DStatus)
- UnsignedShort m_minFrame; ///< min animation frame used inclusively.
- UnsignedShort m_maxFrame; ///< max animation frame used inclusively.
- UnsignedInt m_framesBetweenUpdates; ///< duration between each frame.
- Real m_alpha;
-
- Anim2DCollection *m_collectionSystem; ///< system collection (if any) we're registered with
- Anim2D *m_collectionSystemNext; ///< system instance tracking list
- Anim2D *m_collectionSystemPrev; ///< system instance tracking list
-
-};
-
-// ------------------------------------------------------------------------------------------------
-// ------------------------------------------------------------------------------------------------
-class Anim2DCollection : public SubsystemInterface
-{
-
-public:
-
- Anim2DCollection();
- virtual ~Anim2DCollection() override;
-
- virtual void init() override; ///< initialize system
- virtual void reset() override { }; ///< reset system
- virtual void update() override; ///< update system
-
- Anim2DTemplate *findTemplate( const AsciiString& name ); ///< find animation template
- Anim2DTemplate *newTemplate( const AsciiString& name ); ///< allocate a new template to be loaded
-
- void registerAnimation( Anim2D *anim ); ///< register animation with system
- void unRegisterAnimation( Anim2D *anim ); ///< un-register animation from system
-
- Anim2DTemplate* getTemplateHead() const { return m_templateList; }
- Anim2DTemplate* getNextTemplate( Anim2DTemplate *animTemplate ) const;
-
-protected:
-
- Anim2DTemplate *m_templateList; ///< list of available animation templates
- Anim2D *m_instanceList; ///< list of all the anim 2D instance we're tracking
-
-};
-
-// EXTERNALS //////////////////////////////////////////////////////////////////////////////////////
-extern Anim2DCollection *TheAnim2DCollection;
diff --git a/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h b/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
deleted file mode 100644
index aad9e80b7a2..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: AnimateWindowManager.h /////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//
-// Electronic Arts Pacific.
-//
-// Confidential Information
-// Copyright (C) 2002 - All Rights Reserved
-//
-//-----------------------------------------------------------------------------
-//
-// created: Mar 2002
-//
-// Filename: AnimateWindowManager.h
-//
-// author: Chris Huybregts
-//
-// purpose: The Animate Window class will be used by registering a window with
-// the manager with stating what kind of animation to do. Then on every
-// update, we'll move the windows.
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-//-----------------------------------------------------------------------------
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// USER INCLUDES //////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-#include "Lib/BaseType.h"
-#include "Common/SubsystemInterface.h"
-#include "Common/GameMemory.h"
-
-//-----------------------------------------------------------------------------
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-class GameWindow;
-class ProcessAnimateWindowSlideFromBottom;
-class ProcessAnimateWindowSlideFromBottomTimed;
-class ProcessAnimateWindowSlideFromTop;
-class ProcessAnimateWindowSlideFromLeft;
-class ProcessAnimateWindowSlideFromRight;
-class ProcessAnimateWindowSlideFromRightFast;
-class ProcessAnimateWindowSpiral;
-class ProcessAnimateWindowSlideFromTopFast;
-class ProcessAnimateWindowSideSelect;
-class ProcessAnimateWindow;
-
-//-----------------------------------------------------------------------------
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-enum AnimTypes CPP_11(: Int)
-{
- WIN_ANIMATION_NONE = 0,
- WIN_ANIMATION_SLIDE_RIGHT,
- WIN_ANIMATION_SLIDE_RIGHT_FAST,
- WIN_ANIMATION_SLIDE_LEFT,
- WIN_ANIMATION_SLIDE_TOP,
- WIN_ANIMATION_SLIDE_BOTTOM,
- WIN_ANIMATION_SPIRAL,
- WIN_ANIMATION_SLIDE_BOTTOM_TIMED,
- WIN_ANIMATION_SLIDE_TOP_FAST,
- WIN_ANIMATION_COUNT
-} ;
-
-//-----------------------------------------------------------------------------
-// TheSuperHackers @build xezon 14/03/2025 Puts class into namespace to avoid name collision with AnimateWindow function in WinUser.h
-namespace wnd
-{
-class AnimateWindow : public MemoryPoolObject
-{
- MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(AnimateWindow, "AnimateWindow")
-public:
- AnimateWindow();
- //~AnimateWindow();
-
- static AnimateWindow* createNewInstance()
- {
- return newInstance(AnimateWindow);
- }
-
- void setAnimData( ICoord2D startPos, ICoord2D endPos, ICoord2D curPos, ICoord2D restPos, Coord2D vel, UnsignedInt startTime, UnsignedInt endTime);
-
- ICoord2D getStartPos(); ///< Get the Start Position 2D coord
- ICoord2D getCurPos(); ///< Get the Current Position 2D coord
- ICoord2D getEndPos(); ///< Get the End Position 2D coord
- ICoord2D getRestPos(); ///< Get the Rest Position 2D coord
- GameWindow *getGameWindow(); ///< Get the GameWindow that will be animating
- AnimTypes getAnimType(); ///< Get the Animation type
- UnsignedInt getDelay(); ///< Get the Time Delay
- Coord2D getVel(); ///< Get the Velocity Position 2D coord
- UnsignedInt getStartTime(); ///< Get the start time of the time-based anim
- UnsignedInt getEndTime(); ///< Get the end time of the time-based anim
-
- void setStartPos( ICoord2D starPos); ///< Set the Start Position 2D coord
- void setCurPos( ICoord2D curPos); ///< Set the Current Position 2D coord
- void setEndPos( ICoord2D endPos); ///< Set the End Position 2D coord
- void setRestPos( ICoord2D restPos); ///< Set the Rest Position 2D coord
- void setGameWindow( GameWindow *win); ///< Set the GameWindow that will be animating
- void setAnimType( AnimTypes animType); ///< Set the Animation type
- void setDelay( UnsignedInt delay); ///< Set the Time Delay
- void setVel( Coord2D vel); ///< Set the Velocity Position 2D coord
- void setStartTime( UnsignedInt t); ///< Set the start time of the time-based anim
- void setEndTime( UnsignedInt t); ///< Set the end time of the time-based anim
-
- void setFinished(Bool finished); ///< Set if the animation has finished
- Bool isFinished(); ///< Return if the animation has finished or not.
- void setNeedsToFinish( Bool needsToFinish); ///< set if we need this animation to finish for the manager to return true
- Bool needsToFinish(); ///< set if the animation has finished
-
-private:
- UnsignedInt m_delay; ///< Holds the delay time in which the animation will start (in milliseconds)
- ICoord2D m_startPos; ///< Holds the starting position of the animation
- ///<(usually is also the end position of the animation when the animation is reversed)
- ICoord2D m_endPos; ///< Holds the target End Position (usually is the same as the rest position)
- ICoord2D m_curPos; ///< It's Current Position
- ICoord2D m_restPos; ///< When the Manager Resets, It sets the window's position to this position
- GameWindow *m_win; ///< the window that this animation is happening on
- Coord2D m_vel; ///< the Velocity of the animation
- UnsignedInt m_startTime; ///< time we started the time-based anim
- UnsignedInt m_endTime; ///< time we should end the time-based anim
- AnimTypes m_animType; ///< The type of animation that will happen
- Bool m_needsToFinish; ///< Flag to tell the manager if we need to finish before it's done with it's animation
- Bool m_isFinished; ///< We're finished
-};
-} // namespace wnd
-
-
-
-//-----------------------------------------------------------------------------
-typedef std::list AnimateWindowList;
-
-//-----------------------------------------------------------------------------
-class AnimateWindowManager : public SubsystemInterface
-{
-public:
- AnimateWindowManager();
- virtual ~AnimateWindowManager() override;
-
- // Inhertited from subsystem ====================================================================
- virtual void init() override;
- virtual void reset() override;
- virtual void update() override;
- //===============================================================================================
-
- void registerGameWindow(GameWindow *win, AnimTypes animType, Bool needsToFinish, UnsignedInt ms = 0, UnsignedInt delayMs = 0); // Registers a new window to animate.
- Bool isFinished(); ///< Are all the animations that need to be finished, finished?
- void reverseAnimateWindow(); ///< tell each animation type to setup the windows to run in reverse
- void resetToRestPosition(); ///< Reset all windows to their rest position
- Bool isReversed(); ///< Returns whether or not we're in our reversed state.
- Bool isEmpty();
-private:
- AnimateWindowList m_winList; ///< A list of AnimationWindows that we don't care if their finished animating
- AnimateWindowList m_winMustFinishList; ///< A list of AnimationWindows that we do care about
- Bool m_needsUpdate; ///< If we're done animating all our monitored windows, then this will be false
- Bool m_reverse; ///< Are we in a reverse state?
- ProcessAnimateWindowSlideFromRight *m_slideFromRight; ///< Holds the process in which the windows slide from the right
- ProcessAnimateWindowSlideFromRightFast *m_slideFromRightFast;
- ProcessAnimateWindowSlideFromTop *m_slideFromTop; ///< Holds the process in which the windows slide from the Top
- ProcessAnimateWindowSlideFromLeft *m_slideFromLeft; ///< Holds the process in which the windows slide from the Left
- ProcessAnimateWindowSlideFromBottom *m_slideFromBottom; ///< Holds the process in which the windows slide from the Bottom
- ProcessAnimateWindowSpiral *m_spiral; ///< Holds the process in which the windows Spiral onto the screen
- ProcessAnimateWindowSlideFromBottomTimed *m_slideFromBottomTimed; ///< Holds the process in which the windows slide from the Bottom in a time-based fashion
- ProcessAnimateWindowSlideFromTopFast *m_slideFromTopFast; ///< holds the process in wich the windows slide from the top,fast
- ProcessAnimateWindow *getProcessAnimate( AnimTypes animType); ///< returns the process for the kind of animation we need.
-
-};
-
-//-----------------------------------------------------------------------------
-// INLINING ///////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-namespace wnd
-{
- inline ICoord2D AnimateWindow::getStartPos() { return m_startPos; };
- inline ICoord2D AnimateWindow::getCurPos() { return m_curPos; };
- inline ICoord2D AnimateWindow::getEndPos() { return m_endPos; };
- inline ICoord2D AnimateWindow::getRestPos() { return m_restPos; };
- inline GameWindow *AnimateWindow::getGameWindow(){ return m_win; };
- inline AnimTypes AnimateWindow::getAnimType() { return m_animType; };
- inline UnsignedInt AnimateWindow::getDelay() { return m_delay; };
- inline Coord2D AnimateWindow::getVel() { return m_vel; };
- inline UnsignedInt AnimateWindow::getStartTime() { return m_startTime; };
- inline UnsignedInt AnimateWindow::getEndTime() { return m_endTime; };
-
- inline void AnimateWindow::setStartPos( ICoord2D startPos) { m_startPos = startPos; };
- inline void AnimateWindow::setCurPos( ICoord2D curPos) { m_curPos = curPos; };
- inline void AnimateWindow::setEndPos( ICoord2D endPos) { m_endPos = endPos; };
- inline void AnimateWindow::setRestPos( ICoord2D restPos) { m_restPos = restPos; };
- inline void AnimateWindow::setGameWindow( GameWindow *win) { m_win = win; };
- inline void AnimateWindow::setAnimType( AnimTypes animType) { m_animType = animType; };
- inline void AnimateWindow::setDelay( UnsignedInt delay) { m_delay = delay; };
- inline void AnimateWindow::setVel( Coord2D vel) { m_vel = vel; };
- inline void AnimateWindow::setStartTime( UnsignedInt t ) { m_startTime = t; }
- inline void AnimateWindow::setEndTime( UnsignedInt t ) { m_endTime = t; }
-
- inline void AnimateWindow::setFinished( Bool finished) { m_isFinished = finished; };
- inline Bool AnimateWindow::isFinished() { return m_isFinished; };
- inline void AnimateWindow::setNeedsToFinish( Bool needsToFinish) { m_needsToFinish = needsToFinish; };
- inline Bool AnimateWindow::needsToFinish() { return m_needsToFinish; };
-} // namespace wnd
-
- inline Bool AnimateWindowManager::isFinished() { return !m_needsUpdate; };
- inline Bool AnimateWindowManager::isReversed() { return m_reverse; };
- inline Bool AnimateWindowManager::isEmpty(){return (m_winList.empty() && m_winMustFinishList.empty()); }
-//-----------------------------------------------------------------------------
-// EXTERNALS //////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h b/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h
deleted file mode 100644
index fec363bbc59..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: CommandXlat.h ///////////////////////////////////////////////////////////
-// Author: Steven Johnson, Dec 2001
-
-#pragma once
-
-#include "GameClient/InGameUI.h"
-
-enum GUICommandType CPP_11(: Int);
-
-//-----------------------------------------------------------------------------
-class CommandTranslator : public GameMessageTranslator
-{
-public:
-
- CommandTranslator();
- virtual ~CommandTranslator() override;
-
- enum CommandEvaluateType { DO_COMMAND, DO_HINT, EVALUATE_ONLY };
-
-
- GameMessage::Type evaluateForceAttack( Drawable *draw, const Coord3D *pos, CommandEvaluateType type );
- GameMessage::Type evaluateContextCommand( Drawable *draw, const Coord3D *pos, CommandEvaluateType type );
-
-private:
-
- Int m_objective;
- Bool m_teamExists; ///< is there a currently selected "team"?
-
- // these are for determining if a drag occurred or it was just a sloppy click
- ICoord2D m_mouseRightDragAnchor; // the location of a possible mouse drag start
- ICoord2D m_mouseRightDragLift; // the location of a possible mouse drag end
- UnsignedInt m_mouseRightDown; // when the mouse down happened
- UnsignedInt m_mouseRightUp; // when the mouse up happened
-
- GameMessage::Type createMoveToLocationMessage( Drawable *draw, const Coord3D *dest, CommandEvaluateType commandType );
- GameMessage::Type createAttackMessage( Drawable *draw, Drawable *other, CommandEvaluateType commandType );
- GameMessage::Type createEnterMessage( Drawable *enter, CommandEvaluateType commandType );
- GameMessage::Type issueMoveToLocationCommand( const Coord3D *pos, Drawable *drawableInWay, CommandEvaluateType commandType );
- GameMessage::Type issueAttackCommand( Drawable *target, CommandEvaluateType commandType, GUICommandType command = (GUICommandType)0 );
- GameMessage::Type issueSpecialPowerCommand( const CommandButton *command, CommandEvaluateType commandType, Drawable *target, const Coord3D *pos, Object* ignoreSelObj );
- GameMessage::Type issueFireWeaponCommand( const CommandButton *command, CommandEvaluateType commandType, Drawable *target, const Coord3D *pos );
- GameMessage::Type issueCombatDropCommand( const CommandButton *command, CommandEvaluateType commandType, Drawable *target, const Coord3D *pos );
-
- virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override;
-};
-
-
-enum FilterTypes CPP_11(: Int)
-{
- FT_NULL_FILTER=0,
- // The following are screen filter shaders, that modify the rendered viewport after it is drawn.
- FT_VIEW_BW_FILTER, //filter to apply a black & white filter to the screen.
- FT_VIEW_MOTION_BLUR_FILTER, //filter to apply motion blur filter to screen.
- FT_VIEW_CROSSFADE, ///.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: ControlBarResizer.h /////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//
-// Electronic Arts Pacific.
-//
-// Confidential Information
-// Copyright (C) 2002 - All Rights Reserved
-//
-//-----------------------------------------------------------------------------
-//
-// created: Sep 2002
-//
-// Filename: ControlBarResizer.h
-//
-// author: Chris Huybregts
-//
-// purpose:
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-//-----------------------------------------------------------------------------
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// USER INCLUDES //////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-class ResizerWindow
-{
-public:
-ResizerWindow();
- AsciiString m_name;
- ICoord2D m_defaultSize;
- ICoord2D m_defaultPos;
- ICoord2D m_altSize;
- ICoord2D m_altPos;
-};
-
-class ControlBarResizer
-{
-public:
- ControlBarResizer();
- ~ControlBarResizer();
-
- void init();
-
- // parse Functions for the INI file
- const FieldParse *getFieldParse() const { return m_controlBarResizerParseTable; } ///< returns the parsing fields
- static const FieldParse m_controlBarResizerParseTable[]; ///< the parse table
-
- ResizerWindow *findResizerWindow( AsciiString name ); ///< attempt to find the control bar scheme by it's name
- ResizerWindow *newResizerWindow( AsciiString name ); ///< create a new control bar scheme and return it.
-
- void sizeWindowsDefault();
- void sizeWindowsAlt();
-
- typedef std::list< ResizerWindow *> ResizerWindowList;
- ResizerWindowList m_resizerWindowsList;
-
-};
-//-----------------------------------------------------------------------------
-// INLINING ///////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// EXTERNALS //////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h b/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h
deleted file mode 100644
index f9137491d8f..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-//----------------------------------------------------------------------------
-//
-// Westwood Studios Pacific.
-//
-// Confidential Information
-// Copyright (C) 2001 - All Rights Reserved
-//
-//----------------------------------------------------------------------------
-//
-// Project: Generals
-//
-// Module: Debug
-//
-// File name: GameClient/DebugDisplay.h
-//
-// Created: 11/13/01 TR
-//
-//----------------------------------------------------------------------------
-
-#pragma once
-
-//----------------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------------
-
-#include "Lib/BaseType.h"
-#include
-
-
-//----------------------------------------------------------------------------
-// Forward References
-//----------------------------------------------------------------------------
-
-
-
-//----------------------------------------------------------------------------
-// Type Defines
-//----------------------------------------------------------------------------
-
-
-//===============================
-// DebugDisplayInterface
-//===============================
-
-class DebugDisplayInterface
-{
-
- public:
-
- enum Color
- {
- WHITE,
- BLACK,
- YELLOW,
- RED,
- GREEN,
- BLUE,
- };
-
- virtual ~DebugDisplayInterface() {};
-
- virtual void printf( const Char *format, ...) = 0; ///< Print formatted text at current cursor position
- virtual void setCursorPos( Int x, Int y ) = 0; ///< Set new cursor position
- virtual Int getCursorXPos() = 0; ///< Get current X position of cursor
- virtual Int getCursorYPos() = 0; ///< Get current Y position of cursor
- virtual Int getWidth() = 0; ///< Get character width of display
- virtual Int getHeight() = 0; ///< Get character height of display
- virtual void setTextColor( Color color ) = 0; ///< Set text color
- virtual void setRightMargin( Int rightPos ) = 0; ///< Set right margin position
- virtual void setLeftMargin( Int leftPos ) = 0; ///< Set left margin position
- virtual void reset() = 0; ///< Reset back to default settings
-
- protected:
-
- virtual void drawText( Int x, Int y, Char *text ) = 0; ///< Render null ternimated string at current cursor position
-};
-
-
-//===============================
-// DebugDisplay
-//===============================
-
-class DebugDisplay : public DebugDisplayInterface
-{
-
- public:
-
- DebugDisplay();
- virtual ~DebugDisplay() override {};
-
- virtual void printf( const Char *format, ...) override; ///< Print formatted text at current cursor position
- virtual void setCursorPos( Int x, Int y ) override; ///< Set new cursor position
- virtual Int getCursorXPos() override; ///< Get current X position of cursor
- virtual Int getCursorYPos() override; ///< Get current Y position of cursor
- virtual Int getWidth() override; ///< Get character width of display
- virtual Int getHeight() override; ///< Get character height of display
- virtual void setTextColor( Color color ) override; ///< set text color
- virtual void setRightMargin( Int rightPos ) override; ///< set right margin position
- virtual void setLeftMargin( Int leftPos ) override; ///< set left margin position
- virtual void reset() override; ///< Reset back to default settings
-
- protected:
-
- Color m_textColor; ///< Color to render text in
- Int m_xPos; ///< Current X position of cursor
- Int m_yPos; ///< Current Y position of cursor
- Int m_width; ///< Character width of display
- Int m_height; ///< Character height of display
- Int m_rightMargin;///< Right margin position
- Int m_leftMargin; ///< Left margin position
-
-};
-
-// displayers
-
-#if defined(RTS_DEBUG)
-extern void AudioDebugDisplay( DebugDisplayInterface *debugDisplay, void *userData, FILE *fp );
-#endif
-
-
-//----------------------------------------------------------------------------
-// Inlining
-//----------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h b/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h
deleted file mode 100644
index 7f2aa04f987..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Diplomacy.h /////////////////////////////////////////////////////////////////////////////
-// Author: Matthew D. Campbell, Sept 2002
-//////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-void PopulateInGameDiplomacyPopup();
-void UpdateDiplomacyBriefingText(AsciiString newText, Bool clear);
-
-typedef std::list BriefingList;
-BriefingList* GetBriefingTextList();
diff --git a/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h b/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h
deleted file mode 100644
index 81451f7b9a8..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "GameNetwork/DisconnectManager.h"
-
-enum DisconnectMenuStateType CPP_11(: Int) {
- DISCONNECTMENUSTATETYPE_SCREENON,
- DISCONNECTMENUSTATETYPE_SCREENOFF
-};
-
-class DisconnectMenu {
-public:
- DisconnectMenu();
- virtual ~DisconnectMenu();
-
- void init();
-
- void attachDisconnectManager(DisconnectManager *disconnectManager);
-
- void showScreen();
- void hideScreen();
- Bool isScreenVisible() { return m_menuState == DISCONNECTMENUSTATETYPE_SCREENON; }
-
- void showPlayerControls(Int slot);
- void hidePlayerControls(Int slot);
- void showPacketRouterTimeout();
- void hidePacketRouterTimeout();
-
- void setPlayerName(Int playerNum, UnicodeString name);
- void setPlayerTimeoutTime(Int playerNum, time_t newTime);
- void setPacketRouterTimeoutTime(time_t newTime);
-
- void sendChat(UnicodeString text);
- void showChat(UnicodeString text);
-
- void quitGame();
- void removePlayer(Int slot, UnicodeString playerName);
- void voteForPlayer(Int slot);
- void updateVotes(Int slot, Int votes);
-
-protected:
- DisconnectManager *m_disconnectManager; ///< For retrieving status updates from the disconnect manager.
- DisconnectMenuStateType m_menuState; ///< The current state of the menu screen.
-
- static const char *const m_playerNameTextControlNames[MAX_SLOTS]; ///< names of the player name controls in the window.
- static const char *const m_playerTimeoutTextControlNames[MAX_SLOTS]; ///< names of the timeout controls in the window.
- static const char *const m_playerVoteButtonControlNames[MAX_SLOTS]; ///< names of the vote button controls in the window.
- static const char *const m_playerVoteCountControlNames[MAX_SLOTS]; ///< names of the vote count static text controls in the window.
- static const char *const m_packetRouterTimeoutControlName; ///< name of the packet router timeout control window.
- static const char *const m_packetRouterTimeoutLabelControlName; ///< name of the packet router timeout label control window.
- static const char *const m_textDisplayControlName; ///< name of the text display listbox control window.
-};
-
-extern DisconnectMenu *TheDisconnectMenu;
diff --git a/Generals/Code/GameEngine/Include/GameClient/Display.h b/Generals/Code/GameEngine/Include/GameClient/Display.h
deleted file mode 100644
index dab09f09c1a..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/Display.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Display.h ////////////////////////////////////////////////////////////
-// The graphics display singleton
-// Author: Michael S. Booth, March 2001
-
-#pragma once
-
-#include "Common/SubsystemInterface.h"
-#include "GameClient/Color.h"
-#include "GameClient/GameFont.h"
-#include "GameClient/View.h"
-
-struct ShroudLevel
-{
- Short m_currentShroud; ///< A Value of 1 means shrouded. 0 is not. Negative is the count of people looking.
- Short m_activeShroudLevel;///< A Value of 0 means passive shroud. Positive is the count of people shrouding.
-};
-
-class VideoBuffer;
-class VideoStreamInterface;
-class DebugDisplayInterface;
-class Radar;
-class Image;
-class DisplayString;
-enum StaticGameLODLevel CPP_11(: Int);
-/**
- * The Display class implements the Display interface
- */
-class Display : public SubsystemInterface
-{
-
-public:
- enum DrawImageMode
- {
- DRAW_IMAGE_SOLID,
- DRAW_IMAGE_GRAYSCALE, //draw image without blending and ignoring alpha
- DRAW_IMAGE_ALPHA, //alpha blend the image into frame buffer
- DRAW_IMAGE_ADDITIVE //additive blend the image into frame buffer
- };
-
- typedef void (DebugDisplayCallback)( DebugDisplayInterface *debugDisplay, void *userData, FILE *fp );
-
- Display();
- virtual ~Display() override;
-
- virtual void init() override { }; ///< Initialize
- virtual void reset() override; ///< Reset system
- virtual void update() override; ///< Update system
-
- //---------------------------------------------------------------------------------------
- // Display attribute methods
- virtual void setWidth( UnsignedInt width ); ///< Sets the width of the display
- virtual void setHeight( UnsignedInt height ); ///< Sets the height of the display
- virtual UnsignedInt getWidth() { return m_width; } ///< Returns the width of the display
- virtual UnsignedInt getHeight() { return m_height; } ///< Returns the height of the display
- virtual void setBitDepth( UnsignedInt bitDepth ) { m_bitDepth = bitDepth; }
- virtual UnsignedInt getBitDepth() { return m_bitDepth; }
- virtual void setWindowed( Bool windowed ) { m_windowed = windowed; } ///< set windowd/fullscreen flag
- virtual Bool getWindowed() { return m_windowed; } ///< return widowed/fullscreen flag
- virtual Bool setDisplayMode( UnsignedInt xres, UnsignedInt yres, UnsignedInt bitdepth, Bool windowed ); ///getNextView();
- return nullptr;
- }
-
- virtual void drawViews(); ///< Render all views of the world
- virtual void updateViews (); ///< Updates state of world views
- virtual void stepViews(); ///< Update views for every fixed time step
-
- virtual VideoBuffer* createVideoBuffer() = 0; ///< Create a video buffer that can be used for this display
-
- //---------------------------------------------------------------------------------------
- // Drawing management
- virtual void setClipRegion( IRegion2D *region ) = 0; ///< Set clip rectangle for 2D draw operations.
- virtual Bool isClippingEnabled() = 0;
- virtual void enableClipping( Bool onoff ) = 0;
-
- virtual void step() {}; ///< Do one fixed time step
- virtual void draw() override; ///< Redraw the entire display
- virtual void setTimeOfDay( TimeOfDay tod ) = 0; ///< Set the time of day for this display
- virtual void createLightPulse( const Coord3D *pos, const RGBColor *color, Real innerRadius,Real attenuationWidth,
- UnsignedInt increaseFrameTime, UnsignedInt decayFrameTime//, Bool donut = FALSE
- ) = 0;
-
- /// draw a line on the display in pixel coordinates with the specified color
- virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
- Real lineWidth, UnsignedInt lineColor ) = 0;
- /// draw a line on the display in pixel coordinates with the specified 2 colors
- virtual void drawLine( Int startX, Int startY, Int endX, Int endY,
- Real lineWidth, UnsignedInt lineColor1, UnsignedInt lineColor2 ) = 0;
- /// draw a rect border on the display in pixel coordinates with the specified color
- virtual void drawOpenRect( Int startX, Int startY, Int width, Int height,
- Real lineWidth, UnsignedInt lineColor ) = 0;
- /// draw a filled rect on the display in pixel coords with the specified color
- virtual void drawFillRect( Int startX, Int startY, Int width, Int height,
- UnsignedInt color ) = 0;
-
- /// Draw a percentage of a rectangle, much like a clock
- virtual void drawRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) = 0;
- virtual void drawRemainingRectClock(Int startX, Int startY, Int width, Int height, Int percent, UnsignedInt color) = 0;
-
- /// draw an image fit within the screen coordinates
- virtual void drawImage( const Image *image, Int startX, Int startY,
- Int endX, Int endY, Color color = 0xFFFFFFFF, DrawImageMode mode=DRAW_IMAGE_ALPHA) = 0;
-
- /// draw a video buffer fit within the screen coordinates
- virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream ) = 0;
- virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY,
- Int endX, Int endY ) = 0;
-
- /// FullScreen video playback
- virtual void playLogoMovie( AsciiString movieName, Int minMovieLength, Int minCopyrightLength );
- virtual void playMovie( AsciiString movieName );
- virtual void stopMovie();
- virtual Bool isMoviePlaying();
-
- /// Register debug display callback
- virtual void setDebugDisplayCallback( DebugDisplayCallback *callback, void *userData = nullptr );
- virtual DebugDisplayCallback *getDebugDisplayCallback();
-
- virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting ) = 0; ///< set shroud
- virtual void clearShroud() = 0; ///< empty the entire shroud
- virtual void setBorderShroudLevel(UnsignedByte level) = 0; ///.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: DrawableInfo.h ///////////////////////////////////////////////////////////////////////////////
-// Simple structure used to bind W3D renderObjects to our own Drawables.
-// Author: Mark Wilczynski, August 2002
-
-#pragma once
-
-#include "Common/GameType.h"
-
-class Drawable;
-class GhostObject;
-class Object;
-
-struct DrawableInfo
-{
- enum ExtraRenderFlags
- { ERF_IS_NORMAL=0,
- ERF_IS_OCCLUDED= 0x00000001,
- ERF_POTENTIAL_OCCLUDER= 0x00000002,
- ERF_POTENTIAL_OCCLUDEE= 0x00000004,
- ERF_IS_TRANSLUCENT= 0x00000008,
- ERF_IS_NON_OCCLUDER_OR_OCCLUDEE = 0x00000010,
- ERF_DELAYED_RENDER = ERF_IS_TRANSLUCENT|ERF_POTENTIAL_OCCLUDEE,
- };
-
- DrawableInfo() : m_shroudStatusObjectID(INVALID_ID), m_drawable(nullptr), m_ghostObject(nullptr), m_flags(ERF_IS_NORMAL) {}
-
- ObjectID m_shroudStatusObjectID; ///.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-//// EstablishConnectionsMenu.h /////////////////////////
-
-#include "GameNetwork/NetworkDefs.h"
-#include "GameNetwork/NAT.h"
-
-enum EstablishConnectionsMenuStateType CPP_11(: Int) {
- ESTABLISHCONNECTIONSMENUSTATETYPE_SCREENON,
- ESTABLISHCONNECTIONSMENUSTATETYPE_SCREENOFF
-};
-
-class EstablishConnectionsMenu {
-public:
- EstablishConnectionsMenu();
- virtual ~EstablishConnectionsMenu();
-
- void initMenu();
- void endMenu();
- void abortGame();
-
- void setPlayerName(Int slot, UnicodeString name);
- void setPlayerStatus(Int slot, NATConnectionState state);
-
-protected:
- EstablishConnectionsMenuStateType m_menuState;
-
- static const char *const m_playerReadyControlNames[MAX_SLOTS];
- static const char *const m_playerNameControlNames[MAX_SLOTS];
- static const char *const m_playerStatusControlNames[MAX_SLOTS];
-};
-
-extern EstablishConnectionsMenu *TheEstablishConnectionsMenu;
diff --git a/Generals/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h b/Generals/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h
deleted file mode 100644
index 25c13a718f8..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: ExtendedMessageBox.h /////////////////////////////////////////////////////////////////////
-// Author: Matt Campbell, January 2003
-// Description: We go quiet in 1 day, gold in 15. Poor time to rewrite message boxes, so
-// we get this file instead. Phooey.
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "GameClient/GameWindowManager.h"
-
-// return codes for message box callbacks
-enum MessageBoxReturnType CPP_11(: Int) {
- MB_RETURN_CLOSE,
- MB_RETURN_KEEPOPEN
-};
-
-typedef MessageBoxReturnType (* MessageBoxFunc)( void *userData );
-
-// WindowExMessageBoxData ---------------------------------------------------------
-/** Data attached to each extended Message box window */
-//-----------------------------------------------------------------------------
-struct WindowExMessageBoxData
-{
- MessageBoxFunc yesCallback; ///.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: FontDesc.h ///////////////////////////////////////////////////////////////////////////////
-// Simple structure used to hold font descriptions.
-// Author: Mark Wilczynski, October 2002
-
-#pragma once
-
-#include "Common/GameType.h"
-
-struct FontDesc
-{
- FontDesc();
- AsciiString name; ///.
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GUICommandTranslator.h ///////////////////////////////////////////////////////////////////
-// Author: Colin Day, March 2002
-// Desc: Translator for commands activated from the selection GUI, such as special unit
-// actions, that require additional clicks in the world like selecting a target
-// object or location
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// USER INCLUDES //////////////////////////////////////////////////////////////////////////////////
-#include "GameClient/InGameUI.h"
-
-//-------------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------------
-class GUICommandTranslator : public GameMessageTranslator
-{
-
-public:
-
- GUICommandTranslator();
- virtual ~GUICommandTranslator() override;
-
- virtual GameMessageDisposition translateGameMessage( const GameMessage *msg ) override;
-};
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetCheckBox.h b/Generals/Code/GameEngine/Include/GameClient/GadgetCheckBox.h
deleted file mode 100644
index 8c7ef8334ca..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetCheckBox.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GadgetCheckBox.h /////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//
-// Westwood Studios Pacific.
-//
-// Confidential Information
-// Copyright (C) 2001 - All Rights Reserved
-//
-//-----------------------------------------------------------------------------
-//
-// Project: RTS3
-//
-// File name: GadgetCheckBox.h
-//
-// Created: Colin Day, June 2001
-//
-// Desc: Helpful interface for checkboxes
-//
-// CheckBox IMAGE/COLOR organization
-// When control is enabled:
-// enabledDrawData[ 0 ] is the background image for the whole enabled control
-// enabledDrawData[ 1 ] is the enabled, unselected check box
-// enabledDrawData[ 2 ] is the enabled, selected check box
-//
-// When control is disabled:
-// disabledDrawData[ 0 ] is the background image for the whole disabled control
-// disabledDrawData[ 1 ] is the disabled, unselected check box
-// disabledDrawData[ 2 ] si the disabled, selected check box
-//
-// When control is hilited (mouse over it and enabled)
-// hiliteDrawData[ 0 ] is the background image for the whole hilited control
-// hiliteDrawData[ 1 ] is the hilited, unselected check box
-// hiliteDrawData[ 2 ] is the hilited, selected check box
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-#include "GameClient/GameWindow.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-// INLINING ///////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-extern void GadgetCheckBoxSetText( GameWindow *g, UnicodeString text );
-extern Bool GadgetCheckBoxIsChecked( GameWindow *g );
-extern void GadgetCheckBoxSetChecked( GameWindow *g, Bool isChecked);
-extern void GadgetCheckBoxToggle( GameWindow *g);
-
-inline void GadgetCheckBoxSetEnabledImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 0, image ); }
-inline void GadgetCheckBoxSetEnabledColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 0, color ); }
-inline void GadgetCheckBoxSetEnabledBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 0, color ); }
-inline void GadgetCheckBoxSetEnabledUncheckedBoxImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 1, image ); }
-inline void GadgetCheckBoxSetEnabledUncheckedBoxColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 1, color ); }
-inline void GadgetCheckBoxSetEnabledUncheckedBoxBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 1, color ); }
-inline void GadgetCheckBoxSetEnabledCheckedBoxImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 2, image ); }
-inline void GadgetCheckBoxSetEnabledCheckedBoxColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 2, color ); }
-inline void GadgetCheckBoxSetEnabledCheckedBoxBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 2, color ); }
-inline const Image *GadgetCheckBoxGetEnabledImage( GameWindow *g ) { return g->winGetEnabledImage( 0 ); }
-inline Color GadgetCheckBoxGetEnabledColor( GameWindow *g ) { return g->winGetEnabledColor( 0 ); }
-inline Color GadgetCheckBoxGetEnabledBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 0 ); }
-inline const Image *GadgetCheckBoxGetEnabledUncheckedBoxImage( GameWindow *g ) { return g->winGetEnabledImage( 1 ); }
-inline Color GadgetCheckBoxGetEnabledUncheckedBoxColor( GameWindow *g ) { return g->winGetEnabledColor( 1 ); }
-inline Color GadgetCheckBoxGetEnabledUncheckedBoxBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 1 ); }
-inline const Image *GadgetCheckBoxGetEnabledCheckedBoxImage( GameWindow *g ) { return g->winGetEnabledImage( 2 ); }
-inline Color GadgetCheckBoxGetEnabledCheckedBoxColor( GameWindow *g ) { return g->winGetEnabledColor( 2 ); }
-inline Color GadgetCheckBoxGetEnabledCheckedBoxBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 2 ); }
-
-inline void GadgetCheckBoxSetDisabledImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 0, image ); }
-inline void GadgetCheckBoxSetDisabledColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 0, color ); }
-inline void GadgetCheckBoxSetDisabledBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 0, color ); }
-inline void GadgetCheckBoxSetDisabledUncheckedBoxImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 1, image ); }
-inline void GadgetCheckBoxSetDisabledUncheckedBoxColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 1, color ); }
-inline void GadgetCheckBoxSetDisabledUncheckedBoxBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 1, color ); }
-inline void GadgetCheckBoxSetDisabledCheckedBoxImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 2, image ); }
-inline void GadgetCheckBoxSetDisabledCheckedBoxColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 2, color ); }
-inline void GadgetCheckBoxSetDisabledCheckedBoxBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 2, color ); }
-inline const Image *GadgetCheckBoxGetDisabledImage( GameWindow *g ) { return g->winGetDisabledImage( 0 ); }
-inline Color GadgetCheckBoxGetDisabledColor( GameWindow *g ) { return g->winGetDisabledColor( 0 ); }
-inline Color GadgetCheckBoxGetDisabledBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 0 ); }
-inline const Image *GadgetCheckBoxGetDisabledUncheckedBoxImage( GameWindow *g ) { return g->winGetDisabledImage( 1 ); }
-inline Color GadgetCheckBoxGetDisabledUncheckedBoxColor( GameWindow *g ) { return g->winGetDisabledColor( 1 ); }
-inline Color GadgetCheckBoxGetDisabledUncheckedBoxBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 1 ); }
-inline const Image *GadgetCheckBoxGetDisabledCheckedBoxImage( GameWindow *g ) { return g->winGetDisabledImage( 2 ); }
-inline Color GadgetCheckBoxGetDisabledCheckedBoxColor( GameWindow *g ) { return g->winGetDisabledColor( 2 ); }
-inline Color GadgetCheckBoxGetDisabledCheckedBoxBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 2 ); }
-
-inline void GadgetCheckBoxSetHiliteImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 0, image ); }
-inline void GadgetCheckBoxSetHiliteColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 0, color ); }
-inline void GadgetCheckBoxSetHiliteBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 0, color ); }
-inline void GadgetCheckBoxSetHiliteUncheckedBoxImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 1, image ); }
-inline void GadgetCheckBoxSetHiliteUncheckedBoxColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 1, color ); }
-inline void GadgetCheckBoxSetHiliteUncheckedBoxBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 1, color ); }
-inline void GadgetCheckBoxSetHiliteCheckedBoxImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 2, image ); }
-inline void GadgetCheckBoxSetHiliteCheckedBoxColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 2, color ); }
-inline void GadgetCheckBoxSetHiliteCheckedBoxBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 2, color ); }
-inline const Image *GadgetCheckBoxGetHiliteImage( GameWindow *g ) { return g->winGetHiliteImage( 0 ); }
-inline Color GadgetCheckBoxGetHiliteColor( GameWindow *g ) { return g->winGetHiliteColor( 0 ); }
-inline Color GadgetCheckBoxGetHiliteBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 0 ); }
-inline const Image *GadgetCheckBoxGetHiliteUncheckedBoxImage( GameWindow *g ) { return g->winGetHiliteImage( 1 ); }
-inline Color GadgetCheckBoxGetHiliteUncheckedBoxColor( GameWindow *g ) { return g->winGetHiliteColor( 1 ); }
-inline Color GadgetCheckBoxGetHiliteUncheckedBoxBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 1 ); }
-inline const Image *GadgetCheckBoxGetHiliteCheckedBoxImage( GameWindow *g ) { return g->winGetHiliteImage( 2 ); }
-inline Color GadgetCheckBoxGetHiliteCheckedBoxColor( GameWindow *g ) { return g->winGetHiliteColor( 2 ); }
-inline Color GadgetCheckBoxGetHiliteCheckedBoxBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 2 ); }
-
-// EXTERNALS //////////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h b/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h
deleted file mode 100644
index 51589981437..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GadgetComboBox.h //////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//
-// Westwood Studios Pacific.
-//
-// Confidential Information
-// Copyright (C) 2001 - All Rights Reserved
-//
-//-----------------------------------------------------------------------------
-//
-// Project: RTS3
-//
-// File name: GadgetComboBox.h
-//
-// Created: Chris Huybregts, November 2001
-//
-// Desc: Helpful interface for ComboBoxes
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-#include "GameClient/Gadget.h"
-#include "GameClient/GameWindow.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-// INLINING ///////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-extern void GadgetComboBoxSetFont( GameWindow *comboBox, GameFont *font );
-extern UnicodeString GadgetComboBoxGetText( GameWindow *comboBox );
-extern void GadgetComboBoxSetText( GameWindow *comboBox, UnicodeString text );
-extern Int GadgetComboBoxAddEntry( GameWindow *comboBox, UnicodeString text, Color color );
-extern void GadgetComboBoxReset( GameWindow *comboBox );
-
-extern void GadgetComboBoxSetSelectedPos( GameWindow *comboBox, Int selectedIndex, Bool dontHide = FALSE );
-extern void GadgetComboBoxGetSelectedPos( GameWindow *comboBox, Int *selectedIndex );
-extern void GadgetComboBoxSetItemData( GameWindow *comboBox, Int index, void *data );
-extern void *GadgetComboBoxGetItemData( GameWindow *comboBox, Int index );
-extern Int GadgetComboBoxGetLength( GameWindow *comboBox );
-
-extern void GadgetComboBoxHideList( GameWindow *comboBox );
-// Functions that set the ComboBoxData Parameters
-extern void GadgetComboBoxSetAsciiOnly(GameWindow *comboBox, Bool isAsciiOnly );
-extern void GadgetComboBoxSetLettersAndNumbersOnly(GameWindow *comboBox, Bool isLettersAndNumbersOnly );
-extern void GadgetComboBoxSetMaxChars( GameWindow *comboBox, Int maxChars );
-extern void GadgetComboBoxSetMaxDisplay( GameWindow *comboBox, Int maxDisplay );
-extern void GadgetComboBoxSetIsEditable(GameWindow *comboBox, Bool isEditable );
-
-//setup all the Font Colors
-extern void GadgetComboBoxSetEnabledTextColors( GameWindow *comboBox,Color color, Color borderColor );
-extern void GadgetComboBoxSetDisabledTextColors( GameWindow *comboBox,Color color, Color borderColor );
-extern void GadgetComboBoxSetHiliteTextColors( GameWindow *comboBox,Color color, Color borderColor );
-extern void GadgetComboBoxSetIMECompositeTextColors( GameWindow *comboBox, Color color, Color borderColor );
-
-//
-// you can use this to set the colors for the list box all at once, note that
-// it will also automatically change the colors for any attached slider
-// and those slider buttons and thumb as well as the drop down button and edit box.
-//
-extern void GadgetComboBoxSetColors( GameWindow *comboBox,
- Color enabledColor,
- Color enabledBorderColor,
- Color enabledSelectedItemColor,
- Color enabledSelectedItemBorderColor,
- Color disabledColor,
- Color disabledBorderColor,
- Color disabledSelectedItemColor,
- Color disabledSelectedItemBorderColor,
- Color hiliteColor,
- Color hiliteBorderColor,
- Color hiliteSelectedItemColor,
- Color hiliteSelectedItemBorderColor );
-
-inline void GadgetComboBoxSetEnabledImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 0, image ); }
-inline void GadgetComboBoxSetEnabledColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 0, color ); }
-inline void GadgetComboBoxSetEnabledBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 0, color ); }
-inline void GadgetComboBoxSetEnabledSelectedItemImageLeft( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 1, image ); }
-inline void GadgetComboBoxSetEnabledSelectedItemImageRight( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 2, image ); }
-inline void GadgetComboBoxSetEnabledSelectedItemImageCenter( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 3, image ); }
-inline void GadgetComboBoxSetEnabledSelectedItemImageSmallCenter( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 4, image ); }
-inline void GadgetComboBoxSetEnabledSelectedItemColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 1, color ); }
-inline void GadgetComboBoxSetEnabledSelectedItemBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 1, color ); }
-inline const Image *GadgetComboBoxGetEnabledImage( GameWindow *g ) { return g->winGetEnabledImage( 0 ); }
-inline Color GadgetComboBoxGetEnabledColor( GameWindow *g ) { return g->winGetEnabledColor( 0 ); }
-inline Color GadgetComboBoxGetEnabledBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 0 ); }
-inline const Image *GadgetComboBoxGetEnabledSelectedItemImageLeft( GameWindow *g ) { return g->winGetEnabledImage( 1 ); }
-inline const Image *GadgetComboBoxGetEnabledSelectedItemImageRight( GameWindow *g ) { return g->winGetEnabledImage( 2 ); }
-inline const Image *GadgetComboBoxGetEnabledSelectedItemImageCenter( GameWindow *g ) { return g->winGetEnabledImage( 3 ); }
-inline const Image *GadgetComboBoxGetEnabledSelectedItemImageSmallCenter( GameWindow *g ){ return g->winGetEnabledImage( 4 ); }
-inline Color GadgetComboBoxGetEnabledSelectedItemColor( GameWindow *g ) { return g->winGetEnabledColor( 1 ); }
-inline Color GadgetComboBoxGetEnabledSelectedItemBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 1 ); }
-
-inline void GadgetComboBoxSetDisabledImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 0, image ); }
-inline void GadgetComboBoxSetDisabledColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 0, color ); }
-inline void GadgetComboBoxSetDisabledBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 0, color ); }
-inline void GadgetComboBoxSetDisabledSelectedItemImageLeft( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 1, image ); }
-inline void GadgetComboBoxSetDisabledSelectedItemImageRight( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 2, image ); }
-inline void GadgetComboBoxSetDisabledSelectedItemImageCenter( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 3, image ); }
-inline void GadgetComboBoxSetDisabledSelectedItemImageSmallCenter( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 4, image ); }
-inline void GadgetComboBoxSetDisabledSelectedItemColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 1, color ); }
-inline void GadgetComboBoxSetDisabledSelectedItemBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 1, color ); }
-inline const Image *GadgetComboBoxGetDisabledImage( GameWindow *g ) { return g->winGetDisabledImage( 0 ); }
-inline Color GadgetComboBoxGetDisabledColor( GameWindow *g ) { return g->winGetDisabledColor( 0 ); }
-inline Color GadgetComboBoxGetDisabledBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 0 ); }
-inline const Image *GadgetComboBoxGetDisabledSelectedItemImageLeft( GameWindow *g ) { return g->winGetDisabledImage( 1 ); }
-inline const Image *GadgetComboBoxGetDisabledSelectedItemImageRight( GameWindow *g ) { return g->winGetDisabledImage( 2 ); }
-inline const Image *GadgetComboBoxGetDisabledSelectedItemImageCenter( GameWindow *g ) { return g->winGetDisabledImage( 3 ); }
-inline const Image *GadgetComboBoxGetDisabledSelectedItemImageSmallCenter( GameWindow *g ) { return g->winGetDisabledImage( 4 ); }
-inline Color GadgetComboBoxGetDisabledSelectedItemColor( GameWindow *g ) { return g->winGetDisabledColor( 1 ); }
-inline Color GadgetComboBoxGetDisabledSelectedItemBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 1 ); }
-
-inline void GadgetComboBoxSetHiliteImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 0, image ); }
-inline void GadgetComboBoxSetHiliteColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 0, color ); }
-inline void GadgetComboBoxSetHiliteBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 0, color ); }
-inline void GadgetComboBoxSetHiliteSelectedItemImageLeft( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 1, image ); }
-inline void GadgetComboBoxSetHiliteSelectedItemImageRight( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 2, image ); }
-inline void GadgetComboBoxSetHiliteSelectedItemImageCenter( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 3, image ); }
-inline void GadgetComboBoxSetHiliteSelectedItemImageSmallCenter( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 4, image ); }
-inline void GadgetComboBoxSetHiliteSelectedItemColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 1, color ); }
-inline void GadgetComboBoxSetHiliteSelectedItemBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 1, color ); }
-inline const Image *GadgetComboBoxGetHiliteImage( GameWindow *g ) { return g->winGetHiliteImage( 0 ); }
-inline Color GadgetComboBoxGetHiliteColor( GameWindow *g ) { return g->winGetHiliteColor( 0 ); }
-inline Color GadgetComboBoxGetHiliteBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 0 ); }
-inline const Image *GadgetComboBoxGetHiliteSelectedItemImageLeft( GameWindow *g ) { return g->winGetHiliteImage( 1 ); }
-inline const Image *GadgetComboBoxGetHiliteSelectedItemImageRight( GameWindow *g ) { return g->winGetHiliteImage( 2 ); }
-inline const Image *GadgetComboBoxGetHiliteSelectedItemImageCenter( GameWindow *g ) { return g->winGetHiliteImage( 3 ); }
-inline const Image *GadgetComboBoxGetHiliteSelectedItemImageSmallCenter( GameWindow *g ) { return g->winGetHiliteImage( 4 ); }
-inline Color GadgetComboBoxGetHiliteSelectedItemColor( GameWindow *g ) { return g->winGetHiliteColor( 1 ); }
-inline Color GadgetComboBoxGetHiliteSelectedItemBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 1 ); }
-
-inline GameWindow *GadgetComboBoxGetDropDownButton( GameWindow *g )
-{
- ComboBoxData *comboBoxData = (ComboBoxData *)g->winGetUserData();
-
- if( comboBoxData && comboBoxData->dropDownButton )
- return comboBoxData->dropDownButton;
- return nullptr;
-}
-inline GameWindow *GadgetComboBoxGetListBox( GameWindow *g )
-{
- ComboBoxData *comboBoxData = (ComboBoxData *)g->winGetUserData();
-
- if( comboBoxData && comboBoxData->listBox)
- return comboBoxData->listBox;
- return nullptr;
-
-}
-
-inline GameWindow *GadgetComboBoxGetEditBox( GameWindow *g )
-{
- ComboBoxData *comboBoxData = (ComboBoxData *)g->winGetUserData();
-
- if( comboBoxData && comboBoxData->editBox)
- return comboBoxData->editBox;
- return nullptr;
-
-}
-
-// EXTERNALS //////////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h b/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h
deleted file mode 100644
index d6349031d8b..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GadgetListBox.h //////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//
-// Westwood Studios Pacific.
-//
-// Confidential Information
-// Copyright (C) 2001 - All Rights Reserved
-//
-//-----------------------------------------------------------------------------
-//
-// Project: RTS3
-//
-// File name: GadgetListBox.h
-//
-// Created: Colin Day, June 2001
-//
-// Desc: Helpful interface for ListBoxes
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-#include "GameClient/Gadget.h"
-#include "GameClient/GameWindow.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-typedef struct _RightClickStruct
-{
- Int mouseX;
- Int mouseY;
- Int pos;
-} RightClickStruct;
-
-///////////////////////////////////////////////////////////////////////////////
-// INLINING ///////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-extern Int GadgetListBoxGetEntryBasedOnXY( GameWindow *listbox, Int x, Int y, Int &row, Int &column);
-extern void GadgetListboxCreateScrollbar( GameWindow *listbox );
-extern void GadgetListBoxAddMultiSelect( GameWindow *listbox );
-extern void GadgetListBoxRemoveMultiSelect( GameWindow *listbox );
-extern void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength );
-extern Int GadgetListBoxGetListLength( GameWindow *listbox ); ///< Returns the maximum possible number of list entries. Length is synonymous to rows
-extern Int GadgetListBoxGetMaxSelectedLength( GameWindow *listbox ); ///< Returns the maximum possible number of list entries that can be selected
-extern Int GadgetListBoxGetNumEntries( GameWindow *listbox );
-extern Int GadgetListBoxGetNumColumns( GameWindow *listbox );
-extern Int GadgetListBoxGetColumnWidth( GameWindow *listbox, Int column );
-
-extern void GadgetListBoxSetFont( GameWindow *listbox, GameFont *font );
-extern UnicodeString GadgetListBoxGetText( GameWindow *listbox, Int row, Int column = 0);
-extern UnicodeString GadgetListBoxGetTextAndColor( GameWindow *listbox, Color *color, Int row, Int column = 0);
-extern Int GadgetListBoxAddEntryText( GameWindow *listbox, UnicodeString text, Color color, Int row, Int column = -1, Bool overwrite = TRUE);
-extern Int GadgetListBoxAddEntryImage( GameWindow *listbox, const Image *image,
- Int row, Int column = -1,
- Bool overwrite = TRUE, Color color = 0xFFFFFFFF );
-extern Int GadgetListBoxAddEntryImage( GameWindow *listbox, const Image *image,
- Int row, Int column,
- Int hight, Int width,
- Bool overwrite = TRUE, Color color = 0xFFFFFFFF );
-extern void GadgetListBoxSetSelected( GameWindow *listbox, Int selectIndex );
-extern void GadgetListBoxSetSelected( GameWindow *listbox, const Int *selectList, Int selectCount = 1 );
-extern void GadgetListBoxGetSelected( GameWindow *listbox, Int *selectList );
-extern void GadgetListBoxReset( GameWindow *listbox );
-extern void GadgetListBoxSetItemData( GameWindow *listbox, void *data, Int row, Int column = 0);
-extern void *GadgetListBoxGetItemData( GameWindow *listbox, Int row, Int column = 0);
-
-extern bool GadgetListBoxIsFull(GameWindow *window);
-
-extern Int GadgetListBoxGetBottomVisibleEntry( GameWindow *window );
-extern void GadgetListBoxSetBottomVisibleEntry( GameWindow *window, Int newPos );
-
-extern Int GadgetListBoxGetTopVisibleEntry( GameWindow *window );
-extern void GadgetListBoxSetTopVisibleEntry( GameWindow *window, Int newPos );
-
-extern void GadgetListBoxSetAudioFeedback( GameWindow *listbox, Bool enable );
-
-//
-// you can use this to set the colors for the list box all at once, note that
-// it will also automatically change the colors for any attached slider
-// and those slider buttons and thumb
-//
-extern void GadgetListBoxSetColors( GameWindow *listbox,
- Color enabledColor,
- Color enabledBorderColor,
- Color enabledSelectedItemColor,
- Color enabledSelectedItemBorderColor,
- Color disabledColor,
- Color disabledBorderColor,
- Color disabledSelectedItemColor,
- Color disabledSelectedItemBorderColor,
- Color hiliteColor,
- Color hiliteBorderColor,
- Color hiliteSelectedItemColor,
- Color hiliteSelectedItemBorderColor );
-
-inline void GadgetListBoxSetEnabledImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 0, image ); }
-inline void GadgetListBoxSetEnabledColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 0, color ); }
-inline void GadgetListBoxSetEnabledBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 0, color ); }
-inline void GadgetListBoxSetEnabledSelectedItemImageLeft( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 1, image ); }
-inline void GadgetListBoxSetEnabledSelectedItemImageRight( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 2, image ); }
-inline void GadgetListBoxSetEnabledSelectedItemImageCenter( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 3, image ); }
-inline void GadgetListBoxSetEnabledSelectedItemImageSmallCenter( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 4, image ); }
-inline void GadgetListBoxSetEnabledSelectedItemColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 1, color ); }
-inline void GadgetListBoxSetEnabledSelectedItemBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 1, color ); }
-inline const Image *GadgetListBoxGetEnabledImage( GameWindow *g ) { return g->winGetEnabledImage( 0 ); }
-inline Color GadgetListBoxGetEnabledColor( GameWindow *g ) { return g->winGetEnabledColor( 0 ); }
-inline Color GadgetListBoxGetEnabledBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 0 ); }
-inline const Image *GadgetListBoxGetEnabledSelectedItemImageLeft( GameWindow *g ) { return g->winGetEnabledImage( 1 ); }
-inline const Image *GadgetListBoxGetEnabledSelectedItemImageRight( GameWindow *g ) { return g->winGetEnabledImage( 2 ); }
-inline const Image *GadgetListBoxGetEnabledSelectedItemImageCenter( GameWindow *g ) { return g->winGetEnabledImage( 3 ); }
-inline const Image *GadgetListBoxGetEnabledSelectedItemImageSmallCenter( GameWindow *g ){ return g->winGetEnabledImage( 4 ); }
-inline Color GadgetListBoxGetEnabledSelectedItemColor( GameWindow *g ) { return g->winGetEnabledColor( 1 ); }
-inline Color GadgetListBoxGetEnabledSelectedItemBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 1 ); }
-
-inline void GadgetListBoxSetDisabledImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 0, image ); }
-inline void GadgetListBoxSetDisabledColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 0, color ); }
-inline void GadgetListBoxSetDisabledBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 0, color ); }
-inline void GadgetListBoxSetDisabledSelectedItemImageLeft( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 1, image ); }
-inline void GadgetListBoxSetDisabledSelectedItemImageRight( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 2, image ); }
-inline void GadgetListBoxSetDisabledSelectedItemImageCenter( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 3, image ); }
-inline void GadgetListBoxSetDisabledSelectedItemImageSmallCenter( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 4, image ); }
-inline void GadgetListBoxSetDisabledSelectedItemColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 1, color ); }
-inline void GadgetListBoxSetDisabledSelectedItemBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 1, color ); }
-inline const Image *GadgetListBoxGetDisabledImage( GameWindow *g ) { return g->winGetDisabledImage( 0 ); }
-inline Color GadgetListBoxGetDisabledColor( GameWindow *g ) { return g->winGetDisabledColor( 0 ); }
-inline Color GadgetListBoxGetDisabledBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 0 ); }
-inline const Image *GadgetListBoxGetDisabledSelectedItemImageLeft( GameWindow *g ) { return g->winGetDisabledImage( 1 ); }
-inline const Image *GadgetListBoxGetDisabledSelectedItemImageRight( GameWindow *g ) { return g->winGetDisabledImage( 2 ); }
-inline const Image *GadgetListBoxGetDisabledSelectedItemImageCenter( GameWindow *g ) { return g->winGetDisabledImage( 3 ); }
-inline const Image *GadgetListBoxGetDisabledSelectedItemImageSmallCenter( GameWindow *g ) { return g->winGetDisabledImage( 4 ); }
-inline Color GadgetListBoxGetDisabledSelectedItemColor( GameWindow *g ) { return g->winGetDisabledColor( 1 ); }
-inline Color GadgetListBoxGetDisabledSelectedItemBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 1 ); }
-
-inline void GadgetListBoxSetHiliteImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 0, image ); }
-inline void GadgetListBoxSetHiliteColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 0, color ); }
-inline void GadgetListBoxSetHiliteBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 0, color ); }
-inline void GadgetListBoxSetHiliteSelectedItemImageLeft( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 1, image ); }
-inline void GadgetListBoxSetHiliteSelectedItemImageRight( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 2, image ); }
-inline void GadgetListBoxSetHiliteSelectedItemImageCenter( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 3, image ); }
-inline void GadgetListBoxSetHiliteSelectedItemImageSmallCenter( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 4, image ); }
-inline void GadgetListBoxSetHiliteSelectedItemColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 1, color ); }
-inline void GadgetListBoxSetHiliteSelectedItemBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 1, color ); }
-inline const Image *GadgetListBoxGetHiliteImage( GameWindow *g ) { return g->winGetHiliteImage( 0 ); }
-inline Color GadgetListBoxGetHiliteColor( GameWindow *g ) { return g->winGetHiliteColor( 0 ); }
-inline Color GadgetListBoxGetHiliteBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 0 ); }
-inline const Image *GadgetListBoxGetHiliteSelectedItemImageLeft( GameWindow *g ) { return g->winGetHiliteImage( 1 ); }
-inline const Image *GadgetListBoxGetHiliteSelectedItemImageRight( GameWindow *g ) { return g->winGetHiliteImage( 2 ); }
-inline const Image *GadgetListBoxGetHiliteSelectedItemImageCenter( GameWindow *g ) { return g->winGetHiliteImage( 3 ); }
-inline const Image *GadgetListBoxGetHiliteSelectedItemImageSmallCenter( GameWindow *g ) { return g->winGetHiliteImage( 4 ); }
-inline Color GadgetListBoxGetHiliteSelectedItemColor( GameWindow *g ) { return g->winGetHiliteColor( 1 ); }
-inline Color GadgetListBoxGetHiliteSelectedItemBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 1 ); }
-
-inline GameWindow *GadgetListBoxGetSlider( GameWindow *g )
-{
- ListboxData *listData = (ListboxData *)g->winGetUserData();
-
- if( listData && listData->slider )
- return listData->slider;
- return nullptr;
-}
-inline GameWindow *GadgetListBoxGetUpButton( GameWindow *g )
-{
- ListboxData *listData = (ListboxData *)g->winGetUserData();
-
- if( listData && listData->upButton )
- return listData->upButton;
- return nullptr;
-}
-inline GameWindow *GadgetListBoxGetDownButton( GameWindow *g )
-{
- ListboxData *listData = (ListboxData *)g->winGetUserData();
-
- if( listData && listData->downButton )
- return listData->downButton;
- return nullptr;
-
-}
-
-// EXTERNALS //////////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h b/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h
deleted file mode 100644
index a4ce3684857..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GadgetProgressBar.h //////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//
-// Westwood Studios Pacific.
-//
-// Confidential Information
-// Copyright (C) 2001 - All Rights Reserved
-//
-//-----------------------------------------------------------------------------
-//
-// Project: RTS3
-//
-// File name: GadgetProgressBar.h
-//
-// Created: Colin Day, June 2001
-//
-// Desc: Helpful interface for ProgressBars
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-#include "GameClient/GameWindow.h"
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-
-
-extern void GadgetProgressBarSetProgress( GameWindow *g, Int progress );
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-// INLINING ///////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-//-----------------------------------------------------------------------------
-inline void GadgetProgressBarSetEnabledColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 0, color ); }
-inline void GadgetProgressBarSetEnabledBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 0, color ); }
-inline void GadgetProgressBarSetEnabledImageLeft( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 0, image ); }
-inline void GadgetProgressBarSetEnabledImageRight( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 1, image ); }
-inline void GadgetProgressBarSetEnabledImageCenter( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 2, image ); }
-inline void GadgetProgressBarSetEnabledImageSmallCenter( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 3, image ); }
-inline void GadgetProgressBarSetEnabledBarColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 4, color ); }
-inline void GadgetProgressBarSetEnabledBarBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 4, color ); }
-inline void GadgetProgressBarSetEnabledBarImageLeft( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 4, image ); }
-inline void GadgetProgressBarSetEnabledBarImageRight( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 5, image ); }
-inline void GadgetProgressBarSetEnabledBarImageCenter( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 6, image ); }
-inline void GadgetProgressBarSetEnabledBarImageSmallCenter( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 7, image ); }
-inline Color GadgetProgressBarGetEnabledColor( GameWindow *g ) { return g->winGetEnabledColor( 0 ); }
-inline Color GadgetProgressBarGetEnabledBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 0 ); }
-inline const Image *GadgetProgressBarGetEnabledImageLeft( GameWindow *g ) { return g->winGetEnabledImage( 0 ); }
-inline const Image * GadgetProgressBarGetEnabledImageRight( GameWindow *g ) { return g->winGetEnabledImage( 1 ); }
-inline const Image * GadgetProgressBarGetEnabledImageCenter( GameWindow *g ) { return g->winGetEnabledImage( 2 ); }
-inline const Image * GadgetProgressBarGetEnabledImageSmallCenter( GameWindow *g ) { return g->winGetEnabledImage( 3 ); }
-inline Color GadgetProgressBarGetEnabledBarColor( GameWindow *g ) { return g->winGetEnabledColor( 4 ); }
-inline Color GadgetProgressBarGetEnabledBarBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 4 ); }
-inline const Image * GadgetProgressBarGetEnabledBarImageLeft( GameWindow *g ) { return g->winGetEnabledImage( 4 ); }
-inline const Image * GadgetProgressBarGetEnabledBarImageRight( GameWindow *g ) { return g->winGetEnabledImage( 5 ); }
-inline const Image * GadgetProgressBarGetEnabledBarImageCenter( GameWindow *g ) { return g->winGetEnabledImage( 6 ); }
-inline const Image * GadgetProgressBarGetEnabledBarImageSmallCenter( GameWindow *g ) { return g->winGetEnabledImage( 7 ); }
-
-//-----------------------------------------------------------------------------
-inline void GadgetProgressBarSetDisabledColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 0, color ); }
-inline void GadgetProgressBarSetDisabledBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 0, color ); }
-inline void GadgetProgressBarSetDisabledImageLeft( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 0, image ); }
-inline void GadgetProgressBarSetDisabledImageRight( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 1, image ); }
-inline void GadgetProgressBarSetDisabledImageCenter( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 2, image ); }
-inline void GadgetProgressBarSetDisabledImageSmallCenter( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 3, image ); }
-inline void GadgetProgressBarSetDisabledBarColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 4, color ); }
-inline void GadgetProgressBarSetDisabledBarBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 4, color ); }
-inline void GadgetProgressBarSetDisabledBarImageLeft( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 4, image ); }
-inline void GadgetProgressBarSetDisabledBarImageRight( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 5, image ); }
-inline void GadgetProgressBarSetDisabledBarImageCenter( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 6, image ); }
-inline void GadgetProgressBarSetDisabledBarImageSmallCenter( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 7, image ); }
-inline Color GadgetProgressBarGetDisabledColor( GameWindow *g ) { return g->winGetDisabledColor( 0 ); }
-inline Color GadgetProgressBarGetDisabledBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 0 ); }
-inline const Image *GadgetProgressBarGetDisabledImageLeft( GameWindow *g ) { return g->winGetDisabledImage( 0 ); }
-inline const Image * GadgetProgressBarGetDisabledImageRight( GameWindow *g ) { return g->winGetDisabledImage( 1 ); }
-inline const Image * GadgetProgressBarGetDisabledImageCenter( GameWindow *g ) { return g->winGetDisabledImage( 2 ); }
-inline const Image * GadgetProgressBarGetDisabledImageSmallCenter( GameWindow *g ) { return g->winGetDisabledImage( 3 ); }
-inline Color GadgetProgressBarGetDisabledBarColor( GameWindow *g ) { return g->winGetDisabledColor( 4 ); }
-inline Color GadgetProgressBarGetDisabledBarBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 4 ); }
-inline const Image * GadgetProgressBarGetDisabledBarImageLeft( GameWindow *g ) { return g->winGetDisabledImage( 4 ); }
-inline const Image * GadgetProgressBarGetDisabledBarImageRight( GameWindow *g ) { return g->winGetDisabledImage( 5 ); }
-inline const Image * GadgetProgressBarGetDisabledBarImageCenter( GameWindow *g ) { return g->winGetDisabledImage( 6 ); }
-inline const Image * GadgetProgressBarGetDisabledBarImageSmallCenter( GameWindow *g ) { return g->winGetDisabledImage( 7 ); }
-
-//-----------------------------------------------------------------------------
-inline void GadgetProgressBarSetHiliteColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 0, color ); }
-inline void GadgetProgressBarSetHiliteBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 0, color ); }
-inline void GadgetProgressBarSetHiliteImageLeft( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 0, image ); }
-inline void GadgetProgressBarSetHiliteImageRight( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 1, image ); }
-inline void GadgetProgressBarSetHiliteImageCenter( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 2, image ); }
-inline void GadgetProgressBarSetHiliteImageSmallCenter( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 3, image ); }
-inline void GadgetProgressBarSetHiliteBarColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 4, color ); }
-inline void GadgetProgressBarSetHiliteBarBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 4, color ); }
-inline void GadgetProgressBarSetHiliteBarImageLeft( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 4, image ); }
-inline void GadgetProgressBarSetHiliteBarImageRight( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 5, image ); }
-inline void GadgetProgressBarSetHiliteBarImageCenter( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 6, image ); }
-inline void GadgetProgressBarSetHiliteBarImageSmallCenter( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 7, image ); }
-inline Color GadgetProgressBarGetHiliteColor( GameWindow *g ) { return g->winGetHiliteColor( 0 ); }
-inline Color GadgetProgressBarGetHiliteBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 0 ); }
-inline const Image *GadgetProgressBarGetHiliteImageLeft( GameWindow *g ) { return g->winGetHiliteImage( 0 ); }
-inline const Image * GadgetProgressBarGetHiliteImageRight( GameWindow *g ) { return g->winGetHiliteImage( 1 ); }
-inline const Image * GadgetProgressBarGetHiliteImageCenter( GameWindow *g ) { return g->winGetHiliteImage( 2 ); }
-inline const Image * GadgetProgressBarGetHiliteImageSmallCenter( GameWindow *g ) { return g->winGetHiliteImage( 3 ); }
-inline Color GadgetProgressBarGetHiliteBarColor( GameWindow *g ) { return g->winGetHiliteColor( 4 ); }
-inline Color GadgetProgressBarGetHiliteBarBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 4 ); }
-inline const Image * GadgetProgressBarGetHiliteBarImageLeft( GameWindow *g ) { return g->winGetHiliteImage( 4 ); }
-inline const Image * GadgetProgressBarGetHiliteBarImageRight( GameWindow *g ) { return g->winGetHiliteImage( 5 ); }
-inline const Image * GadgetProgressBarGetHiliteBarImageCenter( GameWindow *g ) { return g->winGetHiliteImage( 6 ); }
-inline const Image * GadgetProgressBarGetHiliteBarImageSmallCenter( GameWindow *g ) { return g->winGetHiliteImage( 7 ); }
-
-// EXTERNALS //////////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h b/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h
deleted file mode 100644
index 017a4048b10..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GadgetPushButton.h ///////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//
-// Westwood Studios Pacific.
-//
-// Confidential Information
-// Copyright (C) 2001 - All Rights Reserved
-//
-//-----------------------------------------------------------------------------
-//
-// Project: RTS3
-//
-// File name: GadgetPushButton.h
-//
-// Created: Colin Day, June 2001
-//
-// Desc: Helpful interface for PushButtons
-//
-// PushButton IMAGE/COLOR organization
-// When control is enabled:
-// enabledDrawData[ 0 ] is the background image for the whole enabled control
-// enabledDrawData[ 1 ] is the enabled, selected button graphic
-//
-// When control is disabled:
-// disabledDrawData[ 0 ] is the background image for the whole disabled control
-// disabledDrawData[ 1 ] is the disabled, but selected button graphic
-//
-// When control is hilited (mouse over it and enabled)
-// hiliteDrawData[ 0 ] is the background image for the whole hilited control
-// hiliteDrawData[ 1 ] is the hilited, selected button graphic
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-#include "GameClient/GameWindow.h"
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-// INLINING ///////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-void GadgetCheckLikeButtonSetVisualCheck( GameWindow *g, Bool checked );
-Bool GadgetCheckLikeButtonIsChecked( GameWindow *g );
-void GadgetButtonEnableCheckLike( GameWindow *g, Bool makeCheckLike, Bool initiallyChecked );
-
-void GadgetButtonSetText( GameWindow *g, UnicodeString text );
-void GadgetButtonDrawClock( GameWindow *g, Int percent, Color color ); //Darkens the progress
-void GadgetButtonDrawInverseClock( GameWindow *g, Int percent, Color color ); //Darkens the remaining portion.
-void GadgetButtonDrawOverlayImage( GameWindow *g, const Image *image );
-void GadgetButtonSetBorder( GameWindow *g, Color color, Bool drawBorder = TRUE );
-void GadgetButtonSetData(GameWindow *g, void *data);
-void *GadgetButtonGetData(GameWindow *g);
-void GadgetButtonSetAltSound( GameWindow *g, AsciiString altSound );
-inline void GadgetButtonSetEnabledImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 0, image ); g->winSetEnabledImage( 5, nullptr );g->winSetEnabledImage( 6, nullptr );}
-inline void GadgetButtonSetEnabledColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 0, color ); }
-inline void GadgetButtonSetEnabledBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 0, color ); }
-inline void GadgetButtonSetEnabledSelectedImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 1, image ); g->winSetEnabledImage( 2, nullptr );g->winSetEnabledImage( 3, nullptr );}
-inline void GadgetButtonSetEnabledSelectedColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 1, color ); }
-inline void GadgetButtonSetEnabledSelectedBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 1, color ); }
-inline const Image *GadgetButtonGetEnabledImage( GameWindow *g ) { return g->winGetEnabledImage( 0 ); }
-inline Color GadgetButtonGetEnabledColor( GameWindow *g ) { return g->winGetEnabledColor( 0 ); }
-inline Color GadgetButtonGetEnabledBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 0 ); }
-inline const Image *GadgetButtonGetEnabledSelectedImage( GameWindow *g ) { return g->winGetEnabledImage( 1 ); }
-inline Color GadgetButtonGetEnabledSelectedColor( GameWindow *g ) { return g->winGetEnabledColor( 1 ); }
-inline Color GadgetButtonGetEnabledSelectedBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 1 ); }
-
-inline void GadgetButtonSetDisabledImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 0, image ); g->winSetEnabledImage( 5, nullptr );g->winSetEnabledImage( 6, nullptr );}
-inline void GadgetButtonSetDisabledColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 0, color ); }
-inline void GadgetButtonSetDisabledBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 0, color ); }
-inline void GadgetButtonSetDisabledSelectedImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 1, image ); g->winSetEnabledImage( 2, nullptr );g->winSetEnabledImage( 3, nullptr );}
-inline void GadgetButtonSetDisabledSelectedColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 1, color ); }
-inline void GadgetButtonSetDisabledSelectedBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 1, color ); }
-inline const Image *GadgetButtonGetDisabledImage( GameWindow *g ) { return g->winGetDisabledImage( 0 ); }
-inline Color GadgetButtonGetDisabledColor( GameWindow *g ) { return g->winGetDisabledColor( 0 ); }
-inline Color GadgetButtonGetDisabledBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 0 ); }
-inline const Image *GadgetButtonGetDisabledSelectedImage( GameWindow *g ) { return g->winGetDisabledImage( 1 ); }
-inline Color GadgetButtonGetDisabledSelectedColor( GameWindow *g ) { return g->winGetDisabledColor( 1 ); }
-inline Color GadgetButtonGetDisabledSelectedBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 1 ); }
-
-inline void GadgetButtonSetHiliteImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 0, image ); g->winSetEnabledImage( 5, nullptr );g->winSetEnabledImage( 6, nullptr );}
-inline void GadgetButtonSetHiliteColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 0, color ); }
-inline void GadgetButtonSetHiliteBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 0, color ); }
-inline void GadgetButtonSetHiliteSelectedImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 1, image ); g->winSetEnabledImage( 2, nullptr );g->winSetEnabledImage( 3, nullptr );}
-inline void GadgetButtonSetHiliteSelectedColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 1, color ); }
-inline void GadgetButtonSetHiliteSelectedBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 1, color ); }
-inline const Image *GadgetButtonGetHiliteImage( GameWindow *g ) { return g->winGetHiliteImage( 0 ); }
-inline Color GadgetButtonGetHiliteColor( GameWindow *g ) { return g->winGetHiliteColor( 0 ); }
-inline Color GadgetButtonGetHiliteBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 0 ); }
-inline const Image *GadgetButtonGetHiliteSelectedImage( GameWindow *g ) { return g->winGetHiliteImage( 1 ); }
-inline Color GadgetButtonGetHiliteSelectedColor( GameWindow *g ) { return g->winGetHiliteColor( 1 ); }
-inline Color GadgetButtonGetHiliteSelectedBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 1 ); }
-
-inline const Image *GadgetButtonGetLeftHiliteSelectedImage( GameWindow *g ) { return g->winGetHiliteImage( 1 ); }
-inline const Image *GadgetButtonGetMiddleHiliteSelectedImage( GameWindow *g ) { return g->winGetHiliteImage( 3 ); }
-inline const Image *GadgetButtonGetRightHiliteSelectedImage( GameWindow *g ) { return g->winGetHiliteImage( 4 ); }
-
-inline const Image *GadgetButtonGetLeftHiliteImage( GameWindow *g ) { return g->winGetHiliteImage( 0 ); }
-inline const Image *GadgetButtonGetMiddleHiliteImage( GameWindow *g ) { return g->winGetHiliteImage( 5 ); }
-inline const Image *GadgetButtonGetRightHiliteImage( GameWindow *g ) { return g->winGetHiliteImage( 6 ); }
-
-inline void GadgetButtonSetLeftHiliteSelectedImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 1, image ); }
-inline void GadgetButtonSetMiddleHiliteSelectedImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 3, image ); }
-inline void GadgetButtonSetRightHiliteSelectedImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 4, image ); }
-
-inline void GadgetButtonSetLeftHiliteImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 0, image ); }
-inline void GadgetButtonSetMiddleHiliteImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 5, image ); }
-inline void GadgetButtonSetRightHiliteImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 6, image ); }
-
-
-inline const Image *GadgetButtonGetLeftDisabledSelectedImage( GameWindow *g ) { return g->winGetDisabledImage( 1 ); }
-inline const Image *GadgetButtonGetMiddleDisabledSelectedImage( GameWindow *g ) { return g->winGetDisabledImage( 3 ); }
-inline const Image *GadgetButtonGetRightDisabledSelectedImage( GameWindow *g ) { return g->winGetDisabledImage( 4 ); }
-
-inline const Image *GadgetButtonGetLeftDisabledImage( GameWindow *g ) { return g->winGetDisabledImage( 0 ); }
-inline const Image *GadgetButtonGetMiddleDisabledImage( GameWindow *g ) { return g->winGetDisabledImage( 5 ); }
-inline const Image *GadgetButtonGetRightDisabledImage( GameWindow *g ) { return g->winGetDisabledImage( 6 ); }
-
-inline void GadgetButtonSetLeftDisabledSelectedImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 1, image ); }
-inline void GadgetButtonSetMiddleDisabledSelectedImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 3, image ); }
-inline void GadgetButtonSetRightDisabledSelectedImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 4, image ); }
-
-inline void GadgetButtonSetLeftDisabledImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 0, image ); }
-inline void GadgetButtonSetMiddleDisabledImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 5, image ); }
-inline void GadgetButtonSetRightDisabledImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 6, image ); }
-
-inline const Image *GadgetButtonGetLeftEnabledSelectedImage( GameWindow *g ) { return g->winGetEnabledImage( 1 ); }
-inline const Image *GadgetButtonGetMiddleEnabledSelectedImage( GameWindow *g ) { return g->winGetEnabledImage( 3 ); }
-inline const Image *GadgetButtonGetRightEnabledSelectedImage( GameWindow *g ) { return g->winGetEnabledImage( 4 ); }
-
-inline const Image *GadgetButtonGetLeftEnabledImage( GameWindow *g ) { return g->winGetEnabledImage( 0 ); }
-inline const Image *GadgetButtonGetMiddleEnabledImage( GameWindow *g ) { return g->winGetEnabledImage( 5 ); }
-inline const Image *GadgetButtonGetRightEnabledImage( GameWindow *g ) { return g->winGetEnabledImage( 6 ); }
-
-inline void GadgetButtonSetLeftEnabledSelectedImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 1, image ); }
-inline void GadgetButtonSetMiddleEnabledSelectedImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 3, image ); }
-inline void GadgetButtonSetRightEnabledSelectedImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 4, image ); }
-
-inline void GadgetButtonSetLeftEnabledImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 0, image ); }
-inline void GadgetButtonSetMiddleEnabledImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 5, image ); }
-inline void GadgetButtonSetRightEnabledImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 6, image ); }
-// EXTERNALS //////////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h b/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h
deleted file mode 100644
index 331927813cd..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GadgetRadioButton.h //////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//
-// Westwood Studios Pacific.
-//
-// Confidential Information
-// Copyright (C) 2001 - All Rights Reserved
-//
-//-----------------------------------------------------------------------------
-//
-// Project: RTS3
-//
-// File name: GadgetRadioButton.h
-//
-// Created: Colin Day, June 2001
-//
-// Desc: Helpful interface for RadioButtons
-//
-// RadioButton IMAGE/COLOR organization
-// When control is enabled:
-// enabledDrawData[ 0 ] is the background image for the whole enabled control
-// enabledDrawData[ 1 ] is the enabled, unselected radio box
-// enabledDrawData[ 2 ] is the enabled, selected radio box
-//
-// When control is disabled:
-// disabledDrawData[ 0 ] is the background image for the whole disabled control
-// disabledDrawData[ 1 ] is the disabled, unselected radio box
-// disabledDrawData[ 2 ] si the disabled, selected radio box
-//
-// When control is hilited (mouse over it and enabled)
-// hiliteDrawData[ 0 ] is the background image for the whole hilited control
-// hiliteDrawData[ 1 ] is the hilited, unselected radio box
-// hiliteDrawData[ 2 ] is the hilited, selected radio box
-//
-// GadgetRadioGetEnabledImage // LEFT
-// GadgetRadioGetEnabledUncheckedBoxImage // Middle
-// GadgetRadioGetEnabledCheckedBoxImage // right
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-#include "GameClient/GameWindow.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-// INLINING ///////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-extern void GadgetRadioSetText( GameWindow *g, UnicodeString text );
-extern void GadgetRadioSetSelection( GameWindow *g, Bool sendMsg );
-extern void GadgetRadioSetGroup( GameWindow *g, Int group, Int screen );
-
-inline void GadgetRadioSetEnabledImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 0, image ); }
-inline void GadgetRadioSetEnabledColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 0, color ); }
-inline void GadgetRadioSetEnabledBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 0, color ); }
-inline void GadgetRadioSetEnabledUncheckedBoxImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 1, image ); }
-inline void GadgetRadioSetEnabledUncheckedBoxColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 1, color ); }
-inline void GadgetRadioSetEnabledUncheckedBoxBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 1, color ); }
-inline void GadgetRadioSetEnabledCheckedBoxImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 2, image ); }
-inline void GadgetRadioSetEnabledCheckedBoxColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 2, color ); }
-inline void GadgetRadioSetEnabledCheckedBoxBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 2, color ); }
-inline const Image *GadgetRadioGetEnabledImage( GameWindow *g ) { return g->winGetEnabledImage( 0 ); }
-inline Color GadgetRadioGetEnabledColor( GameWindow *g ) { return g->winGetEnabledColor( 0 ); }
-inline Color GadgetRadioGetEnabledBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 0 ); }
-inline const Image *GadgetRadioGetEnabledUncheckedBoxImage( GameWindow *g ) { return g->winGetEnabledImage( 1 ); }
-inline Color GadgetRadioGetEnabledUncheckedBoxColor( GameWindow *g ) { return g->winGetEnabledColor( 1 ); }
-inline Color GadgetRadioGetEnabledUncheckedBoxBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 1 ); }
-inline const Image *GadgetRadioGetEnabledCheckedBoxImage( GameWindow *g ) { return g->winGetEnabledImage( 2 ); }
-inline Color GadgetRadioGetEnabledCheckedBoxColor( GameWindow *g ) { return g->winGetEnabledColor( 2 ); }
-inline Color GadgetRadioGetEnabledCheckedBoxBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 2 ); }
-
-inline void GadgetRadioSetDisabledImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 0, image ); }
-inline void GadgetRadioSetDisabledColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 0, color ); }
-inline void GadgetRadioSetDisabledBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 0, color ); }
-inline void GadgetRadioSetDisabledUncheckedBoxImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 1, image ); }
-inline void GadgetRadioSetDisabledUncheckedBoxColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 1, color ); }
-inline void GadgetRadioSetDisabledUncheckedBoxBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 1, color ); }
-inline void GadgetRadioSetDisabledCheckedBoxImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 2, image ); }
-inline void GadgetRadioSetDisabledCheckedBoxColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 2, color ); }
-inline void GadgetRadioSetDisabledCheckedBoxBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 2, color ); }
-inline const Image *GadgetRadioGetDisabledImage( GameWindow *g ) { return g->winGetDisabledImage( 0 ); }
-inline Color GadgetRadioGetDisabledColor( GameWindow *g ) { return g->winGetDisabledColor( 0 ); }
-inline Color GadgetRadioGetDisabledBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 0 ); }
-inline const Image *GadgetRadioGetDisabledUncheckedBoxImage( GameWindow *g ) { return g->winGetDisabledImage( 1 ); }
-inline Color GadgetRadioGetDisabledUncheckedBoxColor( GameWindow *g ) { return g->winGetDisabledColor( 1 ); }
-inline Color GadgetRadioGetDisabledUncheckedBoxBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 1 ); }
-inline const Image *GadgetRadioGetDisabledCheckedBoxImage( GameWindow *g ) { return g->winGetDisabledImage( 2 ); }
-inline Color GadgetRadioGetDisabledCheckedBoxColor( GameWindow *g ) { return g->winGetDisabledColor( 2 ); }
-inline Color GadgetRadioGetDisabledCheckedBoxBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 2 ); }
-
-inline void GadgetRadioSetHiliteImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 0, image ); }
-inline void GadgetRadioSetHiliteColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 0, color ); }
-inline void GadgetRadioSetHiliteBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 0, color ); }
-inline void GadgetRadioSetHiliteUncheckedBoxImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 1, image ); }
-inline void GadgetRadioSetHiliteUncheckedBoxColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 1, color ); }
-inline void GadgetRadioSetHiliteUncheckedBoxBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 1, color ); }
-inline void GadgetRadioSetHiliteCheckedBoxImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 2, image ); }
-inline void GadgetRadioSetHiliteCheckedBoxColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 2, color ); }
-inline void GadgetRadioSetHiliteCheckedBoxBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 2, color ); }
-inline const Image *GadgetRadioGetHiliteImage( GameWindow *g ) { return g->winGetHiliteImage( 0 ); }
-inline Color GadgetRadioGetHiliteColor( GameWindow *g ) { return g->winGetHiliteColor( 0 ); }
-inline Color GadgetRadioGetHiliteBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 0 ); }
-inline const Image *GadgetRadioGetHiliteUncheckedBoxImage( GameWindow *g ) { return g->winGetHiliteImage( 1 ); }
-inline Color GadgetRadioGetHiliteUncheckedBoxColor( GameWindow *g ) { return g->winGetHiliteColor( 1 ); }
-inline Color GadgetRadioGetHiliteUncheckedBoxBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 1 ); }
-inline const Image *GadgetRadioGetHiliteCheckedBoxImage( GameWindow *g ) { return g->winGetHiliteImage( 2 ); }
-inline Color GadgetRadioGetHiliteCheckedBoxColor( GameWindow *g ) { return g->winGetHiliteColor( 2 ); }
-inline Color GadgetRadioGetHiliteCheckedBoxBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 2 ); }
-
-inline const Image *GadgetRadioGetSelectedImage( GameWindow *g ) { return g->winGetHiliteImage( 3 ); }
-inline const Image *GadgetRadioGetSelectedUncheckedBoxImage( GameWindow *g ) { return g->winGetHiliteImage( 4 ); }
-inline const Image *GadgetRadioGetSelectedCheckedBoxImage( GameWindow *g ) { return g->winGetHiliteImage( 5 ); }
-
-
-// EXTERNALS //////////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h b/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h
deleted file mode 100644
index 1b3cfb034ab..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GadgetSlider.h ///////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//
-// Westwood Studios Pacific.
-//
-// Confidential Information
-// Copyright (C) 2001 - All Rights Reserved
-//
-//-----------------------------------------------------------------------------
-//
-// Project: RTS3
-//
-// File name: GadgetSlider.h
-//
-// Created: Colin Day, June 2001
-//
-// Desc: Helpful interface for Sliders
-//
-// Slider Sliders are constructed of 4 pieces, two end pieces,
-// a repeating center, and a smaller repeating center pieces
-// to fill small seams. Since there are vertical sliders
-// and horizontal sliders, the LEFT end of a horizontal
-// slider is stored in the same place as the TOP end for a
-// vertical slider. The RIGHT end of a horizontal is
-// also equivalent to the BOTTOM end of a vertical one.
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-#include "GameClient/GameWindow.h"
-#include "GameClient/GameWindowManager.h"
-#include "GameClient/GadgetPushButton.h"
-#include "GameClient/Gadget.h"
-#include "GameClient/Image.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-enum{
-HORIZONTAL_SLIDER_THUMB_POSITION = HORIZONTAL_SLIDER_THUMB_HEIGHT *2/3
-};
-// INLINING ///////////////////////////////////////////////////////////////////
-
-inline void GadgetSliderGetMinMax( GameWindow *g, Int *min, Int *max )
-{
- SliderData *sData = (SliderData *)g->winGetUserData();
-
- *max = sData->maxVal;
- *min = sData->minVal;
-
-}
-inline GameWindow *GadgetSliderGetThumb( GameWindow *g ) { return g->winGetChild(); }
-
-inline void GadgetSliderSetPosition( GameWindow *win, Int pos )
-{
- TheWindowManager->winSendSystemMsg( win,
- GSM_SET_SLIDER,
- pos,
- 0 );
-}
-
-inline Int GadgetSliderGetPosition( GameWindow *win )
-{
- SliderData *sData = (SliderData *)win->winGetUserData();
- if (sData)
- {
- return sData->position;
- }
- return -1;
-}
-
-// sliders are drawn from pieces, a left/top, right/bottom, repeating center, and small repeating center
-inline void GadgetSliderSetEnabledImages( GameWindow *g, const Image *left, const Image *right, const Image *center, const Image *smallCenter )
-{
- g->winSetEnabledImage( 0, left );
- g->winSetEnabledImage( 1, right );
- g->winSetEnabledImage( 2, center );
- g->winSetEnabledImage( 3, smallCenter );
-}
-inline void GadgetSliderSetEnabledImageLeft( GameWindow *g, const Image *left ) { g->winSetEnabledImage( 0, left ); }
-inline void GadgetSliderSetEnabledImageTop( GameWindow *g, const Image *left ) { g->winSetEnabledImage( 0, left ); }
-inline void GadgetSliderSetEnabledImageRight( GameWindow *g, const Image *right ) { g->winSetEnabledImage( 1, right ); }
-inline void GadgetSliderSetEnabledImageBottom( GameWindow *g, const Image *right ) { g->winSetEnabledImage( 1, right ); }
-inline void GadgetSliderSetEnabledImageCenter( GameWindow *g, const Image *center ) { g->winSetEnabledImage( 2, center ); }
-inline void GadgetSliderSetEnabledImageSmallCenter( GameWindow *g, const Image *smallCenter ) { g->winSetEnabledImage( 3, smallCenter ); }
-inline void GadgetSliderSetEnabledColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 0, color ); }
-inline void GadgetSliderSetEnabledBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 0, color ); }
-inline const Image *GadgetSliderGetEnabledImageLeft( GameWindow *g ) { return g->winGetEnabledImage( 0 ); }
-inline const Image *GadgetSliderGetEnabledImageTop( GameWindow *g ) { return g->winGetEnabledImage( 0 ); }
-inline const Image *GadgetSliderGetEnabledImageRight( GameWindow *g ) { return g->winGetEnabledImage( 1 ); }
-inline const Image *GadgetSliderGetEnabledImageBottom( GameWindow *g ) { return g->winGetEnabledImage( 1 ); }
-inline const Image *GadgetSliderGetEnabledImageCenter( GameWindow *g ) { return g->winGetEnabledImage( 2 ); }
-inline const Image *GadgetSliderGetEnabledImageSmallCenter( GameWindow *g ) { return g->winGetEnabledImage( 3 ); }
-inline Color GadgetSliderGetEnabledColor( GameWindow *g ) { return g->winGetEnabledColor( 0 ); }
-inline Color GadgetSliderGetEnabledBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 0 ); }
-
-// sliders are drawn from pieces, a left/top, right/bottom, repeating center, and small repeating center
-inline void GadgetSliderSetDisabledImages( GameWindow *g, const Image *left, const Image *right, const Image *center, const Image *smallCenter )
-{
- g->winSetDisabledImage( 0, left );
- g->winSetDisabledImage( 1, right );
- g->winSetDisabledImage( 2, center );
- g->winSetDisabledImage( 3, smallCenter );
-}
-inline void GadgetSliderSetDisabledImageLeft( GameWindow *g, const Image *left ) { g->winSetDisabledImage( 0, left ); }
-inline void GadgetSliderSetDisabledImageTop( GameWindow *g, const Image *left ) { g->winSetDisabledImage( 0, left ); }
-inline void GadgetSliderSetDisabledImageRight( GameWindow *g, const Image *right ) { g->winSetDisabledImage( 1, right ); }
-inline void GadgetSliderSetDisabledImageBottom( GameWindow *g, const Image *right ) { g->winSetDisabledImage( 1, right ); }
-inline void GadgetSliderSetDisabledImageCenter( GameWindow *g, const Image *center ) { g->winSetDisabledImage( 2, center ); }
-inline void GadgetSliderSetDisabledImageSmallCenter( GameWindow *g, const Image *smallCenter ) { g->winSetDisabledImage( 3, smallCenter ); }
-inline void GadgetSliderSetDisabledColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 0, color ); }
-inline void GadgetSliderSetDisabledBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 0, color ); }
-inline const Image *GadgetSliderGetDisabledImageLeft( GameWindow *g ) { return g->winGetDisabledImage( 0 ); }
-inline const Image *GadgetSliderGetDisabledImageTop( GameWindow *g ) { return g->winGetDisabledImage( 0 ); }
-inline const Image *GadgetSliderGetDisabledImageRight( GameWindow *g ) { return g->winGetDisabledImage( 1 ); }
-inline const Image *GadgetSliderGetDisabledImageBottom( GameWindow *g ) { return g->winGetDisabledImage( 1 ); }
-inline const Image *GadgetSliderGetDisabledImageCenter( GameWindow *g ) { return g->winGetDisabledImage( 2 ); }
-inline const Image *GadgetSliderGetDisabledImageSmallCenter( GameWindow *g ){ return g->winGetDisabledImage( 3 ); }
-inline Color GadgetSliderGetDisabledColor( GameWindow *g ) { return g->winGetDisabledColor( 0 ); }
-inline Color GadgetSliderGetDisabledBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 0 ); }
-
-// sliders are drawn from pieces, a left/top, right/bottom, repeating center, and small repeating center
-inline void GadgetSliderSetHiliteImages( GameWindow *g, const Image *left, const Image *right, const Image *center, const Image *smallCenter )
-{
- g->winSetHiliteImage( 0, left );
- g->winSetHiliteImage( 1, right );
- g->winSetHiliteImage( 2, center );
- g->winSetHiliteImage( 3, smallCenter );
-}
-inline void GadgetSliderSetHiliteImageLeft( GameWindow *g, const Image *left ) { g->winSetHiliteImage( 0, left ); }
-inline void GadgetSliderSetHiliteImageTop( GameWindow *g, const Image *left ) { g->winSetHiliteImage( 0, left ); }
-inline void GadgetSliderSetHiliteImageRight( GameWindow *g, const Image *right ) { g->winSetHiliteImage( 1, right ); }
-inline void GadgetSliderSetHiliteImageBottom( GameWindow *g, const Image *right ) { g->winSetHiliteImage( 1, right ); }
-inline void GadgetSliderSetHiliteImageCenter( GameWindow *g, const Image *center ) { g->winSetHiliteImage( 2, center ); }
-inline void GadgetSliderSetHiliteImageSmallCenter( GameWindow *g, const Image *smallCenter ) { g->winSetHiliteImage( 3, smallCenter ); }
-inline void GadgetSliderSetHiliteColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 0, color ); }
-inline void GadgetSliderSetHiliteBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 0, color ); }
-inline const Image *GadgetSliderGetHiliteImageLeft( GameWindow *g ) { return g->winGetHiliteImage( 0 ); }
-inline const Image *GadgetSliderGetHiliteImageTop( GameWindow *g ) { return g->winGetHiliteImage( 0 ); }
-inline const Image *GadgetSliderGetHiliteImageRight( GameWindow *g ) { return g->winGetHiliteImage( 1 ); }
-inline const Image *GadgetSliderGetHiliteImageBottom( GameWindow *g ) { return g->winGetHiliteImage( 1 ); }
-inline const Image *GadgetSliderGetHiliteImageCenter( GameWindow *g ) { return g->winGetHiliteImage( 2 ); }
-inline const Image *GadgetSliderGetHiliteImageSmallCenter( GameWindow *g ){ return g->winGetHiliteImage( 3 ); }
-inline Color GadgetSliderGetHiliteColor( GameWindow *g ) { return g->winGetHiliteColor( 0 ); }
-inline Color GadgetSliderGetHiliteBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 0 ); }
-
-///////////////////////////////////////////////////////////////////////////////
-// Functions to set the images and colors for the slider thumb
-///////////////////////////////////////////////////////////////////////////////
-
-// enabled
-inline void GadgetSliderSetEnabledThumbImage( GameWindow *g, const Image *image )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetEnabledImage( thumb, image );
- }
-inline void GadgetSliderSetEnabledThumbColor( GameWindow *g, Color color )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetEnabledColor( thumb, color );
- }
-inline void GadgetSliderSetEnabledThumbBorderColor( GameWindow *g, Color color )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetEnabledBorderColor( thumb, color );
- }
-inline void GadgetSliderSetEnabledSelectedThumbImage( GameWindow *g, const Image *image )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetEnabledSelectedImage( thumb, image );
- }
-inline void GadgetSliderSetEnabledSelectedThumbColor( GameWindow *g, Color color )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetEnabledSelectedColor( thumb, color );
- }
-inline void GadgetSliderSetEnabledSelectedThumbBorderColor( GameWindow *g, Color color )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetEnabledSelectedBorderColor( thumb, color );
- }
-inline const Image *GadgetSliderGetEnabledThumbImage( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetEnabledImage( thumb );
- else
- return nullptr;
- }
-inline Color GadgetSliderGetEnabledThumbColor( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetEnabledColor( thumb );
- else
- return WIN_COLOR_UNDEFINED;
- }
-inline Color GadgetSliderGetEnabledThumbBorderColor( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetEnabledBorderColor( thumb );
- else
- return WIN_COLOR_UNDEFINED;
- }
-inline const Image *GadgetSliderGetEnabledSelectedThumbImage( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetEnabledSelectedImage( thumb );
- else
- return nullptr;
- }
-inline Color GadgetSliderGetEnabledSelectedThumbColor( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetEnabledSelectedColor( thumb );
- else
- return WIN_COLOR_UNDEFINED;
- }
-inline Color GadgetSliderGetEnabledSelectedThumbBorderColor( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetEnabledSelectedBorderColor( thumb );
- else
- return WIN_COLOR_UNDEFINED;
- }
-
-
-// disabled
-inline void GadgetSliderSetDisabledThumbImage( GameWindow *g, const Image *image )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetDisabledImage( thumb, image );
- }
-inline void GadgetSliderSetDisabledThumbColor( GameWindow *g, Color color )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetDisabledColor( thumb, color );
- }
-inline void GadgetSliderSetDisabledThumbBorderColor( GameWindow *g, Color color )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetDisabledBorderColor( thumb, color );
- }
-inline void GadgetSliderSetDisabledSelectedThumbImage( GameWindow *g, const Image *image )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetDisabledSelectedImage( thumb, image );
- }
-inline void GadgetSliderSetDisabledSelectedThumbColor( GameWindow *g, Color color )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetDisabledSelectedColor( thumb, color );
- }
-inline void GadgetSliderSetDisabledSelectedThumbBorderColor( GameWindow *g, Color color )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetDisabledSelectedBorderColor( thumb, color );
- }
-inline const Image *GadgetSliderGetDisabledThumbImage( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetDisabledImage( thumb );
- else
- return nullptr;
- }
-inline Color GadgetSliderGetDisabledThumbColor( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetDisabledColor( thumb );
- else
- return WIN_COLOR_UNDEFINED;
- }
-inline Color GadgetSliderGetDisabledThumbBorderColor( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetDisabledBorderColor( thumb );
- else
- return WIN_COLOR_UNDEFINED;
- }
-inline const Image *GadgetSliderGetDisabledSelectedThumbImage( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetDisabledSelectedImage( thumb );
- else
- return nullptr;
- }
-inline Color GadgetSliderGetDisabledSelectedThumbColor( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetDisabledSelectedColor( thumb );
- else
- return WIN_COLOR_UNDEFINED;
- }
-inline Color GadgetSliderGetDisabledSelectedThumbBorderColor( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetDisabledSelectedBorderColor( thumb );
- else
- return WIN_COLOR_UNDEFINED;
- }
-
-// hilite
-inline void GadgetSliderSetHiliteThumbImage( GameWindow *g, const Image *image )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetHiliteImage( thumb, image );
- }
-inline void GadgetSliderSetHiliteThumbColor( GameWindow *g, Color color )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetHiliteColor( thumb, color );
- }
-inline void GadgetSliderSetHiliteThumbBorderColor( GameWindow *g, Color color )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetHiliteBorderColor( thumb, color );
- }
-inline void GadgetSliderSetHiliteSelectedThumbImage( GameWindow *g, const Image *image )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetHiliteSelectedImage( thumb, image );
- }
-inline void GadgetSliderSetHiliteSelectedThumbColor( GameWindow *g, Color color )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetHiliteSelectedColor( thumb, color );
- }
-inline void GadgetSliderSetHiliteSelectedThumbBorderColor( GameWindow *g, Color color )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- GadgetButtonSetHiliteSelectedBorderColor( thumb, color );
- }
-inline const Image *GadgetSliderGetHiliteThumbImage( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetHiliteImage( thumb );
- else
- return nullptr;
- }
-inline Color GadgetSliderGetHiliteThumbColor( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetHiliteColor( thumb );
- else
- return WIN_COLOR_UNDEFINED;
- }
-inline Color GadgetSliderGetHiliteThumbBorderColor( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetHiliteBorderColor( thumb );
- else
- return WIN_COLOR_UNDEFINED;
- }
-inline const Image *GadgetSliderGetHiliteSelectedThumbImage( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetHiliteSelectedImage( thumb );
- else
- return nullptr;
- }
-inline Color GadgetSliderGetHiliteSelectedThumbColor( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetHiliteSelectedColor( thumb );
- else
- return WIN_COLOR_UNDEFINED;
- }
-inline Color GadgetSliderGetHiliteSelectedThumbBorderColor( GameWindow *g )
- {
- GameWindow *thumb = g->winGetChild();
- if( thumb )
- return GadgetButtonGetHiliteSelectedBorderColor( thumb );
- else
- return WIN_COLOR_UNDEFINED;
- }
-
-// EXTERNALS //////////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h b/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h
deleted file mode 100644
index 83090aec761..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GadgetStaticText.h ///////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//
-// Westwood Studios Pacific.
-//
-// Confidential Information
-// Copyright (C) 2001 - All Rights Reserved
-//
-//-----------------------------------------------------------------------------
-//
-// Project: RTS3
-//
-// File name: GadgetStaticText.h
-//
-// Created: Colin Day, June 2001
-//
-// Desc: Helpful interface for StaticTexts
-//
-// StaticText IMAGE/COLOR organization
-// When control is enabled:
-// enabledDrawData[ 0 ] is the background image for the whole enabled control
-//
-// When control is disabled:
-// disabledDrawData[ 0 ] is the background image for the whole disabled control
-//
-// When control is hilited (mouse over it and enabled)
-// hiliteDrawData[ 0 ] is the background image for the whole hilited control
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-#include "GameClient/GameWindow.h"
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-// INLINING ///////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-extern void GadgetStaticTextSetText( GameWindow *window, UnicodeString text );
-extern UnicodeString GadgetStaticTextGetText( GameWindow *window );
-extern void GadgetStaticTextSetFont( GameWindow *window, GameFont *font );
-
-// text colors
-
-// enabled background
-inline void GadgetStaticTextSetEnabledImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 0, image ); }
-inline void GadgetStaticTextSetEnabledColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 0, color ); }
-inline void GadgetStaticTextSetEnabledBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 0, color ); }
-inline const Image *GadgetStaticTextGetEnabledImage( GameWindow *g ) { return g->winGetEnabledImage( 0 ); }
-inline Color GadgetStaticTextGetEnabledColor( GameWindow *g ) { return g->winGetEnabledColor( 0 ); }
-inline Color GadgetStaticTextGetEnabledBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 0 ); }
-
-// disabled background
-inline void GadgetStaticTextSetDisabledImage( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 0, image ); }
-inline void GadgetStaticTextSetDisabledColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 0, color ); }
-inline void GadgetStaticTextSetDisabledBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 0, color ); }
-inline const Image *GadgetStaticTextGetDisabledImage( GameWindow *g ) { return g->winGetDisabledImage( 0 ); }
-inline Color GadgetStaticTextGetDisabledColor( GameWindow *g ) { return g->winGetDisabledColor( 0 ); }
-inline Color GadgetStaticTextGetDisabledBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 0 ); }
-
-// hilite if we choose to use it
-inline void GadgetStaticTextSetHiliteImage( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 0, image ); }
-inline void GadgetStaticTextSetHiliteColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 0, color ); }
-inline void GadgetStaticTextSetHiliteBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 0, color ); }
-inline const Image *GadgetStaticTextGetHiliteImage( GameWindow *g ) { return g->winGetHiliteImage( 0 ); }
-inline Color GadgetStaticTextGetHiliteColor( GameWindow *g ) { return g->winGetHiliteColor( 0 ); }
-inline Color GadgetStaticTextGetHiliteBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 0 ); }
-
-// EXTERNALS //////////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h b/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h
deleted file mode 100644
index 17a91ba631a..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-//-----------------------------------------------------------------------------
-//
-// Westwood Studios Pacific.
-//
-// Confidential Information
-// Copyright (C) 2001 - All Rights Reserved
-//
-//-----------------------------------------------------------------------------
-//
-// Project: RTS3
-//
-// File name: C:\projects\RTS\code\gameengine\Include\GameClient\GadgetTabControl.h
-//
-// Created: Graham Smallwood, November 2001
-//
-// Desc: Helpful interface for TabControls
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-enum
-{
- GTC_BACKGROUND = 0,
- GTC_TAB_0,
- GTC_TAB_1,
- GTC_TAB_2,
- GTC_TAB_3,
- GTC_TAB_4,
- GTC_TAB_5,
- GTC_TAB_6,
- GTC_TAB_7
-};
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-#include "GameClient/GameWindow.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-extern void GadgetTabControlComputeTabRegion( GameWindow *tabControl );///< Recalc the tab positions based on userData
-extern void GadgetTabControlCreateSubPanes( GameWindow *tabControl);///< Create (destroy old) Windows attached to userData as Panes
-extern void GadgetTabControlComputeSubPaneSize( GameWindow *tabControl, Int *width, Int *height, Int *x, Int *y );///winSetEnabledImage( GTC_TAB_0, image ); }
-inline void GadgetTabControlSetEnabledColorTabZero( GameWindow *g, Color color ) { g->winSetEnabledColor( GTC_TAB_0, color ); }
-inline void GadgetTabControlSetEnabledBorderColorTabZero( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( GTC_TAB_0, color ); }
-inline const Image *GadgetTabControlGetEnabledImageTabZero( GameWindow *g ) { return g->winGetEnabledImage( GTC_TAB_0 ); }
-inline Color GadgetTabControlGetEnabledColorTabZero( GameWindow *g ) { return g->winGetEnabledColor( GTC_TAB_0 ); }
-inline Color GadgetTabControlGetEnabledBorderColorTabZero( GameWindow *g ) { return g->winGetEnabledBorderColor( GTC_TAB_0 ); }
-
-inline void GadgetTabControlSetEnabledImageTabOne( GameWindow *g, const Image *image ) { g->winSetEnabledImage( GTC_TAB_1, image ); }
-inline void GadgetTabControlSetEnabledColorTabOne( GameWindow *g, Color color ) { g->winSetEnabledColor( GTC_TAB_1, color ); }
-inline void GadgetTabControlSetEnabledBorderColorTabOne( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( GTC_TAB_1, color ); }
-inline const Image *GadgetTabControlGetEnabledImageTabOne( GameWindow *g ) { return g->winGetEnabledImage( GTC_TAB_1 ); }
-inline Color GadgetTabControlGetEnabledColorTabOne( GameWindow *g ) { return g->winGetEnabledColor( GTC_TAB_1 ); }
-inline Color GadgetTabControlGetEnabledBorderColorTabOne( GameWindow *g ) { return g->winGetEnabledBorderColor( GTC_TAB_1 ); }
-
-inline void GadgetTabControlSetEnabledImageTabTwo( GameWindow *g, const Image *image ) { g->winSetEnabledImage( GTC_TAB_2, image ); }
-inline void GadgetTabControlSetEnabledColorTabTwo( GameWindow *g, Color color ) { g->winSetEnabledColor( GTC_TAB_2, color ); }
-inline void GadgetTabControlSetEnabledBorderColorTabTwo( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( GTC_TAB_2, color ); }
-inline const Image *GadgetTabControlGetEnabledImageTabTwo( GameWindow *g ) { return g->winGetEnabledImage( GTC_TAB_2 ); }
-inline Color GadgetTabControlGetEnabledColorTabTwo( GameWindow *g ) { return g->winGetEnabledColor( GTC_TAB_2 ); }
-inline Color GadgetTabControlGetEnabledBorderColorTabTwo( GameWindow *g ) { return g->winGetEnabledBorderColor( GTC_TAB_2 ); }
-
-inline void GadgetTabControlSetEnabledImageTabThree( GameWindow *g, const Image *image ) { g->winSetEnabledImage( GTC_TAB_3, image ); }
-inline void GadgetTabControlSetEnabledColorTabThree( GameWindow *g, Color color ) { g->winSetEnabledColor( GTC_TAB_3, color ); }
-inline void GadgetTabControlSetEnabledBorderColorTabThree( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( GTC_TAB_3, color ); }
-inline const Image *GadgetTabControlGetEnabledImageTabThree( GameWindow *g ) { return g->winGetEnabledImage( GTC_TAB_3 ); }
-inline Color GadgetTabControlGetEnabledColorTabThree( GameWindow *g ) { return g->winGetEnabledColor( GTC_TAB_3 ); }
-inline Color GadgetTabControlGetEnabledBorderColorTabThree( GameWindow *g ) { return g->winGetEnabledBorderColor( GTC_TAB_3 ); }
-
-inline void GadgetTabControlSetEnabledImageTabFour( GameWindow *g, const Image *image ) { g->winSetEnabledImage( GTC_TAB_4, image ); }
-inline void GadgetTabControlSetEnabledColorTabFour( GameWindow *g, Color color ) { g->winSetEnabledColor( GTC_TAB_4, color ); }
-inline void GadgetTabControlSetEnabledBorderColorTabFour( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( GTC_TAB_4, color ); }
-inline const Image *GadgetTabControlGetEnabledImageTabFour( GameWindow *g ) { return g->winGetEnabledImage( GTC_TAB_4 ); }
-inline Color GadgetTabControlGetEnabledColorTabFour( GameWindow *g ) { return g->winGetEnabledColor( GTC_TAB_4 ); }
-inline Color GadgetTabControlGetEnabledBorderColorTabFour( GameWindow *g ) { return g->winGetEnabledBorderColor( GTC_TAB_4 ); }
-
-inline void GadgetTabControlSetEnabledImageTabFive( GameWindow *g, const Image *image ) { g->winSetEnabledImage( GTC_TAB_5, image ); }
-inline void GadgetTabControlSetEnabledColorTabFive( GameWindow *g, Color color ) { g->winSetEnabledColor( GTC_TAB_5, color ); }
-inline void GadgetTabControlSetEnabledBorderColorTabFive( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( GTC_TAB_5, color ); }
-inline const Image *GadgetTabControlGetEnabledImageTabFive( GameWindow *g ) { return g->winGetEnabledImage( GTC_TAB_5 ); }
-inline Color GadgetTabControlGetEnabledColorTabFive( GameWindow *g ) { return g->winGetEnabledColor( GTC_TAB_5 ); }
-inline Color GadgetTabControlGetEnabledBorderColorTabFive( GameWindow *g ) { return g->winGetEnabledBorderColor( GTC_TAB_5 ); }
-
-inline void GadgetTabControlSetEnabledImageTabSix( GameWindow *g, const Image *image ) { g->winSetEnabledImage( GTC_TAB_6, image ); }
-inline void GadgetTabControlSetEnabledColorTabSix( GameWindow *g, Color color ) { g->winSetEnabledColor( GTC_TAB_6, color ); }
-inline void GadgetTabControlSetEnabledBorderColorTabSix( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( GTC_TAB_6, color ); }
-inline const Image *GadgetTabControlGetEnabledImageTabSix( GameWindow *g ) { return g->winGetEnabledImage( GTC_TAB_6 ); }
-inline Color GadgetTabControlGetEnabledColorTabSix( GameWindow *g ) { return g->winGetEnabledColor( GTC_TAB_6 ); }
-inline Color GadgetTabControlGetEnabledBorderColorTabSix( GameWindow *g ) { return g->winGetEnabledBorderColor( GTC_TAB_6 ); }
-
-inline void GadgetTabControlSetEnabledImageTabSeven( GameWindow *g, const Image *image ) { g->winSetEnabledImage( GTC_TAB_7, image ); }
-inline void GadgetTabControlSetEnabledColorTabSeven( GameWindow *g, Color color ) { g->winSetEnabledColor( GTC_TAB_7, color ); }
-inline void GadgetTabControlSetEnabledBorderColorTabSeven( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( GTC_TAB_7, color ); }
-inline const Image *GadgetTabControlGetEnabledImageTabSeven( GameWindow *g ) { return g->winGetEnabledImage( GTC_TAB_7 ); }
-inline Color GadgetTabControlGetEnabledColorTabSeven( GameWindow *g ) { return g->winGetEnabledColor( GTC_TAB_7 ); }
-inline Color GadgetTabControlGetEnabledBorderColorTabSeven( GameWindow *g ) { return g->winGetEnabledBorderColor( GTC_TAB_7 ); }
-
-inline void GadgetTabControlSetEnabledImageBackground( GameWindow *g, const Image *image ) { g->winSetEnabledImage( GTC_BACKGROUND, image ); }
-inline void GadgetTabControlSetEnabledColorBackground( GameWindow *g, Color color ) { g->winSetEnabledColor( GTC_BACKGROUND, color ); }
-inline void GadgetTabControlSetEnabledBorderColorBackground( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( GTC_BACKGROUND, color ); }
-inline const Image *GadgetTabControlGetEnabledImageBackground( GameWindow *g ) { return g->winGetEnabledImage( GTC_BACKGROUND ); }
-inline Color GadgetTabControlGetEnabledColorBackground( GameWindow *g ) { return g->winGetEnabledColor( GTC_BACKGROUND ); }
-inline Color GadgetTabControlGetEnabledBorderColorBackground( GameWindow *g ) { return g->winGetEnabledBorderColor( GTC_BACKGROUND ); }
-
-
-
-
-inline void GadgetTabControlSetDisabledImageTabZero( GameWindow *g, const Image *image ) { g->winSetDisabledImage( GTC_TAB_0, image ); }
-inline void GadgetTabControlSetDisabledColorTabZero( GameWindow *g, Color color ) { g->winSetDisabledColor( GTC_TAB_0, color ); }
-inline void GadgetTabControlSetDisabledBorderColorTabZero( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( GTC_TAB_0, color ); }
-inline const Image *GadgetTabControlGetDisabledImageTabZero( GameWindow *g ) { return g->winGetDisabledImage( GTC_TAB_0 ); }
-inline Color GadgetTabControlGetDisabledColorTabZero( GameWindow *g ) { return g->winGetDisabledColor( GTC_TAB_0 ); }
-inline Color GadgetTabControlGetDisabledBorderColorTabZero( GameWindow *g ) { return g->winGetDisabledBorderColor( GTC_TAB_0 ); }
-
-inline void GadgetTabControlSetDisabledImageTabOne( GameWindow *g, const Image *image ) { g->winSetDisabledImage( GTC_TAB_1, image ); }
-inline void GadgetTabControlSetDisabledColorTabOne( GameWindow *g, Color color ) { g->winSetDisabledColor( GTC_TAB_1, color ); }
-inline void GadgetTabControlSetDisabledBorderColorTabOne( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( GTC_TAB_1, color ); }
-inline const Image *GadgetTabControlGetDisabledImageTabOne( GameWindow *g ) { return g->winGetDisabledImage( GTC_TAB_1 ); }
-inline Color GadgetTabControlGetDisabledColorTabOne( GameWindow *g ) { return g->winGetDisabledColor( GTC_TAB_1 ); }
-inline Color GadgetTabControlGetDisabledBorderColorTabOne( GameWindow *g ) { return g->winGetDisabledBorderColor( GTC_TAB_1 ); }
-
-inline void GadgetTabControlSetDisabledImageTabTwo( GameWindow *g, const Image *image ) { g->winSetDisabledImage( GTC_TAB_2, image ); }
-inline void GadgetTabControlSetDisabledColorTabTwo( GameWindow *g, Color color ) { g->winSetDisabledColor( GTC_TAB_2, color ); }
-inline void GadgetTabControlSetDisabledBorderColorTabTwo( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( GTC_TAB_2, color ); }
-inline const Image *GadgetTabControlGetDisabledImageTabTwo( GameWindow *g ) { return g->winGetDisabledImage( GTC_TAB_2 ); }
-inline Color GadgetTabControlGetDisabledColorTabTwo( GameWindow *g ) { return g->winGetDisabledColor( GTC_TAB_2 ); }
-inline Color GadgetTabControlGetDisabledBorderColorTabTwo( GameWindow *g ) { return g->winGetDisabledBorderColor( GTC_TAB_2 ); }
-
-inline void GadgetTabControlSetDisabledImageTabThree( GameWindow *g, const Image *image ) { g->winSetDisabledImage( GTC_TAB_3, image ); }
-inline void GadgetTabControlSetDisabledColorTabThree( GameWindow *g, Color color ) { g->winSetDisabledColor( GTC_TAB_3, color ); }
-inline void GadgetTabControlSetDisabledBorderColorTabThree( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( GTC_TAB_3, color ); }
-inline const Image *GadgetTabControlGetDisabledImageTabThree( GameWindow *g ) { return g->winGetDisabledImage( GTC_TAB_3 ); }
-inline Color GadgetTabControlGetDisabledColorTabThree( GameWindow *g ) { return g->winGetDisabledColor( GTC_TAB_3 ); }
-inline Color GadgetTabControlGetDisabledBorderColorTabThree( GameWindow *g ) { return g->winGetDisabledBorderColor( GTC_TAB_3 ); }
-
-inline void GadgetTabControlSetDisabledImageTabFour( GameWindow *g, const Image *image ) { g->winSetDisabledImage( GTC_TAB_4, image ); }
-inline void GadgetTabControlSetDisabledColorTabFour( GameWindow *g, Color color ) { g->winSetDisabledColor( GTC_TAB_4, color ); }
-inline void GadgetTabControlSetDisabledBorderColorTabFour( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( GTC_TAB_4, color ); }
-inline const Image *GadgetTabControlGetDisabledImageTabFour( GameWindow *g ) { return g->winGetDisabledImage( GTC_TAB_4 ); }
-inline Color GadgetTabControlGetDisabledColorTabFour( GameWindow *g ) { return g->winGetDisabledColor( GTC_TAB_4 ); }
-inline Color GadgetTabControlGetDisabledBorderColorTabFour( GameWindow *g ) { return g->winGetDisabledBorderColor( GTC_TAB_4 ); }
-
-inline void GadgetTabControlSetDisabledImageTabFive( GameWindow *g, const Image *image ) { g->winSetDisabledImage( GTC_TAB_5, image ); }
-inline void GadgetTabControlSetDisabledColorTabFive( GameWindow *g, Color color ) { g->winSetDisabledColor( GTC_TAB_5, color ); }
-inline void GadgetTabControlSetDisabledBorderColorTabFive( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( GTC_TAB_5, color ); }
-inline const Image *GadgetTabControlGetDisabledImageTabFive( GameWindow *g ) { return g->winGetDisabledImage( GTC_TAB_5 ); }
-inline Color GadgetTabControlGetDisabledColorTabFive( GameWindow *g ) { return g->winGetDisabledColor( GTC_TAB_5 ); }
-inline Color GadgetTabControlGetDisabledBorderColorTabFive( GameWindow *g ) { return g->winGetDisabledBorderColor( GTC_TAB_5 ); }
-
-inline void GadgetTabControlSetDisabledImageTabSix( GameWindow *g, const Image *image ) { g->winSetDisabledImage( GTC_TAB_6, image ); }
-inline void GadgetTabControlSetDisabledColorTabSix( GameWindow *g, Color color ) { g->winSetDisabledColor( GTC_TAB_6, color ); }
-inline void GadgetTabControlSetDisabledBorderColorTabSix( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( GTC_TAB_6, color ); }
-inline const Image *GadgetTabControlGetDisabledImageTabSix( GameWindow *g ) { return g->winGetDisabledImage( GTC_TAB_6 ); }
-inline Color GadgetTabControlGetDisabledColorTabSix( GameWindow *g ) { return g->winGetDisabledColor( GTC_TAB_6 ); }
-inline Color GadgetTabControlGetDisabledBorderColorTabSix( GameWindow *g ) { return g->winGetDisabledBorderColor( GTC_TAB_6 ); }
-
-inline void GadgetTabControlSetDisabledImageTabSeven( GameWindow *g, const Image *image ) { g->winSetDisabledImage( GTC_TAB_7, image ); }
-inline void GadgetTabControlSetDisabledColorTabSeven( GameWindow *g, Color color ) { g->winSetDisabledColor( GTC_TAB_7, color ); }
-inline void GadgetTabControlSetDisabledBorderColorTabSeven( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( GTC_TAB_7, color ); }
-inline const Image *GadgetTabControlGetDisabledImageTabSeven( GameWindow *g ) { return g->winGetDisabledImage( GTC_TAB_7 ); }
-inline Color GadgetTabControlGetDisabledColorTabSeven( GameWindow *g ) { return g->winGetDisabledColor( GTC_TAB_7 ); }
-inline Color GadgetTabControlGetDisabledBorderColorTabSeven( GameWindow *g ) { return g->winGetDisabledBorderColor( GTC_TAB_7 ); }
-
-inline void GadgetTabControlSetDisabledImageBackground( GameWindow *g, const Image *image ) { g->winSetDisabledImage( GTC_BACKGROUND, image ); }
-inline void GadgetTabControlSetDisabledColorBackground( GameWindow *g, Color color ) { g->winSetDisabledColor( GTC_BACKGROUND, color ); }
-inline void GadgetTabControlSetDisabledBorderColorBackground( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( GTC_BACKGROUND, color ); }
-inline const Image *GadgetTabControlGetDisabledImageBackground( GameWindow *g ) { return g->winGetDisabledImage( GTC_BACKGROUND ); }
-inline Color GadgetTabControlGetDisabledColorBackground( GameWindow *g ) { return g->winGetDisabledColor( GTC_BACKGROUND ); }
-inline Color GadgetTabControlGetDisabledBorderColorBackground( GameWindow *g ) { return g->winGetDisabledBorderColor( GTC_BACKGROUND ); }
-
-
-
-
-inline void GadgetTabControlSetHiliteImageTabZero( GameWindow *g, const Image *image ) { g->winSetHiliteImage( GTC_TAB_0, image ); }
-inline void GadgetTabControlSetHiliteColorTabZero( GameWindow *g, Color color ) { g->winSetHiliteColor( GTC_TAB_0, color ); }
-inline void GadgetTabControlSetHiliteBorderColorTabZero( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( GTC_TAB_0, color ); }
-inline const Image *GadgetTabControlGetHiliteImageTabZero( GameWindow *g ) { return g->winGetHiliteImage( GTC_TAB_0 ); }
-inline Color GadgetTabControlGetHiliteColorTabZero( GameWindow *g ) { return g->winGetHiliteColor( GTC_TAB_0 ); }
-inline Color GadgetTabControlGetHiliteBorderColorTabZero( GameWindow *g ) { return g->winGetHiliteBorderColor( GTC_TAB_0 ); }
-
-inline void GadgetTabControlSetHiliteImageTabOne( GameWindow *g, const Image *image ) { g->winSetHiliteImage( GTC_TAB_1, image ); }
-inline void GadgetTabControlSetHiliteColorTabOne( GameWindow *g, Color color ) { g->winSetHiliteColor( GTC_TAB_1, color ); }
-inline void GadgetTabControlSetHiliteBorderColorTabOne( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( GTC_TAB_1, color ); }
-inline const Image *GadgetTabControlGetHiliteImageTabOne( GameWindow *g ) { return g->winGetHiliteImage( GTC_TAB_1 ); }
-inline Color GadgetTabControlGetHiliteColorTabOne( GameWindow *g ) { return g->winGetHiliteColor( GTC_TAB_1 ); }
-inline Color GadgetTabControlGetHiliteBorderColorTabOne( GameWindow *g ) { return g->winGetHiliteBorderColor( GTC_TAB_1 ); }
-
-inline void GadgetTabControlSetHiliteImageTabTwo( GameWindow *g, const Image *image ) { g->winSetHiliteImage( GTC_TAB_2, image ); }
-inline void GadgetTabControlSetHiliteColorTabTwo( GameWindow *g, Color color ) { g->winSetHiliteColor( GTC_TAB_2, color ); }
-inline void GadgetTabControlSetHiliteBorderColorTabTwo( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( GTC_TAB_2, color ); }
-inline const Image *GadgetTabControlGetHiliteImageTabTwo( GameWindow *g ) { return g->winGetHiliteImage( GTC_TAB_2 ); }
-inline Color GadgetTabControlGetHiliteColorTabTwo( GameWindow *g ) { return g->winGetHiliteColor( GTC_TAB_2 ); }
-inline Color GadgetTabControlGetHiliteBorderColorTabTwo( GameWindow *g ) { return g->winGetHiliteBorderColor( GTC_TAB_2 ); }
-
-inline void GadgetTabControlSetHiliteImageTabThree( GameWindow *g, const Image *image ) { g->winSetHiliteImage( GTC_TAB_3, image ); }
-inline void GadgetTabControlSetHiliteColorTabThree( GameWindow *g, Color color ) { g->winSetHiliteColor( GTC_TAB_3, color ); }
-inline void GadgetTabControlSetHiliteBorderColorTabThree( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( GTC_TAB_3, color ); }
-inline const Image *GadgetTabControlGetHiliteImageTabThree( GameWindow *g ) { return g->winGetHiliteImage( GTC_TAB_3 ); }
-inline Color GadgetTabControlGetHiliteColorTabThree( GameWindow *g ) { return g->winGetHiliteColor( GTC_TAB_3 ); }
-inline Color GadgetTabControlGetHiliteBorderColorTabThree( GameWindow *g ) { return g->winGetHiliteBorderColor( GTC_TAB_3 ); }
-
-inline void GadgetTabControlSetHiliteImageTabFour( GameWindow *g, const Image *image ) { g->winSetHiliteImage( GTC_TAB_4, image ); }
-inline void GadgetTabControlSetHiliteColorTabFour( GameWindow *g, Color color ) { g->winSetHiliteColor( GTC_TAB_4, color ); }
-inline void GadgetTabControlSetHiliteBorderColorTabFour( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( GTC_TAB_4, color ); }
-inline const Image *GadgetTabControlGetHiliteImageTabFour( GameWindow *g ) { return g->winGetHiliteImage( GTC_TAB_4 ); }
-inline Color GadgetTabControlGetHiliteColorTabFour( GameWindow *g ) { return g->winGetHiliteColor( GTC_TAB_4 ); }
-inline Color GadgetTabControlGetHiliteBorderColorTabFour( GameWindow *g ) { return g->winGetHiliteBorderColor( GTC_TAB_4 ); }
-
-inline void GadgetTabControlSetHiliteImageTabFive( GameWindow *g, const Image *image ) { g->winSetHiliteImage( GTC_TAB_5, image ); }
-inline void GadgetTabControlSetHiliteColorTabFive( GameWindow *g, Color color ) { g->winSetHiliteColor( GTC_TAB_5, color ); }
-inline void GadgetTabControlSetHiliteBorderColorTabFive( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( GTC_TAB_5, color ); }
-inline const Image *GadgetTabControlGetHiliteImageTabFive( GameWindow *g ) { return g->winGetHiliteImage( GTC_TAB_5 ); }
-inline Color GadgetTabControlGetHiliteColorTabFive( GameWindow *g ) { return g->winGetHiliteColor( GTC_TAB_5 ); }
-inline Color GadgetTabControlGetHiliteBorderColorTabFive( GameWindow *g ) { return g->winGetHiliteBorderColor( GTC_TAB_5 ); }
-
-inline void GadgetTabControlSetHiliteImageTabSix( GameWindow *g, const Image *image ) { g->winSetHiliteImage( GTC_TAB_6, image ); }
-inline void GadgetTabControlSetHiliteColorTabSix( GameWindow *g, Color color ) { g->winSetHiliteColor( GTC_TAB_6, color ); }
-inline void GadgetTabControlSetHiliteBorderColorTabSix( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( GTC_TAB_6, color ); }
-inline const Image *GadgetTabControlGetHiliteImageTabSix( GameWindow *g ) { return g->winGetHiliteImage( GTC_TAB_6 ); }
-inline Color GadgetTabControlGetHiliteColorTabSix( GameWindow *g ) { return g->winGetHiliteColor( GTC_TAB_6 ); }
-inline Color GadgetTabControlGetHiliteBorderColorTabSix( GameWindow *g ) { return g->winGetHiliteBorderColor( GTC_TAB_6 ); }
-
-inline void GadgetTabControlSetHiliteImageTabSeven( GameWindow *g, const Image *image ) { g->winSetHiliteImage( GTC_TAB_7, image ); }
-inline void GadgetTabControlSetHiliteColorTabSeven( GameWindow *g, Color color ) { g->winSetHiliteColor( GTC_TAB_7, color ); }
-inline void GadgetTabControlSetHiliteBorderColorTabSeven( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( GTC_TAB_7, color ); }
-inline const Image *GadgetTabControlGetHiliteImageTabSeven( GameWindow *g ) { return g->winGetHiliteImage( GTC_TAB_7 ); }
-inline Color GadgetTabControlGetHiliteColorTabSeven( GameWindow *g ) { return g->winGetHiliteColor( GTC_TAB_7 ); }
-inline Color GadgetTabControlGetHiliteBorderColorTabSeven( GameWindow *g ) { return g->winGetHiliteBorderColor( GTC_TAB_7 ); }
-
-inline void GadgetTabControlSetHiliteImageBackground( GameWindow *g, const Image *image ) { g->winSetHiliteImage( GTC_BACKGROUND, image ); }
-inline void GadgetTabControlSetHiliteColorBackground( GameWindow *g, Color color ) { g->winSetHiliteColor( GTC_BACKGROUND, color ); }
-inline void GadgetTabControlSetHiliteBorderColorBackground( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( GTC_BACKGROUND, color ); }
-inline const Image *GadgetTabControlGetHiliteImageBackground( GameWindow *g ) { return g->winGetHiliteImage( GTC_BACKGROUND ); }
-inline Color GadgetTabControlGetHiliteColorBackground( GameWindow *g ) { return g->winGetHiliteColor( GTC_BACKGROUND ); }
-inline Color GadgetTabControlGetHiliteBorderColorBackground( GameWindow *g ) { return g->winGetHiliteBorderColor( GTC_BACKGROUND ); }
-
-
-// EXTERNALS //////////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h b/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h
deleted file mode 100644
index 5d9dd65703d..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GadgetTextEntry.h ////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//
-// Westwood Studios Pacific.
-//
-// Confidential Information
-// Copyright (C) 2001 - All Rights Reserved
-//
-//-----------------------------------------------------------------------------
-//
-// Project: RTS3
-//
-// File name: GadgetTextEntry.h
-//
-// Created: Colin Day, June 2001
-//
-// Desc: Helpful interface for TextEntrys
-//
-// TextEntry IMAGE/COLOR organization
-//
-// note that windows that have an outlined text field will use the color
-// for the outline specified with the TextBorder... functions
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-#include "GameClient/GameWindowManager.h"
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-class GameWindow;
-
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-// INLINING ///////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-inline void GadgetTextEntrySetText( GameWindow *g, UnicodeString text )
-{
- TheWindowManager->winSendSystemMsg( g, GEM_SET_TEXT, (WindowMsgData)&text, 0 );
-}
-extern UnicodeString GadgetTextEntryGetText( GameWindow *textentry ); ///< Get the text from the text entry field
-extern void GadgetTextEntrySetMaxLen( GameWindow *g, Short length );
-extern void GadgetTextEntrySetFont( GameWindow *g, GameFont *font ); ///< set font for window and edit text display strings
-inline void GadgetTextEntrySetTextColor( GameWindow *g, Color color )
-{
- Color back = g->winGetEnabledTextBorderColor();
- g->winSetEnabledTextColors(color,back);
- g->winSetDisabledTextColors(GameDarkenColor(color, 25),back);
-}
-// text colors
-
-// enabled
-inline void GadgetTextEntrySetEnabledImageLeft( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 0, image ); }
-inline void GadgetTextEntrySetEnabledImageRight( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 1, image ); }
-inline void GadgetTextEntrySetEnabledImageCenter( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 2, image ); }
-inline void GadgetTextEntrySetEnabledImageSmallCenter( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 3, image ); }
-inline void GadgetTextEntrySetEnabledColor( GameWindow *g, Color color ) { g->winSetEnabledColor( 0, color ); }
-inline void GadgetTextEntrySetEnabledBorderColor( GameWindow *g, Color color ) { g->winSetEnabledBorderColor( 0, color ); }
-inline const Image *GadgetTextEntryGetEnabledImageLeft( GameWindow *g ) { return g->winGetEnabledImage( 0 ); }
-inline const Image *GadgetTextEntryGetEnabledImageRight( GameWindow *g ) { return g->winGetEnabledImage( 1 ); }
-inline const Image *GadgetTextEntryGetEnabledImageCenter( GameWindow *g ) { return g->winGetEnabledImage( 2 ); }
-inline const Image *GadgetTextEntryGetEnabledImageSmallCenter( GameWindow *g ) { return g->winGetEnabledImage( 3 ); }
-inline Color GadgetTextEntryGetEnabledColor( GameWindow *g ) { return g->winGetEnabledColor( 0 ); }
-inline Color GadgetTextEntryGetEnabledBorderColor( GameWindow *g ) { return g->winGetEnabledBorderColor( 0 ); }
-
-// disabled
-inline void GadgetTextEntrySetDisabledImageLeft( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 0, image ); }
-inline void GadgetTextEntrySetDisabledImageRight( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 1, image ); }
-inline void GadgetTextEntrySetDisabledImageCenter( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 2, image ); }
-inline void GadgetTextEntrySetDisabledImageSmallCenter( GameWindow *g, const Image *image ) { g->winSetDisabledImage( 3, image ); }
-inline void GadgetTextEntrySetDisabledColor( GameWindow *g, Color color ) { g->winSetDisabledColor( 0, color ); }
-inline void GadgetTextEntrySetDisabledBorderColor( GameWindow *g, Color color ) { g->winSetDisabledBorderColor( 0, color ); }
-inline const Image *GadgetTextEntryGetDisabledImageLeft( GameWindow *g ) { return g->winGetDisabledImage( 0 ); }
-inline const Image *GadgetTextEntryGetDisabledImageRight( GameWindow *g ) { return g->winGetDisabledImage( 1 ); }
-inline const Image *GadgetTextEntryGetDisabledImageCenter( GameWindow *g ) { return g->winGetDisabledImage( 2 ); }
-inline const Image *GadgetTextEntryGetDisabledImageSmallCenter( GameWindow *g ) { return g->winGetDisabledImage( 3 ); }
-inline Color GadgetTextEntryGetDisabledColor( GameWindow *g ) { return g->winGetDisabledColor( 0 ); }
-inline Color GadgetTextEntryGetDisabledBorderColor( GameWindow *g ) { return g->winGetDisabledBorderColor( 0 ); }
-
-// hilite
-inline void GadgetTextEntrySetHiliteImageLeft( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 0, image ); }
-inline void GadgetTextEntrySetHiliteImageRight( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 1, image ); }
-inline void GadgetTextEntrySetHiliteImageCenter( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 2, image ); }
-inline void GadgetTextEntrySetHiliteImageSmallCenter( GameWindow *g, const Image *image ) { g->winSetHiliteImage( 3, image ); }
-inline void GadgetTextEntrySetHiliteColor( GameWindow *g, Color color ) { g->winSetHiliteColor( 0, color ); }
-inline void GadgetTextEntrySetHiliteBorderColor( GameWindow *g, Color color ) { g->winSetHiliteBorderColor( 0, color ); }
-inline const Image *GadgetTextEntryGetHiliteImageLeft( GameWindow *g ) { return g->winGetHiliteImage( 0 ); }
-inline const Image *GadgetTextEntryGetHiliteImageRight( GameWindow *g ) { return g->winGetHiliteImage( 1 ); }
-inline const Image *GadgetTextEntryGetHiliteImageCenter( GameWindow *g ) { return g->winGetHiliteImage( 2 ); }
-inline const Image *GadgetTextEntryGetHiliteImageSmallCenter( GameWindow *g ) { return g->winGetHiliteImage( 3 ); }
-inline Color GadgetTextEntryGetHiliteColor( GameWindow *g ) { return g->winGetHiliteColor( 0 ); }
-inline Color GadgetTextEntryGetHiliteBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 0 ); }
-
-// EXTERNALS //////////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h b/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h
deleted file mode 100644
index 2fc315faa20..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GameInfoWindow.h ///////////////////////////////////////////////////////////////////////////
-// Created: Chris Huybregts, Feb 2002
-// Desc: Game Info Window Header
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "GameClient/GameWindow.h"
-#include "GameNetwork/LANGameInfo.h"
-
-// Function Stubs for GameInfoWindow
-extern void CreateLANGameInfoWindow( GameWindow *sizeAndPosWin );
-extern void DestroyGameInfoWindow();
-extern void RefreshGameInfoWindow(GameInfo *gameInfo, UnicodeString gameName);
-extern void HideGameInfoWindow(Bool hide);
diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h b/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h
deleted file mode 100644
index 9d5eec2be54..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GameWindowID.h ///////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//
-// Westwood Studios Pacific.
-//
-// Confidential Information
-// Copyright (C) 2001 - All Rights Reserved
-//
-//-----------------------------------------------------------------------------
-//
-// Project: RTS3
-//
-// File name: GameWindowID.h
-//
-// Created: Colin Day, July 2001
-//
-// Desc: Game window ID definitions, this is so we can uniquely
-// identify any window in the game and pass messages from
-// anywhere to anywhere else instantly
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-
-// USER INCLUDES //////////////////////////////////////////////////////////////
-
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-#define GWID_INVALID 0
-
-#define GWID_SIDEBAR 100
-
-#define GWID_SIDEBAR_1 101
-#define GWID_SIDEBAR_2 102
-#define GWID_SIDEBAR_3 103
-#define GWID_SIDEBAR_4 104
-#define GWID_SIDEBAR_5 105
-#define GWID_SIDEBAR_6 106
-#define GWID_SIDEBAR_7 107
-#define GWID_SIDEBAR_8 108
-#define GWID_SIDEBAR_9 109
-#define GWID_SIDEBAR_10 110
-#define GWID_SIDEBAR_11 111
-#define GWID_SIDEBAR_12 112
-
-#define GWID_SIDEBAR_TAB_1 151
-#define GWID_SIDEBAR_TAB_2 152
-#define GWID_SIDEBAR_TAB_3 153
-#define GWID_SIDEBAR_TAB_4 154
-
-#define GWID_SIDEBAR_RADAR 175
-
-// INLINING ///////////////////////////////////////////////////////////////////
-
-// EXTERNALS //////////////////////////////////////////////////////////////////
diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindowManager.h b/Generals/Code/GameEngine/Include/GameClient/GameWindowManager.h
deleted file mode 100644
index a3a4f53a4a6..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/GameWindowManager.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: GameWindowManager.h //////////////////////////////////////////////////////////////////////
-// Created: Colin Day, June 2001
-// Desc: The game window manager is the interface for interacting with
-// the windowing system for purposes of any menus, or GUI
-// controls.
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "Common/STLTypedefs.h"
-#include "Common/SubsystemInterface.h"
-#include "GameClient/WindowLayout.h"
-#include "GameClient/KeyDefs.h"
-#include "GameClient/Gadget.h"
-
-class GameWindow;
-
-//-------------------------------------------------------------------------------------------------
-/** Window layout info is a structure that can be passed to the load function of
- * a window script. After the script is loaded, this parameter (if present)
- * will contain information about the script file at a global level such
- * as what file version was loaded, global layout callbacks, etc */
-//-------------------------------------------------------------------------------------------------
-enum { MAX_LAYOUT_FUNC_LEN = 256 };
-
-typedef std::list GameWindowList;
-
-class WindowLayoutInfo
-{
-
-public:
- WindowLayoutInfo();
-
- UnsignedInt version; ///< file version that was loaded
- WindowLayoutInitFunc init; ///< init method (if specified)
- WindowLayoutUpdateFunc update; ///< update method (if specified)
- WindowLayoutShutdownFunc shutdown; ///< shutdown method (if specified)
- AsciiString initNameString; ///< init method in flavor of string name
- AsciiString updateNameString; ///< update method in string flavor
- AsciiString shutdownNameString; ///< shutdown method in string flavor, mmm!
- std::list windows; ///< list of top-level windows in the layout
-};
-
-//-------------------------------------------------------------------------------------------------
-/** There exists a singleton GameWindowManager that defines how we can
- * interact with the game windowing system */
-//-------------------------------------------------------------------------------------------------
-class GameWindowManager : public SubsystemInterface
-{
-
-friend class GameWindow;
-
-public:
-
- GameWindowManager();
- virtual ~GameWindowManager() override;
-
- //-----------------------------------------------------------------------------------------------
- virtual void init() override; ///< initialize function
- virtual void reset() override; ///< reset the system
- virtual void update() override; ///< update method, called once per frame
-
- virtual GameWindow *allocateNewWindow() = 0; ///< new game window
-
- void linkWindow( GameWindow *window ); ///< link into master list
- void unlinkWindow( GameWindow *window ); ///< unlink from master list
- void unlinkChildWindow( GameWindow *window ); ///< remove child from parent list
- void insertWindowAheadOf( GameWindow *window, GameWindow *aheadOf ); ///< add window to list 'ahead of'
-
- virtual GameWinDrawFunc getPushButtonImageDrawFunc() = 0;
- virtual GameWinDrawFunc getPushButtonDrawFunc() = 0;
- virtual GameWinDrawFunc getCheckBoxImageDrawFunc() = 0;
- virtual GameWinDrawFunc getCheckBoxDrawFunc() = 0;
- virtual GameWinDrawFunc getRadioButtonImageDrawFunc() = 0;
- virtual GameWinDrawFunc getRadioButtonDrawFunc() = 0;
- virtual GameWinDrawFunc getTabControlImageDrawFunc() = 0;
- virtual GameWinDrawFunc getTabControlDrawFunc() = 0;
- virtual GameWinDrawFunc getListBoxImageDrawFunc() = 0;
- virtual GameWinDrawFunc getListBoxDrawFunc() = 0;
- virtual GameWinDrawFunc getComboBoxImageDrawFunc() = 0;
- virtual GameWinDrawFunc getComboBoxDrawFunc() = 0;
- virtual GameWinDrawFunc getHorizontalSliderImageDrawFunc() = 0;
- virtual GameWinDrawFunc getHorizontalSliderDrawFunc() = 0;
- virtual GameWinDrawFunc getVerticalSliderImageDrawFunc() = 0;
- virtual GameWinDrawFunc getVerticalSliderDrawFunc() = 0;
- virtual GameWinDrawFunc getProgressBarImageDrawFunc() = 0;
- virtual GameWinDrawFunc getProgressBarDrawFunc() = 0;
- virtual GameWinDrawFunc getStaticTextImageDrawFunc() = 0;
- virtual GameWinDrawFunc getStaticTextDrawFunc() = 0;
- virtual GameWinDrawFunc getTextEntryImageDrawFunc() = 0;
- virtual GameWinDrawFunc getTextEntryDrawFunc() = 0;
-
- //---------------------------------------------------------------------------
-
- virtual GameWinDrawFunc getDefaultDraw(); ///< return default draw func
- virtual GameWinSystemFunc getDefaultSystem(); ///< return default system func
- virtual GameWinInputFunc getDefaultInput(); ///< return default input func
- virtual GameWinTooltipFunc getDefaultTooltip(); ///< return default tooltip func
-
- //---------------------------------------------------------------------------
- // MessageBox creation
- virtual GameWindow *gogoMessageBox(Int x, Int y, Int width, Int height, UnsignedShort buttonFlags,
- UnicodeString titleString, UnicodeString bodyString,
- GameWinMsgBoxFunc yesCallback,
- GameWinMsgBoxFunc noCallback,
- GameWinMsgBoxFunc okCallback,
- GameWinMsgBoxFunc cancelCallback );
-
- virtual GameWindow *gogoMessageBox(Int x, Int y, Int width, Int height, UnsignedShort buttonFlags,
- UnicodeString titleString, UnicodeString bodyString,
- GameWinMsgBoxFunc yesCallback,
- GameWinMsgBoxFunc noCallback,
- GameWinMsgBoxFunc okCallback,
- GameWinMsgBoxFunc cancelCallback, Bool useLogo );
-
-
- //---------------------------------------------------------------------------
- // gadget creation
- virtual GameWindow *gogoGadgetPushButton( GameWindow *parent, UnsignedInt status,
- Int x, Int y, Int width, Int height,
- WinInstanceData *instData,
- GameFont *defaultFont, Bool defaultVisual );
- virtual GameWindow *gogoGadgetCheckbox( GameWindow *parent, UnsignedInt status,
- Int x, Int y, Int width, Int height,
- WinInstanceData *instData,
- GameFont *defaultFont, Bool defaultVisual );
- virtual GameWindow *gogoGadgetRadioButton( GameWindow *parent, UnsignedInt status,
- Int x, Int y, Int width, Int height,
- WinInstanceData *instData,
- RadioButtonData *rData,
- GameFont *defaultFont, Bool defaultVisual );
- virtual GameWindow *gogoGadgetTabControl( GameWindow *parent, UnsignedInt status,
- Int x, Int y, Int width, Int height,
- WinInstanceData *instData,
- TabControlData *rData,
- GameFont *defaultFont, Bool defaultVisual );
- virtual GameWindow *gogoGadgetListBox( GameWindow *parent, UnsignedInt status,
- Int x, Int y, Int width, Int height,
- WinInstanceData *instData,
- ListboxData *listboxData,
- GameFont *defaultFont, Bool defaultVisual );
- virtual GameWindow *gogoGadgetSlider( GameWindow *parent, UnsignedInt status,
- Int x, Int y, Int width, Int height,
- WinInstanceData *instData,
- SliderData *sliderData,
- GameFont *defaultFont, Bool defaultVisual );
- virtual GameWindow *gogoGadgetProgressBar( GameWindow *parent, UnsignedInt status,
- Int x, Int y, Int width, Int height,
- WinInstanceData *instData,
- GameFont *defaultFont, Bool defaultVisual );
- virtual GameWindow *gogoGadgetStaticText( GameWindow *parent, UnsignedInt status,
- Int x, Int y, Int width, Int height,
- WinInstanceData *instData,
- TextData *textData,
- GameFont *defaultFont, Bool defaultVisual );
- virtual GameWindow *gogoGadgetTextEntry( GameWindow *parent, UnsignedInt status,
- Int x, Int y, Int width, Int height,
- WinInstanceData *instData,
- EntryData *entryData,
- GameFont *defaultFont, Bool defaultVisual );
- virtual GameWindow *gogoGadgetComboBox( GameWindow *parent, UnsignedInt status,
- Int x, Int y, Int width, Int height,
- WinInstanceData *instData,
- ComboBoxData *comboBoxDataTemplate,
- GameFont *defaultFont, Bool defaultVisual );
-
- /** Use this method to assign the default images to gadgets as
- * they area created */
- virtual void assignDefaultGadgetLook( GameWindow *gadget,
- GameFont *defaultFont,
- Bool assignVisual );
-
- //---------------------------------------------------------------------------
- // Creating windows
- /// create new window(s) from .wnd file ... see definition for what is returned
- virtual GameWindow *winCreateFromScript( AsciiString filename, WindowLayoutInfo *info = nullptr );
-
- /// create new window(s) from .wnd file and wrap in a WindowLayout
- virtual WindowLayout *winCreateLayout( AsciiString filename );
-
- /// free temporary strings to make the memory leak manager happy.
- virtual void freeStaticStrings();
-
- /// create a new window by setting up parameters and callbacks
- virtual GameWindow *winCreate( GameWindow *parent, UnsignedInt status,
- Int x, Int y, Int width, Int height,
- GameWinSystemFunc system,
- WinInstanceData *instData = nullptr );
-
- //---------------------------------------------------------------------------
- // Manipulating windows in the system
- virtual Int winDestroy( GameWindow *window ); ///< destroy this window
- virtual Int winDestroyAll(); ///< destroy all windows in the system
- virtual GameWindow *winGetWindowList(); ///< get head of master list
-
- /// hide all windows in a certain range of id's (inclusive );
- virtual void hideWindowsInRange( GameWindow *baseWindow, Int first, Int last,
- Bool hideFlag );
- /// enable all windows in a range of id's (inclusive)
- virtual void enableWindowsInRange( GameWindow *baseWindow, Int first, Int last,
- Bool enableFlag );
-
- /// this gets called from winHide() when a window hides itself
- virtual void windowHiding( GameWindow *window );
-
- virtual void winRepaint(); ///< draw GUI in reverse order
-
- virtual void winNextTab( GameWindow *window ); ///< give keyboard focus to the next window in the tab list
-
- virtual void winPrevTab( GameWindow *window ); ///< give keyboard focus to the previous window in the tab list
-
- virtual void registerTabList( GameWindowList tabList ); ///< we have to register a Tab List
- virtual void clearTabList(); ///< we's gotz ta clear the tab list yo!
-
- // --------------------------------------------------------------------------
- /// process a single mouse event
- virtual WinInputReturnCode winProcessMouseEvent( GameWindowMessage msg,
- ICoord2D *mousePos,
- void *data );
- /// process a singke key event
- virtual WinInputReturnCode winProcessKey( UnsignedByte key,
- UnsignedByte state );
- // --------------------------------------------------------------------------
-
- virtual GameWindow *winGetFocus(); ///< return window that has the focus
- virtual Int winSetFocus( GameWindow *window ); ///< set this window as has focus
- virtual void winSetGrabWindow( GameWindow *window ); ///< set the grab window
- virtual GameWindow *winGetGrabWindow(); ///< who is currently 'held' by mouse
- virtual void winSetLoneWindow( GameWindow *window ); ///< set the open window
-
- // Finds the top-level window at the mouse position that matches the required and forbidden status masks.
- virtual GameWindow* findWindowUnderMouse(GameWindow*& toolTipWindow, const ICoord2D* mousePos, unsigned int requiredStatusMask, unsigned int forbiddenStatusMask);
- static bool isMouseWithinWindow(GameWindow* window, const ICoord2D* mousePos, unsigned int requiredStatusMask, unsigned int forbiddenStatusMask);
-
- virtual Bool isEnabled( GameWindow *win ); ///< is window or parents enabled
- virtual Bool isHidden( GameWindow *win ); ///< is parent or parents hidden
- virtual void addWindowToParent( GameWindow *window, GameWindow *parent );
- virtual void addWindowToParentAtEnd( GameWindow *window, GameWindow *parent );
-
- /// sends a system message to specified window
- virtual WindowMsgHandledType winSendSystemMsg( GameWindow *window, UnsignedInt msg,
- WindowMsgData mData1, WindowMsgData mData2 );
-
- /// sends an input message to the specified window
- virtual WindowMsgHandledType winSendInputMsg( GameWindow *window, UnsignedInt msg,
- WindowMsgData mData1, WindowMsgData mData2 );
-
- /** get the window pointer from id, starting at 'window' and searching
- down the hierarchy. If 'window' is nullptr then all windows will
- be searched */
- virtual GameWindow *winGetWindowFromId( GameWindow *window, Int id );
- virtual Int winCapture( GameWindow *window ); ///< captures the mouse
- virtual Int winRelease( GameWindow *window ); ///< release mouse capture
- virtual GameWindow *winGetCapture(); ///< current mouse capture settings
-
- virtual Int winSetModal( GameWindow *window ); ///< put at top of modal stack
- virtual Int winUnsetModal( GameWindow *window ); /**< take window off modal stack, if window is
- not at top of stack and error will occur */
-
- //---------------------------------------------------------------------------
- /////////////////////////////////////////////////////////////////////////////
- //---------------------------------------------------------------------------
- //---------------------------------------------------------------------------
- // The following public functions you should implement change the guts
- // for to work with your application. Rather than draw images, or do string
- // operations with native methods, the game window system will always call
- // these methods to get the work done it needs
- //---------------------------------------------------------------------------
- //---------------------------------------------------------------------------
- /////////////////////////////////////////////////////////////////////////////
- //---------------------------------------------------------------------------
-
- /// draw image, coord are in screen and should be kepth within that box specified
- virtual void winDrawImage( const Image *image, Int startX, Int startY, Int endX, Int endY, Color color = 0xFFFFFFFF );
- /// draw filled rect, coords are absolute screen coords
- virtual void winFillRect( Color color, Real width, Int startX, Int startY, Int endX, Int endY );
- /// draw rect outline, coords are absolute screen coords
- virtual void winOpenRect( Color color, Real width, Int startX, Int startY, Int endX, Int endY );
- /// draw line, coords are absolute screen coords
- virtual void winDrawLine( Color color, Real width, Int startX, Int startY, Int endX, Int endY );
- /// Make a color representation out of RGBA components
- virtual Color winMakeColor( UnsignedByte red, UnsignedByte green, UnsignedByte blue, UnsignedByte alpha );
- /** Find an image reference and return a pointer to its image, you may
- recreate all Image structs to suit your project */
- virtual const Image *winFindImage( const char *name );
- virtual Int winFontHeight( GameFont *font ); ///< get height of font in pixels
- virtual Int winIsDigit( Int c ); ///< is character a digit
- virtual Int winIsAscii( Int c ); ///< is character a digit
- virtual Int winIsAlNum( Int c ); ///< is character alpha-numeric
- virtual void winFormatText( GameFont *font, UnicodeString text, Color color,
- Int x, Int y, Int width, Int height );
- virtual void winGetTextSize( GameFont *font, UnicodeString text,
- Int *width, Int *height, Int maxWidth );
- virtual UnicodeString winTextLabelToText( AsciiString label ); ///< convert localizable text label to real text
- virtual GameFont *winFindFont( AsciiString fontName, Int pointSize, Bool bold ); ///< get a font given a name
-
- /// @todo just for testing, remov this
- Bool initTestGUI();
-
- virtual GameWindow *getWindowUnderCursor( Int x, Int y, Bool ignoreEnabled = FALSE ); ///< find the top window at the given coordinates
-
- //---------------------------------------------------------------------------
- /////////////////////////////////////////////////////////////////////////////
- //---------------------------------------------------------------------------
- //---------------------------------------------------------------------------
- //---------------------------------------------------------------------------
- //---------------------------------------------------------------------------
- /////////////////////////////////////////////////////////////////////////////
- //---------------------------------------------------------------------------
-
-protected:
-
- void processDestroyList(); ///< process windows waiting to be killed
-
- Int drawWindow( GameWindow *window ); ///< draw this window
-
- void dumpWindow( GameWindow *window ); ///< for debugging
-
- GameWindow *m_windowList; // list of all top level windows
- GameWindow *m_windowTail; // last in windowList
-
- GameWindow *m_destroyList; // list of windows to destroy
-
- GameWindow *m_currMouseRgn; // window that mouse is over
- GameWindow *m_mouseCaptor; // window that captured mouse
- GameWindow *m_keyboardFocus; // window that has input focus
- ModalWindow *m_modalHead; // top of windows in the modal stack
- GameWindow *m_grabWindow; // window that grabbed the last down event
- GameWindow *m_loneWindow; // Set if we just opened a Lone Window
- GameWindowList m_tabList; // we have to register a tab list to make a tab list.
- const Image *m_cursorBitmap;
- UnsignedInt m_captureFlags;
-
-};
-
-// INLINE /////////////////////////////////////////////////////////////////////////////////////////
-inline GameWinDrawFunc GameWindowManager::getDefaultDraw() { return GameWinDefaultDraw; }
-inline GameWinSystemFunc GameWindowManager::getDefaultSystem() { return GameWinDefaultSystem; }
-inline GameWinInputFunc GameWindowManager::getDefaultInput() { return GameWinDefaultInput; }
-inline GameWinTooltipFunc GameWindowManager::getDefaultTooltip() { return GameWinDefaultTooltip; }
-
-// EXTERN /////////////////////////////////////////////////////////////////////////////////////////
-extern GameWindowManager *TheWindowManager; ///< singleton extern definition
-extern UnsignedInt WindowLayoutCurrentVersion; ///< current version of our window layouts
-
-// this function lets us generically pass button selections to our parent, we may
-// frequently want to do this because we want windows grouped on child windows for
-// convenience, but only want one logical system procedure responding to them all
-extern WindowMsgHandledType PassSelectedButtonsToParentSystem( GameWindow *window,
- UnsignedInt msg,
- WindowMsgData mData1,
- WindowMsgData mData2 );
-extern WindowMsgHandledType PassMessagesToParentSystem( GameWindow *window,
- UnsignedInt msg,
- WindowMsgData mData1,
- WindowMsgData mData2 );
-
-// TheSuperHackers @feature helmutbuhler 24/04/2025
-// GameWindowManager that does nothing. Used for Headless Mode.
-class GameWindowManagerDummy : public GameWindowManager
-{
-public:
- virtual GameWindow *winGetWindowFromId(GameWindow *window, Int id) override;
- virtual GameWindow *winCreateFromScript(AsciiString filenameString, WindowLayoutInfo *info) override;
-
- virtual GameWindow *allocateNewWindow() override { return newInstance(GameWindowDummy); }
-
- virtual GameWinDrawFunc getPushButtonImageDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getPushButtonDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getCheckBoxImageDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getCheckBoxDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getRadioButtonImageDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getRadioButtonDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getTabControlImageDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getTabControlDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getListBoxImageDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getListBoxDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getComboBoxImageDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getComboBoxDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getHorizontalSliderImageDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getHorizontalSliderDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getVerticalSliderImageDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getVerticalSliderDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getProgressBarImageDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getProgressBarDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getStaticTextImageDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getStaticTextDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getTextEntryImageDrawFunc() override { return nullptr; }
- virtual GameWinDrawFunc getTextEntryDrawFunc() override { return nullptr; }
-};
diff --git a/Generals/Code/GameEngine/Include/GameClient/HintSpy.h b/Generals/Code/GameEngine/Include/GameClient/HintSpy.h
deleted file mode 100644
index 32cf775deda..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/HintSpy.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: HintSpy.h ///////////////////////////////////////////////////////////
-// Author: Steven Johnson, Dec 2001
-
-#pragma once
-
-#include "GameClient/InGameUI.h"
-
-//-----------------------------------------------------------------------------
-class HintSpyTranslator : public GameMessageTranslator
-{
-public:
- virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override;
- virtual ~HintSpyTranslator() override { }
-};
diff --git a/Generals/Code/GameEngine/Include/GameClient/HotKey.h b/Generals/Code/GameEngine/Include/GameClient/HotKey.h
deleted file mode 100644
index 3c9cade4eef..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/HotKey.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-
-// FILE: HotKey.h /////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-//
-// Electronic Arts Pacific.
-//
-// Confidential Information
-// Copyright (C) 2002 - All Rights Reserved
-//
-//-----------------------------------------------------------------------------
-//
-// created: Sep 2002
-//
-// Filename: HotKey.h
-//
-// author: Chris Huybregts
-//
-// purpose:
-//
-//-----------------------------------------------------------------------------
-///////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-//-----------------------------------------------------------------------------
-// SYSTEM INCLUDES ////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// USER INCLUDES //////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-#include "Common/SubsystemInterface.h"
-#include "Common/MessageStream.h"
-//-----------------------------------------------------------------------------
-// FORWARD REFERENCES /////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-class AsciiString;
-class GameWindow;
-//-----------------------------------------------------------------------------
-// TYPE DEFINES ///////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-class HotKeyTranslator : public GameMessageTranslator
-{
-public:
- virtual GameMessageDisposition translateGameMessage(const GameMessage *msg) override;
- virtual ~HotKeyTranslator() override { }
-};
-
-//-----------------------------------------------------------------------------
-class HotKey
-{
-public:
- HotKey();
- GameWindow *m_win;
- AsciiString m_key;
- // we may need a checkmark system.
-};
-
-//-----------------------------------------------------------------------------
-class HotKeyManager : public SubsystemInterface
-{
-public:
- HotKeyManager();
- virtual ~HotKeyManager() override;
- // Inherited from subsystem interface -----------------------------------------------------------
- virtual void init() override; ///< Initialize the Hotkey system
- virtual void update() override {} ///< A No-op for us
- virtual void reset() override; ///< Reset
- //-----------------------------------------------------------------------------------------------
-
- void addHotKey( GameWindow *win, const AsciiString& key);
- Bool executeHotKey( const AsciiString& key); // called fromt eh HotKeyTranslator
-
- AsciiString searchHotKey( const AsciiString& label);
- AsciiString searchHotKey( const UnicodeString& uStr );
-
-private:
- typedef std::map HotKeyMap;
- HotKeyMap m_hotKeyMap;
-};
-extern HotKeyManager *TheHotKeyManager;
-//-----------------------------------------------------------------------------
-// INLINING ///////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// EXTERNALS //////////////////////////////////////////////////////////////////
-//-----------------------------------------------------------------------------
diff --git a/Generals/Code/GameEngine/Include/GameClient/Image.h b/Generals/Code/GameEngine/Include/GameClient/Image.h
deleted file mode 100644
index 1436c02d66e..00000000000
--- a/Generals/Code/GameEngine/Include/GameClient/Image.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-** Command & Conquer Generals(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 .
-*/
-
-////////////////////////////////////////////////////////////////////////////////
-// //
-// (c) 2001-2003 Electronic Arts Inc. //
-// //
-////////////////////////////////////////////////////////////////////////////////
-
-// FILE: Image.h //////////////////////////////////////////////////////////////////////////////////
-// Created: Colin Day, June 2001
-// Desc: High level representation of images, this is currently being
-// written so we have a way to refer to images in the windows GUI.
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#pragma once
-
-#include "Common/AsciiString.h"
-#include "Common/GameMemory.h"
-#include "Common/SubsystemInterface.h"
-#include