Skip to content

Commit 686952b

Browse files
committed
unify(gameclient): Move 47 safe GameClient files to Core
- Unified 47 GameClient files (36 headers + 11 sources) - Files have no dependencies on differing infrastructure headers - Deferred 101 files with complex dependencies for future work - Updated CMakeLists.txt in Core, Generals, and GeneralsMD
1 parent 54b8765 commit 686952b

File tree

97 files changed

+141
-8111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+141
-8111
lines changed

Core/GameEngine/CMakeLists.txt

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -139,31 +139,31 @@ set(GAMEENGINE_SRC
139139
Include/Common/XferDeepCRC.h
140140
Include/Common/XferLoad.h
141141
Include/Common/XferSave.h
142-
# Include/GameClient/Anim2D.h
143-
# Include/GameClient/AnimateWindowManager.h
142+
Include/GameClient/Anim2D.h
143+
Include/GameClient/AnimateWindowManager.h
144144
# Include/GameClient/CampaignManager.h
145-
# Include/GameClient/CDCheck.h
145+
Include/GameClient/CDCheck.h
146146
# Include/GameClient/ChallengeGenerals.h
147147
# Include/GameClient/ClientInstance.h
148148
Include/GameClient/ClientRandomValue.h
149-
# Include/GameClient/Color.h
149+
Include/GameClient/Color.h
150150
# Include/GameClient/CommandXlat.h
151151
# Include/GameClient/ControlBar.h
152-
# Include/GameClient/ControlBarResizer.h
152+
Include/GameClient/ControlBarResizer.h
153153
# Include/GameClient/ControlBarScheme.h
154-
# Include/GameClient/Credits.h
155-
# Include/GameClient/DebugDisplay.h
156-
# Include/GameClient/Diplomacy.h
157-
# Include/GameClient/DisconnectMenu.h
154+
Include/GameClient/Credits.h
155+
Include/GameClient/DebugDisplay.h
156+
Include/GameClient/Diplomacy.h
157+
Include/GameClient/DisconnectMenu.h
158158
# Include/GameClient/Display.h
159-
# Include/GameClient/DisplayString.h
160-
# Include/GameClient/DisplayStringManager.h
159+
Include/GameClient/DisplayString.h
160+
Include/GameClient/DisplayStringManager.h
161161
# Include/GameClient/Drawable.h
162162
# Include/GameClient/DrawableInfo.h
163-
# Include/GameClient/DrawGroupInfo.h
164-
# Include/GameClient/EstablishConnectionsMenu.h
163+
Include/GameClient/DrawGroupInfo.h
164+
Include/GameClient/EstablishConnectionsMenu.h
165165
# Include/GameClient/Eva.h
166-
# Include/GameClient/ExtendedMessageBox.h
166+
Include/GameClient/ExtendedMessageBox.h
167167
# Include/GameClient/FontDesc.h
168168
# Include/GameClient/FXList.h
169169
# Include/GameClient/Gadget.h
@@ -176,14 +176,14 @@ set(GAMEENGINE_SRC
176176
# Include/GameClient/GadgetSlider.h
177177
# Include/GameClient/GadgetStaticText.h
178178
# Include/GameClient/GadgetTabControl.h
179-
# Include/GameClient/GadgetTextEntry.h
179+
Include/GameClient/GadgetTextEntry.h
180180
# Include/GameClient/GameClient.h
181-
# Include/GameClient/GameFont.h
181+
Include/GameClient/GameFont.h
182182
# Include/GameClient/GameInfoWindow.h
183-
# Include/GameClient/GameText.h
183+
Include/GameClient/GameText.h
184184
# Include/GameClient/GameWindow.h
185185
# Include/GameClient/GameWindowGlobal.h
186-
# Include/GameClient/GameWindowID.h
186+
Include/GameClient/GameWindowID.h
187187
# Include/GameClient/GameWindowManager.h
188188
# Include/GameClient/GameWindowTransitions.h
189189
# Include/GameClient/GlobalLanguage.h
@@ -192,39 +192,39 @@ set(GAMEENGINE_SRC
192192
# Include/GameClient/GUICommandTranslator.h
193193
# Include/GameClient/HeaderTemplate.h
194194
# Include/GameClient/HintSpy.h
195-
# Include/GameClient/HotKey.h
195+
Include/GameClient/HotKey.h
196196
# Include/GameClient/Image.h
197-
# Include/GameClient/IMEManager.h
197+
Include/GameClient/IMEManager.h
198198
# Include/GameClient/InGameUI.h
199-
# Include/GameClient/Keyboard.h
200-
# Include/GameClient/KeyDefs.h
199+
Include/GameClient/Keyboard.h
200+
Include/GameClient/KeyDefs.h
201201
# Include/GameClient/LanguageFilter.h
202-
# Include/GameClient/Line2D.h
202+
Include/GameClient/Line2D.h
203203
# Include/GameClient/LoadScreen.h
204204
# Include/GameClient/LookAtXlat.h
205205
# Include/GameClient/MapUtil.h
206-
# Include/GameClient/MessageBox.h
206+
Include/GameClient/MessageBox.h
207207
# Include/GameClient/MetaEvent.h
208-
# Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
209-
# Include/GameClient/Module/BeaconClientUpdate.h
210-
# Include/GameClient/Module/SwayClientUpdate.h
211-
# Include/GameClient/Mouse.h
208+
Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
209+
Include/GameClient/Module/BeaconClientUpdate.h
210+
Include/GameClient/Module/SwayClientUpdate.h
211+
Include/GameClient/Mouse.h
212212
# Include/GameClient/ParabolicEase.h
213213
# Include/GameClient/ParticleSys.h
214214
# Include/GameClient/PlaceEventTranslator.h
215-
# Include/GameClient/ProcessAnimateWindow.h
215+
Include/GameClient/ProcessAnimateWindow.h
216216
# Include/GameClient/RadiusDecal.h
217-
# Include/GameClient/RayEffect.h
217+
Include/GameClient/RayEffect.h
218218
# Include/GameClient/SelectionInfo.h
219219
# Include/GameClient/SelectionXlat.h
220-
# Include/GameClient/Shadow.h
221-
# Include/GameClient/Shell.h
222-
# Include/GameClient/ShellHooks.h
223-
# Include/GameClient/ShellMenuScheme.h
220+
Include/GameClient/Shadow.h
221+
Include/GameClient/Shell.h
222+
Include/GameClient/ShellHooks.h
223+
Include/GameClient/ShellMenuScheme.h
224224
# Include/GameClient/Smudge.h
225225
# Include/GameClient/Snow.h
226-
# Include/GameClient/Statistics.h
227-
# Include/GameClient/TerrainRoads.h
226+
Include/GameClient/Statistics.h
227+
Include/GameClient/TerrainRoads.h
228228
# Include/GameClient/TerrainVisual.h
229229
Include/GameClient/VideoPlayer.h
230230
# Include/GameClient/View.h
@@ -687,21 +687,21 @@ set(GAMEENGINE_SRC
687687
# Source/Common/version.cpp
688688
Source/Common/WorkerProcess.cpp
689689
# Source/GameClient/ClientInstance.cpp
690-
# Source/GameClient/Color.cpp
690+
Source/GameClient/Color.cpp
691691
# Source/GameClient/Credits.cpp
692692
# Source/GameClient/Display.cpp
693693
# Source/GameClient/DisplayString.cpp
694-
# Source/GameClient/DisplayStringManager.cpp
694+
Source/GameClient/DisplayStringManager.cpp
695695
# Source/GameClient/Drawable.cpp
696696
# Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
697697
# Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
698698
# Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
699-
# Source/GameClient/DrawGroupInfo.cpp
699+
Source/GameClient/DrawGroupInfo.cpp
700700
# Source/GameClient/Eva.cpp
701701
# Source/GameClient/FXList.cpp
702702
# Source/GameClient/GameClient.cpp
703703
# Source/GameClient/GameClientDispatch.cpp
704-
# Source/GameClient/GameText.cpp
704+
Source/GameClient/GameText.cpp
705705
# Source/GameClient/GlobalLanguage.cpp
706706
# Source/GameClient/GraphDraw.cpp
707707
# Source/GameClient/GUI/AnimateWindowManager.cpp
@@ -713,7 +713,7 @@ set(GAMEENGINE_SRC
713713
# Source/GameClient/GUI/ControlBar/ControlBarMultiSelect.cpp
714714
# Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp
715715
# Source/GameClient/GUI/ControlBar/ControlBarOCLTimer.cpp
716-
# Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
716+
Source/GameClient/GUI/ControlBar/ControlBarPrintPositions.cpp
717717
# Source/GameClient/GUI/ControlBar/ControlBarResizer.cpp
718718
# Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
719719
# Source/GameClient/GUI/ControlBar/ControlBarStructureInventory.cpp
@@ -731,7 +731,7 @@ set(GAMEENGINE_SRC
731731
# Source/GameClient/GUI/Gadget/GadgetTabControl.cpp
732732
# Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp
733733
# Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
734-
# Source/GameClient/GUI/GameFont.cpp
734+
Source/GameClient/GUI/GameFont.cpp
735735
# Source/GameClient/GUI/GameWindow.cpp
736736
# Source/GameClient/GUI/GameWindowGlobal.cpp
737737
# Source/GameClient/GUI/GameWindowManager.cpp
@@ -795,14 +795,14 @@ set(GAMEENGINE_SRC
795795
# Source/GameClient/GUI/ProcessAnimateWindow.cpp
796796
# Source/GameClient/GUI/Shell/Shell.cpp
797797
# Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
798-
# Source/GameClient/GUI/WindowLayout.cpp
798+
Source/GameClient/GUI/WindowLayout.cpp
799799
Source/GameClient/GUI/WindowVideoManager.cpp
800800
# Source/GameClient/GUI/WinInstanceData.cpp
801801
# Source/GameClient/InGameUI.cpp
802802
# Source/GameClient/Input/Keyboard.cpp
803803
# Source/GameClient/Input/Mouse.cpp
804-
# Source/GameClient/LanguageFilter.cpp
805-
# Source/GameClient/Line2D.cpp
804+
Source/GameClient/LanguageFilter.cpp
805+
Source/GameClient/Line2D.cpp
806806
# Source/GameClient/MapUtil.cpp
807807
# Source/GameClient/MessageStream/CommandXlat.cpp
808808
# Source/GameClient/MessageStream/GUICommandTranslator.cpp
@@ -817,11 +817,11 @@ set(GAMEENGINE_SRC
817817
# Source/GameClient/RadiusDecal.cpp
818818
# Source/GameClient/SelectionInfo.cpp
819819
# Source/GameClient/Snow.cpp
820-
# Source/GameClient/Statistics.cpp
820+
Source/GameClient/Statistics.cpp
821821
# Source/GameClient/System/Anim2D.cpp
822822
# Source/GameClient/System/CampaignManager.cpp
823823
Source/GameClient/System/Debug/AudioDebugDisplay.cpp
824-
# Source/GameClient/System/DebugDisplay.cpp
824+
Source/GameClient/System/DebugDisplay.cpp
825825
# Source/GameClient/System/Image.cpp
826826
# Source/GameClient/System/ParticleSys.cpp
827827
# Source/GameClient/System/RayEffect.cpp

0 commit comments

Comments
 (0)