Skip to content

Commit b68c0b9

Browse files
committed
unify(radar): Move ObjectStatusTypes, Radar, W3DRadar files to Core (#1894)
1 parent d17e34e commit b68c0b9

File tree

19 files changed

+25
-3921
lines changed

19 files changed

+25
-3921
lines changed

Core/GameEngine/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ set(GAMEENGINE_SRC
8181
# Include/Common/Money.h
8282
# Include/Common/MultiplayerSettings.h
8383
# Include/Common/NameKeyGenerator.h
84-
# Include/Common/ObjectStatusTypes.h
84+
Include/Common/ObjectStatusTypes.h
8585
# Include/Common/OSDisplay.h
8686
# Include/Common/Overridable.h
8787
# Include/Common/Override.h
@@ -94,7 +94,7 @@ set(GAMEENGINE_SRC
9494
# Include/Common/ProductionPrerequisite.h
9595
# Include/Common/QuickmatchPreferences.h
9696
# Include/Common/QuotedPrintable.h
97-
# Include/Common/Radar.h
97+
Include/Common/Radar.h
9898
Include/Common/RAMFile.h
9999
Include/Common/RandomValue.h
100100
# Include/Common/Recorder.h
@@ -660,9 +660,9 @@ set(GAMEENGINE_SRC
660660
# Source/Common/System/List.cpp
661661
Source/Common/System/LocalFile.cpp
662662
Source/Common/System/LocalFileSystem.cpp
663-
# Source/Common/System/ObjectStatusTypes.cpp
663+
Source/Common/System/ObjectStatusTypes.cpp
664664
# Source/Common/System/QuotedPrintable.cpp
665-
# Source/Common/System/Radar.cpp
665+
Source/Common/System/Radar.cpp
666666
Source/Common/System/RAMFile.cpp
667667
# Source/Common/System/registry.cpp
668668
# Source/Common/System/SaveGame/GameState.cpp

Core/GameEngineDevice/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set(GAMEENGINEDEVICE_SRC
44
# Include/W3DDevice/Common/W3DConvert.h
55
# Include/W3DDevice/Common/W3DFunctionLexicon.h
66
# Include/W3DDevice/Common/W3DModuleFactory.h
7-
# Include/W3DDevice/Common/W3DRadar.h
7+
Include/W3DDevice/Common/W3DRadar.h
88
# Include/W3DDevice/Common/W3DThingFactory.h
99
# Include/W3DDevice/GameClient/BaseHeightMap.h
1010
# Include/W3DDevice/GameClient/camerashakesystem.h
@@ -93,7 +93,7 @@ set(GAMEENGINEDEVICE_SRC
9393
Source/MilesAudioDevice/MilesAudioManager.cpp
9494
Source/VideoDevice/Bink/BinkVideoPlayer.cpp
9595
# Source/W3DDevice/Common/System/W3DFunctionLexicon.cpp
96-
# Source/W3DDevice/Common/System/W3DRadar.cpp
96+
Source/W3DDevice/Common/System/W3DRadar.cpp
9797
# Source/W3DDevice/Common/Thing/W3DModuleFactory.cpp
9898
# Source/W3DDevice/Common/Thing/W3DThingFactory.cpp
9999
# Source/W3DDevice/Common/W3DConvert.cpp

Generals/Code/GameEngine/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ set(GAMEENGINE_SRC
7474
Include/Common/Money.h
7575
Include/Common/MultiplayerSettings.h
7676
Include/Common/NameKeyGenerator.h
77-
Include/Common/ObjectStatusTypes.h
77+
# Include/Common/ObjectStatusTypes.h
7878
Include/Common/OSDisplay.h
7979
Include/Common/Overridable.h
8080
Include/Common/Override.h
@@ -87,7 +87,7 @@ set(GAMEENGINE_SRC
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
9393
Include/Common/Recorder.h
@@ -610,9 +610,9 @@ set(GAMEENGINE_SRC
610610
# Source/Common/System/LocalFile.cpp
611611
# Source/Common/System/LocalFileSystem.cpp
612612
#Source/Common/System/MemoryInit.cpp
613-
Source/Common/System/ObjectStatusTypes.cpp
613+
# Source/Common/System/ObjectStatusTypes.cpp
614614
Source/Common/System/QuotedPrintable.cpp
615-
Source/Common/System/Radar.cpp
615+
# Source/Common/System/Radar.cpp
616616
# Source/Common/System/RAMFile.cpp
617617
Source/Common/System/registry.cpp
618618
Source/Common/System/SaveGame/GameState.cpp

Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h

Lines changed: 0 additions & 143 deletions
This file was deleted.

0 commit comments

Comments
 (0)