Skip to content

Commit 365eba0

Browse files
bobtistabobtista
committed
revert: Keep 12 Common files in Generals/MD to avoid PR conflicts
Reverting unification of these files to avoid conflicts with: - PR #654 (tomsons26): Cleans up inconsistencies - PR #670 (zzambers): Replacements for rest of asm code - PR #688 (tomsons26): Backports various things from ZH - PR #1066 (xezon): Prevent AMD/ATI driver crash - PR #1703 (Stubbjax): Add replay archive feature - PR #1741 (Skyaero42): Remove redundant include guards Files reverted: - BitFlagsIO.h, DataChunk.h, GameType.h, List.h - Money.h, Radar.h, Recorder.h, SpecialPowerMaskType.h, StackDump.h - NameKeyGenerator.cpp, GameCommon.cpp, StackDump.cpp
1 parent a611744 commit 365eba0

File tree

27 files changed

+2539
-36
lines changed

27 files changed

+2539
-36
lines changed

‎Core/GameEngine/CMakeLists.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set(GAMEENGINE_SRC
1515
Include/Common/BezFwdIterator.h
1616
Include/Common/BezierSegment.h
1717
Include/Common/BitFlags.h
18-
Include/Common/BitFlagsIO.h
18+
#Include/Common/BitFlagsIO.h
1919
Include/Common/BorderColors.h
2020
# Include/Common/BuildAssistant.h
2121
Include/Common/CDManager.h
@@ -26,7 +26,7 @@ set(GAMEENGINE_SRC
2626
# Include/Common/CriticalSection.h
2727
# Include/Common/CustomMatchPreferences.h
2828
#Include/Common/DamageFX.h
29-
Include/Common/DataChunk.h
29+
#Include/Common/DataChunk.h
3030
Include/Common/Debug.h
3131
Include/Common/Dict.h
3232
Include/Common/Directory.h
@@ -53,7 +53,7 @@ set(GAMEENGINE_SRC
5353
Include/Common/GameSpyMiscPreferences.h
5454
Include/Common/GameState.h
5555
Include/Common/GameStateMap.h
56-
Include/Common/GameType.h
56+
#Include/Common/GameType.h
5757
Include/Common/GameUtility.h
5858
Include/Common/Geometry.h
5959
# Include/Common/GlobalData.h
@@ -65,7 +65,7 @@ set(GAMEENGINE_SRC
6565
Include/Common/LadderPreferences.h
6666
Include/Common/Language.h
6767
Include/Common/LatchRestore.h
68-
Include/Common/List.h
68+
#Include/Common/List.h
6969
Include/Common/LocalFile.h
7070
Include/Common/LocalFileSystem.h
7171
# Include/Common/MapObject.h
@@ -77,7 +77,7 @@ set(GAMEENGINE_SRC
7777
# Include/Common/ModelState.h
7878
# Include/Common/Module.h
7979
Include/Common/ModuleFactory.h
80-
Include/Common/Money.h
80+
#Include/Common/Money.h
8181
# Include/Common/MultiplayerSettings.h
8282
# Include/Common/NameKeyGenerator.h
8383
# Include/Common/ObjectStatusTypes.h
@@ -93,10 +93,10 @@ set(GAMEENGINE_SRC
9393
#Include/Common/ProductionPrerequisite.h
9494
Include/Common/QuickmatchPreferences.h
9595
Include/Common/QuotedPrintable.h
96-
Include/Common/Radar.h
96+
#Include/Common/Radar.h
9797
Include/Common/RAMFile.h
9898
Include/Common/RandomValue.h
99-
Include/Common/Recorder.h
99+
#Include/Common/Recorder.h
100100
# Include/Common/Registry.h
101101
Include/Common/ReplaySimulation.h
102102
Include/Common/ResourceGatheringManager.h
@@ -109,9 +109,9 @@ set(GAMEENGINE_SRC
109109
Include/Common/Snapshot.h
110110
# Include/Common/SparseMatchFinder.h
111111
# Include/Common/SpecialPower.h
112-
Include/Common/SpecialPowerMaskType.h
112+
#Include/Common/SpecialPowerMaskType.h
113113
# Include/Common/SpecialPowerType.h
114-
Include/Common/StackDump.h
114+
#Include/Common/StackDump.h
115115
# Include/Common/StateMachine.h
116116
Include/Common/StatsCollector.h
117117
#Include/Common/STLTypedefs.h
@@ -610,7 +610,7 @@ set(GAMEENGINE_SRC
610610
# Source/Common/MessageStream.cpp
611611
Source/Common/MiniLog.cpp
612612
# Source/Common/MultiplayerSettings.cpp
613-
Source/Common/NameKeyGenerator.cpp
613+
#Source/Common/NameKeyGenerator.cpp
614614
Source/Common/PartitionSolver.cpp
615615
# Source/Common/PerfTimer.cpp
616616
Source/Common/RandomValue.cpp
@@ -649,7 +649,7 @@ set(GAMEENGINE_SRC
649649
Source/Common/System/File.cpp
650650
Source/Common/System/FileSystem.cpp
651651
# Source/Common/System/FunctionLexicon.cpp
652-
Source/Common/System/GameCommon.cpp
652+
#Source/Common/System/GameCommon.cpp
653653
#Source/Common/System/GameMemory.cpp # is conditionally appended
654654
#Source/Common/System/GameMemoryInit.cpp # is conditionally appended
655655
Source/Common/System/GameType.cpp
@@ -666,7 +666,7 @@ set(GAMEENGINE_SRC
666666
# Source/Common/System/SaveGame/GameState.cpp
667667
# Source/Common/System/SaveGame/GameStateMap.cpp
668668
Source/Common/System/Snapshot.cpp
669-
Source/Common/System/StackDump.cpp
669+
#Source/Common/System/StackDump.cpp
670670
Source/Common/System/StreamingArchiveFile.cpp
671671
# Source/Common/System/SubsystemInterface.cpp
672672
Source/Common/System/Trig.cpp

‎Generals/Code/GameEngine/CMakeLists.txt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set(GAMEENGINE_SRC
1414
#Include/Common/BezFwdIterator.h
1515
#Include/Common/BezierSegment.h
1616
#Include/Common/BitFlags.h
17-
#Include/Common/BitFlagsIO.h
17+
Include/Common/BitFlagsIO.h
1818
Include/Common/BuildAssistant.h
1919
#Include/Common/CDManager.h
2020
#Include/Common/ClientUpdateModule.h
@@ -24,7 +24,7 @@ set(GAMEENGINE_SRC
2424
Include/Common/CriticalSection.h
2525
Include/Common/CustomMatchPreferences.h
2626
Include/Common/DamageFX.h
27-
#Include/Common/DataChunk.h
27+
Include/Common/DataChunk.h
2828
# Include/Common/Debug.h
2929
#Include/Common/Dict.h
3030
#Include/Common/Directory.h
@@ -48,7 +48,7 @@ Include/Common/DamageFX.h
4848
#Include/Common/GameSpyMiscPreferences.h
4949
#Include/Common/GameState.h
5050
#Include/Common/GameStateMap.h
51-
#Include/Common/GameType.h
51+
Include/Common/GameType.h
5252
#Include/Common/Geometry.h
5353
Include/Common/GlobalData.h
5454
#Include/Common/Handicap.h
@@ -59,7 +59,7 @@ Include/Common/DamageFX.h
5959
#Include/Common/LadderPreferences.h
6060
#Include/Common/Language.h
6161
#Include/Common/LatchRestore.h
62-
#Include/Common/List.h
62+
Include/Common/List.h
6363
# Include/Common/LocalFile.h
6464
# Include/Common/LocalFileSystem.h
6565
Include/Common/MapObject.h
@@ -71,7 +71,7 @@ Include/Common/MissionStats.h
7171
Include/Common/ModelState.h
7272
Include/Common/Module.h
7373
#Include/Common/ModuleFactory.h
74-
#Include/Common/Money.h
74+
Include/Common/Money.h
7575
Include/Common/MultiplayerSettings.h
7676
Include/Common/NameKeyGenerator.h
7777
Include/Common/ObjectStatusTypes.h
@@ -87,10 +87,10 @@ Include/Common/PlayerList.h
8787
Include/Common/ProductionPrerequisite.h
8888
#Include/Common/QuickmatchPreferences.h
8989
#Include/Common/QuotedPrintable.h
90-
#Include/Common/Radar.h
90+
Include/Common/Radar.h
9191
# Include/Common/RAMFile.h
9292
# Include/Common/RandomValue.h
93-
#Include/Common/Recorder.h
93+
Include/Common/Recorder.h
9494
# Include/Common/ReplaySimulation.h
9595
Include/Common/Registry.h
9696
#Include/Common/ResourceGatheringManager.h
@@ -101,9 +101,9 @@ Include/Common/ProductionPrerequisite.h
101101
#Include/Common/Snapshot.h
102102
Include/Common/SparseMatchFinder.h
103103
Include/Common/SpecialPower.h
104-
#Include/Common/SpecialPowerMaskType.h
104+
Include/Common/SpecialPowerMaskType.h
105105
Include/Common/SpecialPowerType.h
106-
#Include/Common/StackDump.h
106+
Include/Common/StackDump.h
107107
Include/Common/StateMachine.h
108108
#Include/Common/StatsCollector.h
109109
Include/Common/STLTypedefs.h
@@ -564,7 +564,7 @@ Source/Common/INI/INIDamageFX.cpp
564564
Source/Common/MessageStream.cpp
565565
#Source/Common/MiniLog.cpp
566566
Source/Common/MultiplayerSettings.cpp
567-
#Source/Common/NameKeyGenerator.cpp
567+
Source/Common/NameKeyGenerator.cpp
568568
#Source/Common/PartitionSolver.cpp
569569
Source/Common/PerfTimer.cpp
570570
# Source/Common/RandomValue.cpp
@@ -601,7 +601,7 @@ Source/Common/RTS/PlayerList.cpp
601601
# Source/Common/System/File.cpp
602602
# Source/Common/System/FileSystem.cpp
603603
Source/Common/System/FunctionLexicon.cpp
604-
#Source/Common/System/GameCommon.cpp
604+
Source/Common/System/GameCommon.cpp
605605
#Source/Common/System/GameMemory.cpp
606606
#Source/Common/System/GameType.cpp
607607
#Source/Common/System/Geometry.cpp
@@ -618,7 +618,7 @@ Source/Common/RTS/PlayerList.cpp
618618
Source/Common/System/SaveGame/GameState.cpp
619619
Source/Common/System/SaveGame/GameStateMap.cpp
620620
#Source/Common/System/Snapshot.cpp
621-
#Source/Common/System/StackDump.cpp
621+
Source/Common/System/StackDump.cpp
622622
# Source/Common/System/StreamingArchiveFile.cpp
623623
Source/Common/System/SubsystemInterface.cpp
624624
#Source/Common/System/Trig.cpp

0 commit comments

Comments
 (0)