Skip to content

Commit 915f319

Browse files
committed
unify(common): Move 88 Common files to Core
1 parent 746c017 commit 915f319

File tree

182 files changed

+348
-12401
lines changed

Some content is hidden

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

182 files changed

+348
-12401
lines changed

Core/GameEngine/CMakeLists.txt

Lines changed: 110 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,36 @@ set(GAMEENGINE_SRC
1313
Include/Common/AudioRequest.h
1414
Include/Common/AudioSettings.h
1515
# Include/Common/BattleHonors.h
16-
# Include/Common/BezFwdIterator.h
17-
# Include/Common/BezierSegment.h
18-
# Include/Common/BitFlags.h
19-
# Include/Common/BitFlagsIO.h
20-
# Include/Common/BorderColors.h
16+
Include/Common/BezFwdIterator.h
17+
Include/Common/BezierSegment.h
18+
#Include/Common/BitFlags.h
19+
#Include/Common/BitFlagsIO.h
20+
Include/Common/BorderColors.h
2121
# Include/Common/BuildAssistant.h
22-
# Include/Common/CDManager.h
23-
# Include/Common/ClientUpdateModule.h
22+
Include/Common/CDManager.h
23+
Include/Common/ClientUpdateModule.h
2424
# Include/Common/CommandLine.h
2525
Include/Common/crc.h
2626
Include/Common/CRCDebug.h
2727
# Include/Common/CriticalSection.h
2828
# Include/Common/CustomMatchPreferences.h
29-
# Include/Common/DamageFX.h
30-
# Include/Common/DataChunk.h
29+
#Include/Common/DamageFX.h
30+
#Include/Common/DataChunk.h
3131
Include/Common/Debug.h
32-
# Include/Common/Dict.h
33-
# Include/Common/Directory.h
32+
Include/Common/Dict.h
33+
Include/Common/Directory.h
3434
# Include/Common/DisabledTypes.h
35-
# Include/Common/DiscreteCircle.h
35+
Include/Common/DiscreteCircle.h
3636
# Include/Common/DrawModule.h
3737
Include/Common/DynamicAudioEventInfo.h
38-
# Include/Common/encrypt.h
38+
Include/Common/encrypt.h
3939
# Include/Common/Energy.h
40-
# Include/Common/Errors.h
40+
Include/Common/Errors.h
4141
Include/Common/file.h
4242
Include/Common/FileSystem.h
4343
Include/Common/FramePacer.h
4444
Include/Common/FrameRateLimit.h
45-
# Include/Common/FunctionLexicon.h
45+
Include/Common/FunctionLexicon.h
4646
Include/Common/GameAudio.h
4747
# Include/Common/GameCommon.h
4848
Include/Common/GameDefines.h
@@ -51,89 +51,89 @@ set(GAMEENGINE_SRC
5151
Include/Common/GameMemory.h
5252
Include/Common/GameMusic.h
5353
Include/Common/GameSounds.h
54-
# Include/Common/GameSpyMiscPreferences.h
55-
# Include/Common/GameState.h
56-
# Include/Common/GameStateMap.h
57-
# Include/Common/GameType.h
54+
Include/Common/GameSpyMiscPreferences.h
55+
Include/Common/GameState.h
56+
Include/Common/GameStateMap.h
57+
#Include/Common/GameType.h
5858
Include/Common/GameUtility.h
59-
# Include/Common/Geometry.h
59+
Include/Common/Geometry.h
6060
# Include/Common/GlobalData.h
61-
# Include/Common/Handicap.h
62-
# Include/Common/IgnorePreferences.h
61+
Include/Common/Handicap.h
62+
Include/Common/IgnorePreferences.h
6363
# Include/Common/INI.h
64-
# Include/Common/INIException.h
64+
Include/Common/INIException.h
6565
# Include/Common/KindOf.h
66-
# Include/Common/LadderPreferences.h
67-
# Include/Common/Language.h
68-
# Include/Common/LatchRestore.h
69-
# Include/Common/List.h
66+
Include/Common/LadderPreferences.h
67+
Include/Common/Language.h
68+
Include/Common/LatchRestore.h
69+
#Include/Common/List.h
7070
Include/Common/LocalFile.h
7171
Include/Common/LocalFileSystem.h
7272
# Include/Common/MapObject.h
7373
# Include/Common/MapReaderWriterInfo.h
7474
# Include/Common/MessageStream.h
7575
Include/Common/MiniDumper.h
76-
# Include/Common/MiniLog.h
76+
Include/Common/MiniLog.h
7777
Include/Common/MiscAudio.h
78-
# Include/Common/MissionStats.h
78+
#Include/Common/MissionStats.h
7979
# Include/Common/ModelState.h
8080
# Include/Common/Module.h
81-
# Include/Common/ModuleFactory.h
82-
# Include/Common/Money.h
81+
Include/Common/ModuleFactory.h
82+
#Include/Common/Money.h
8383
# Include/Common/MultiplayerSettings.h
8484
# Include/Common/NameKeyGenerator.h
85-
Include/Common/ObjectStatusTypes.h
86-
# Include/Common/OSDisplay.h
87-
# Include/Common/Overridable.h
88-
# Include/Common/Override.h
89-
# Include/Common/PartitionSolver.h
90-
# Include/Common/PerfMetrics.h
85+
# Include/Common/ObjectStatusTypes.h
86+
Include/Common/OSDisplay.h
87+
Include/Common/Overridable.h
88+
Include/Common/Override.h
89+
Include/Common/PartitionSolver.h
90+
Include/Common/PerfMetrics.h
9191
# Include/Common/PerfTimer.h
9292
# Include/Common/Player.h
93-
# Include/Common/PlayerList.h
93+
#Include/Common/PlayerList.h
9494
# Include/Common/PlayerTemplate.h
95-
# Include/Common/ProductionPrerequisite.h
96-
# Include/Common/QuickmatchPreferences.h
97-
# Include/Common/QuotedPrintable.h
95+
#Include/Common/ProductionPrerequisite.h
96+
Include/Common/QuickmatchPreferences.h
97+
Include/Common/QuotedPrintable.h
9898
Include/Common/Radar.h
9999
Include/Common/RAMFile.h
100100
Include/Common/RandomValue.h
101-
# Include/Common/Recorder.h
101+
#Include/Common/Recorder.h
102102
# Include/Common/Registry.h
103103
Include/Common/ReplaySimulation.h
104-
# Include/Common/ResourceGatheringManager.h
105-
# Include/Common/Science.h
104+
Include/Common/ResourceGatheringManager.h
105+
Include/Common/Science.h
106106
# Include/Common/ScopedMutex.h
107-
# Include/Common/ScoreKeeper.h
107+
Include/Common/ScoreKeeper.h
108108
#Include/Common/simpleplayer.h # unused
109109
# Include/Common/SkirmishBattleHonors.h
110110
# Include/Common/SkirmishPreferences.h
111-
# Include/Common/Snapshot.h
111+
Include/Common/Snapshot.h
112112
# Include/Common/SparseMatchFinder.h
113113
# Include/Common/SpecialPower.h
114-
# Include/Common/SpecialPowerMaskType.h
114+
#Include/Common/SpecialPowerMaskType.h
115115
# Include/Common/SpecialPowerType.h
116-
# Include/Common/StackDump.h
116+
#Include/Common/StackDump.h
117117
# Include/Common/StateMachine.h
118-
# Include/Common/StatsCollector.h
119-
# Include/Common/STLTypedefs.h
118+
Include/Common/StatsCollector.h
119+
#Include/Common/STLTypedefs.h
120120
Include/Common/StreamingArchiveFile.h
121121
# Include/Common/SubsystemInterface.h
122-
# Include/Common/SystemInfo.h
122+
Include/Common/SystemInfo.h
123123
# Include/Common/Team.h
124-
# Include/Common/Terrain.h
124+
Include/Common/Terrain.h
125125
# Include/Common/TerrainTypes.h
126-
# Include/Common/Thing.h
126+
Include/Common/Thing.h
127127
# Include/Common/ThingFactory.h
128-
# Include/Common/ThingSort.h
128+
#Include/Common/ThingSort.h
129129
# Include/Common/ThingTemplate.h
130-
# Include/Common/TunnelTracker.h
130+
Include/Common/TunnelTracker.h
131131
Include/Common/UnicodeString.h
132132
# Include/Common/UnitTimings.h
133133
# Include/Common/Upgrade.h
134134
#Include/Common/urllaunch.h # unused
135135
# Include/Common/UserPreferences.h
136-
# Include/Common/version.h
136+
Include/Common/version.h
137137
# Include/Common/WellKnownKeys.h
138138
Include/Common/WorkerProcess.h
139139
Include/Common/Xfer.h
@@ -565,130 +565,130 @@ set(GAMEENGINE_SRC
565565
Source/Common/Audio/GameSounds.cpp
566566
#Source/Common/Audio/simpleplayer.cpp # unused
567567
#Source/Common/Audio/urllaunch.cpp # unused
568-
# Source/Common/Bezier/BezFwdIterator.cpp
569-
# Source/Common/Bezier/BezierSegment.cpp
568+
Source/Common/Bezier/BezFwdIterator.cpp
569+
Source/Common/Bezier/BezierSegment.cpp
570570
# Source/Common/BitFlags.cpp
571571
# Source/Common/CommandLine.cpp
572572
Source/Common/crc.cpp
573573
Source/Common/CRCDebug.cpp
574574
# Source/Common/DamageFX.cpp
575-
# Source/Common/Dict.cpp
576-
# Source/Common/DiscreteCircle.cpp
575+
Source/Common/Dict.cpp
576+
Source/Common/DiscreteCircle.cpp
577577
Source/Common/FramePacer.cpp
578578
Source/Common/FrameRateLimit.cpp
579579
# Source/Common/GameEngine.cpp
580580
# Source/Common/GameLOD.cpp
581-
# Source/Common/GameMain.cpp
581+
Source/Common/GameMain.cpp
582582
Source/Common/GameUtility.cpp
583583
# Source/Common/GlobalData.cpp
584584
# Source/Common/INI/INI.cpp
585-
# Source/Common/INI/INIAiData.cpp
586-
# Source/Common/INI/INIAnimation.cpp
585+
Source/Common/INI/INIAiData.cpp
586+
Source/Common/INI/INIAnimation.cpp
587587
Source/Common/INI/INIAudioEventInfo.cpp
588-
# Source/Common/INI/INICommandButton.cpp
589-
# Source/Common/INI/INICommandSet.cpp
590-
# Source/Common/INI/INIControlBarScheme.cpp
591-
# Source/Common/INI/INICrate.cpp
592-
# Source/Common/INI/INIDamageFX.cpp
593-
# Source/Common/INI/INIDrawGroupInfo.cpp
594-
# Source/Common/INI/INIGameData.cpp
588+
Source/Common/INI/INICommandButton.cpp
589+
Source/Common/INI/INICommandSet.cpp
590+
Source/Common/INI/INIControlBarScheme.cpp
591+
Source/Common/INI/INICrate.cpp
592+
#Source/Common/INI/INIDamageFX.cpp
593+
Source/Common/INI/INIDrawGroupInfo.cpp
594+
Source/Common/INI/INIGameData.cpp
595595
# Source/Common/INI/INIMapCache.cpp
596-
# Source/Common/INI/INIMapData.cpp
596+
Source/Common/INI/INIMapData.cpp
597597
# Source/Common/INI/INIMappedImage.cpp
598598
Source/Common/INI/INIMiscAudio.cpp
599-
# Source/Common/INI/INIModel.cpp
599+
Source/Common/INI/INIModel.cpp
600600
# Source/Common/INI/INIMultiplayer.cpp
601-
# Source/Common/INI/INIObject.cpp
602-
# Source/Common/INI/INIParticleSys.cpp
603-
# Source/Common/INI/INISpecialPower.cpp
604-
# Source/Common/INI/INITerrain.cpp
605-
# Source/Common/INI/INITerrainBridge.cpp
606-
# Source/Common/INI/INITerrainRoad.cpp
607-
# Source/Common/INI/INIUpgrade.cpp
601+
Source/Common/INI/INIObject.cpp
602+
Source/Common/INI/INIParticleSys.cpp
603+
Source/Common/INI/INISpecialPower.cpp
604+
Source/Common/INI/INITerrain.cpp
605+
Source/Common/INI/INITerrainBridge.cpp
606+
Source/Common/INI/INITerrainRoad.cpp
607+
Source/Common/INI/INIUpgrade.cpp
608608
Source/Common/INI/INIVideo.cpp
609-
# Source/Common/INI/INIWater.cpp
610-
# Source/Common/INI/INIWeapon.cpp
611-
# Source/Common/INI/INIWebpageURL.cpp
612-
# Source/Common/Language.cpp
609+
Source/Common/INI/INIWater.cpp
610+
Source/Common/INI/INIWeapon.cpp
611+
Source/Common/INI/INIWebpageURL.cpp
612+
Source/Common/Language.cpp
613613
# Source/Common/MessageStream.cpp
614-
# Source/Common/MiniLog.cpp
614+
Source/Common/MiniLog.cpp
615615
# Source/Common/MultiplayerSettings.cpp
616-
# Source/Common/NameKeyGenerator.cpp
617-
# Source/Common/PartitionSolver.cpp
616+
#Source/Common/NameKeyGenerator.cpp
617+
Source/Common/PartitionSolver.cpp
618618
# Source/Common/PerfTimer.cpp
619619
Source/Common/RandomValue.cpp
620620
# Source/Common/Recorder.cpp
621621
Source/Common/ReplaySimulation.cpp
622622
# Source/Common/RTS/AcademyStats.cpp
623623
# Source/Common/RTS/ActionManager.cpp
624624
# Source/Common/RTS/Energy.cpp
625-
# Source/Common/RTS/Handicap.cpp
626-
# Source/Common/RTS/MissionStats.cpp
625+
Source/Common/RTS/Handicap.cpp
626+
#Source/Common/RTS/MissionStats.cpp
627627
# Source/Common/RTS/Money.cpp
628628
# Source/Common/RTS/Player.cpp
629-
# Source/Common/RTS/PlayerList.cpp
629+
#Source/Common/RTS/PlayerList.cpp
630630
# Source/Common/RTS/PlayerTemplate.cpp
631631
# Source/Common/RTS/ProductionPrerequisite.cpp
632-
# Source/Common/RTS/ResourceGatheringManager.cpp
633-
# Source/Common/RTS/Science.cpp
634-
# Source/Common/RTS/ScoreKeeper.cpp
632+
Source/Common/RTS/ResourceGatheringManager.cpp
633+
Source/Common/RTS/Science.cpp
634+
Source/Common/RTS/ScoreKeeper.cpp
635635
# Source/Common/RTS/SpecialPower.cpp
636636
# Source/Common/RTS/Team.cpp
637637
# Source/Common/RTS/TunnelTracker.cpp
638638
# Source/Common/SkirmishBattleHonors.cpp
639639
# Source/Common/StateMachine.cpp
640-
# Source/Common/StatsCollector.cpp
640+
Source/Common/StatsCollector.cpp
641641
Source/Common/System/ArchiveFile.cpp
642642
Source/Common/System/ArchiveFileSystem.cpp
643643
Source/Common/System/AsciiString.cpp
644644
# Source/Common/System/BuildAssistant.cpp
645-
# Source/Common/System/CDManager.cpp
646-
# Source/Common/System/CriticalSection.cpp
647-
# Source/Common/System/DataChunk.cpp
645+
Source/Common/System/CDManager.cpp
646+
Source/Common/System/CriticalSection.cpp
647+
Source/Common/System/DataChunk.cpp
648648
Source/Common/System/Debug.cpp
649-
# Source/Common/System/Directory.cpp
649+
Source/Common/System/Directory.cpp
650650
# Source/Common/System/DisabledTypes.cpp
651-
# Source/Common/System/encrypt.cpp
651+
Source/Common/System/encrypt.cpp
652652
Source/Common/System/File.cpp
653653
Source/Common/System/FileSystem.cpp
654654
# Source/Common/System/FunctionLexicon.cpp
655-
# Source/Common/System/GameCommon.cpp
655+
#Source/Common/System/GameCommon.cpp
656656
#Source/Common/System/GameMemory.cpp # is conditionally appended
657657
#Source/Common/System/GameMemoryInit.cpp # is conditionally appended
658-
# Source/Common/System/GameType.cpp
659-
# Source/Common/System/Geometry.cpp
658+
Source/Common/System/GameType.cpp
659+
Source/Common/System/Geometry.cpp
660660
# Source/Common/System/KindOf.cpp
661-
# Source/Common/System/List.cpp
661+
Source/Common/System/List.cpp
662662
Source/Common/System/LocalFile.cpp
663663
Source/Common/System/LocalFileSystem.cpp
664664
Source/Common/System/MiniDumper.cpp
665665
Source/Common/System/ObjectStatusTypes.cpp
666-
# Source/Common/System/QuotedPrintable.cpp
666+
Source/Common/System/QuotedPrintable.cpp
667667
Source/Common/System/Radar.cpp
668668
Source/Common/System/RAMFile.cpp
669669
# Source/Common/System/registry.cpp
670670
# Source/Common/System/SaveGame/GameState.cpp
671671
# Source/Common/System/SaveGame/GameStateMap.cpp
672-
# Source/Common/System/Snapshot.cpp
673-
# Source/Common/System/StackDump.cpp
672+
Source/Common/System/Snapshot.cpp
673+
#Source/Common/System/StackDump.cpp
674674
Source/Common/System/StreamingArchiveFile.cpp
675675
# Source/Common/System/SubsystemInterface.cpp
676-
# Source/Common/System/Trig.cpp
676+
Source/Common/System/Trig.cpp
677677
Source/Common/System/UnicodeString.cpp
678678
# Source/Common/System/Upgrade.cpp
679679
Source/Common/System/Xfer.cpp
680680
Source/Common/System/XferCRC.cpp
681681
Source/Common/System/XferLoad.cpp
682682
Source/Common/System/XferSave.cpp
683-
# Source/Common/TerrainTypes.cpp
684-
# Source/Common/Thing/DrawModule.cpp
683+
#Source/Common/TerrainTypes.cpp
684+
Source/Common/Thing/DrawModule.cpp
685685
# Source/Common/Thing/Module.cpp
686686
# Source/Common/Thing/ModuleFactory.cpp
687-
# Source/Common/Thing/Thing.cpp
687+
#Source/Common/Thing/Thing.cpp
688688
# Source/Common/Thing/ThingFactory.cpp
689689
# Source/Common/Thing/ThingTemplate.cpp
690690
# Source/Common/UserPreferences.cpp
691-
# Source/Common/version.cpp
691+
Source/Common/version.cpp
692692
Source/Common/WorkerProcess.cpp
693693
# Source/GameClient/ClientInstance.cpp
694694
# Source/GameClient/Color.cpp
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

GeneralsMD/Code/GameEngine/Include/Common/ClientUpdateModule.h renamed to Core/GameEngine/Include/Common/ClientUpdateModule.h

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

0 commit comments

Comments
 (0)