Skip to content

Commit 9156dad

Browse files
committed
unify(client): Move several GameClient files to Core (TheSuperHackers#2337)
1 parent 3631d56 commit 9156dad

Some content is hidden

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

64 files changed

+121
-6809
lines changed

Core/GameEngine/CMakeLists.txt

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -144,28 +144,28 @@ set(GAMEENGINE_SRC
144144
# Include/GameClient/AnimateWindowManager.h
145145
# Include/GameClient/CampaignManager.h
146146
Include/GameClient/ChallengeGenerals.h
147-
# Include/GameClient/ClientInstance.h
147+
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
152152
# Include/GameClient/ControlBarResizer.h
153153
# Include/GameClient/ControlBarScheme.h
154-
# Include/GameClient/Credits.h
154+
Include/GameClient/Credits.h
155155
# Include/GameClient/DebugDisplay.h
156156
# Include/GameClient/Diplomacy.h
157157
# 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
163+
Include/GameClient/DrawGroupInfo.h
164164
# Include/GameClient/EstablishConnectionsMenu.h
165165
# Include/GameClient/Eva.h
166166
# Include/GameClient/ExtendedMessageBox.h
167167
# Include/GameClient/FontDesc.h
168-
# Include/GameClient/FXList.h
168+
Include/GameClient/FXList.h
169169
# Include/GameClient/Gadget.h
170170
# Include/GameClient/GadgetCheckBox.h
171171
# Include/GameClient/GadgetComboBox.h
@@ -180,14 +180,14 @@ set(GAMEENGINE_SRC
180180
# Include/GameClient/GameClient.h
181181
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
186186
# Include/GameClient/GameWindowID.h
187187
# Include/GameClient/GameWindowManager.h
188188
Include/GameClient/GameWindowTransitions.h
189-
# Include/GameClient/GlobalLanguage.h
190-
# Include/GameClient/GraphDraw.h
189+
Include/GameClient/GlobalLanguage.h
190+
Include/GameClient/GraphDraw.h
191191
# Include/GameClient/GUICallbacks.h
192192
# Include/GameClient/GUICommandTranslator.h
193193
Include/GameClient/HeaderTemplate.h
@@ -198,8 +198,8 @@ set(GAMEENGINE_SRC
198198
# Include/GameClient/InGameUI.h
199199
Include/GameClient/Keyboard.h
200200
# Include/GameClient/KeyDefs.h
201-
# Include/GameClient/LanguageFilter.h
202-
# Include/GameClient/Line2D.h
201+
Include/GameClient/LanguageFilter.h
202+
Include/GameClient/Line2D.h
203203
Include/GameClient/LoadScreen.h
204204
# Include/GameClient/LookAtXlat.h
205205
Include/GameClient/MapUtil.h
@@ -213,17 +213,17 @@ set(GAMEENGINE_SRC
213213
Include/GameClient/ParticleSys.h
214214
# Include/GameClient/PlaceEventTranslator.h
215215
Include/GameClient/ProcessAnimateWindow.h
216-
# Include/GameClient/RadiusDecal.h
216+
Include/GameClient/RadiusDecal.h
217217
# Include/GameClient/RayEffect.h
218-
# Include/GameClient/SelectionInfo.h
218+
Include/GameClient/SelectionInfo.h
219219
# Include/GameClient/SelectionXlat.h
220220
# Include/GameClient/Shadow.h
221221
# Include/GameClient/Shell.h
222222
# Include/GameClient/ShellHooks.h
223223
# Include/GameClient/ShellMenuScheme.h
224224
Include/GameClient/Smudge.h
225225
Include/GameClient/Snow.h
226-
# Include/GameClient/Statistics.h
226+
Include/GameClient/Statistics.h
227227
Include/GameClient/TerrainRoads.h
228228
Include/GameClient/TerrainVisual.h
229229
Include/GameClient/VideoPlayer.h
@@ -688,24 +688,24 @@ set(GAMEENGINE_SRC
688688
Source/Common/UserPreferences.cpp
689689
# Source/Common/version.cpp
690690
Source/Common/WorkerProcess.cpp
691-
# Source/GameClient/ClientInstance.cpp
692-
# Source/GameClient/Color.cpp
693-
# Source/GameClient/Credits.cpp
691+
Source/GameClient/ClientInstance.cpp
692+
Source/GameClient/Color.cpp
693+
Source/GameClient/Credits.cpp
694694
# Source/GameClient/Display.cpp
695-
# Source/GameClient/DisplayString.cpp
696-
# Source/GameClient/DisplayStringManager.cpp
695+
Source/GameClient/DisplayString.cpp
696+
Source/GameClient/DisplayStringManager.cpp
697697
# Source/GameClient/Drawable.cpp
698698
# Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
699699
# Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
700700
# Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
701-
# Source/GameClient/DrawGroupInfo.cpp
701+
Source/GameClient/DrawGroupInfo.cpp
702702
# Source/GameClient/Eva.cpp
703-
# Source/GameClient/FXList.cpp
703+
Source/GameClient/FXList.cpp
704704
# Source/GameClient/GameClient.cpp
705705
# Source/GameClient/GameClientDispatch.cpp
706-
# Source/GameClient/GameText.cpp
707-
# Source/GameClient/GlobalLanguage.cpp
708-
# Source/GameClient/GraphDraw.cpp
706+
Source/GameClient/GameText.cpp
707+
Source/GameClient/GlobalLanguage.cpp
708+
Source/GameClient/GraphDraw.cpp
709709
# Source/GameClient/GUI/AnimateWindowManager.cpp
710710
Source/GameClient/GUI/ChallengeGenerals.cpp
711711
# Source/GameClient/GUI/ControlBar/ControlBar.cpp
@@ -803,8 +803,8 @@ set(GAMEENGINE_SRC
803803
# Source/GameClient/InGameUI.cpp
804804
Source/GameClient/Input/Keyboard.cpp
805805
Source/GameClient/Input/Mouse.cpp
806-
# Source/GameClient/LanguageFilter.cpp
807-
# Source/GameClient/Line2D.cpp
806+
Source/GameClient/LanguageFilter.cpp
807+
Source/GameClient/Line2D.cpp
808808
Source/GameClient/MapUtil.cpp
809809
# Source/GameClient/MessageStream/CommandXlat.cpp
810810
# Source/GameClient/MessageStream/GUICommandTranslator.cpp
@@ -816,10 +816,10 @@ set(GAMEENGINE_SRC
816816
# Source/GameClient/MessageStream/SelectionXlat.cpp
817817
# Source/GameClient/MessageStream/WindowXlat.cpp
818818
Source/GameClient/ParabolicEase.cpp
819-
# Source/GameClient/RadiusDecal.cpp
820-
# Source/GameClient/SelectionInfo.cpp
819+
Source/GameClient/RadiusDecal.cpp
820+
Source/GameClient/SelectionInfo.cpp
821821
Source/GameClient/Snow.cpp
822-
# Source/GameClient/Statistics.cpp
822+
Source/GameClient/Statistics.cpp
823823
# Source/GameClient/System/Anim2D.cpp
824824
# Source/GameClient/System/CampaignManager.cpp
825825
Source/GameClient/System/Debug/AudioDebugDisplay.cpp

GeneralsMD/Code/GameEngine/Include/GameClient/ClientInstance.h renamed to Core/GameEngine/Include/GameClient/ClientInstance.h

File renamed without changes.
File renamed without changes.
File renamed without changes.

GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h renamed to Core/GameEngine/Include/GameClient/DisplayString.h

File renamed without changes.

GeneralsMD/Code/GameEngine/Include/GameClient/DisplayStringManager.h renamed to Core/GameEngine/Include/GameClient/DisplayStringManager.h

File renamed without changes.

GeneralsMD/Code/GameEngine/Include/GameClient/DrawGroupInfo.h renamed to Core/GameEngine/Include/GameClient/DrawGroupInfo.h

File renamed without changes.
File renamed without changes.
File renamed without changes.

GeneralsMD/Code/GameEngine/Include/GameClient/GlobalLanguage.h renamed to Core/GameEngine/Include/GameClient/GlobalLanguage.h

File renamed without changes.

0 commit comments

Comments
 (0)