Skip to content

Commit 2ca07b0

Browse files
committed
unify(map): Move GameLogic map headers and implementations to Core
1 parent b84086d commit 2ca07b0

16 files changed

Lines changed: 25 additions & 5710 deletions

File tree

Core/GameEngine/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -486,16 +486,16 @@ set(GAMEENGINE_SRC
486486
# Include/GameLogic/ObjectScriptStatusBits.h
487487
# Include/GameLogic/ObjectTypes.h
488488
# Include/GameLogic/PartitionManager.h
489-
# Include/GameLogic/PolygonTrigger.h
489+
Include/GameLogic/PolygonTrigger.h
490490
# Include/GameLogic/Powers.h
491491
Include/GameLogic/RankInfo.h
492492
# Include/GameLogic/ScriptActions.h
493493
# Include/GameLogic/ScriptConditions.h
494494
# Include/GameLogic/ScriptEngine.h
495495
# Include/GameLogic/Scripts.h
496-
# Include/GameLogic/SidesList.h
496+
Include/GameLogic/SidesList.h
497497
# Include/GameLogic/Squad.h
498-
# Include/GameLogic/TerrainLogic.h
498+
Include/GameLogic/TerrainLogic.h
499499
# Include/GameLogic/TurretAI.h
500500
# Include/GameLogic/VictoryConditions.h
501501
# Include/GameLogic/Weapon.h
@@ -853,9 +853,9 @@ set(GAMEENGINE_SRC
853853
# Source/GameLogic/AI/AITNGuard.cpp
854854
# Source/GameLogic/AI/Squad.cpp
855855
# Source/GameLogic/AI/TurretAI.cpp
856-
# Source/GameLogic/Map/PolygonTrigger.cpp
857-
# Source/GameLogic/Map/SidesList.cpp
858-
# Source/GameLogic/Map/TerrainLogic.cpp
856+
Source/GameLogic/Map/PolygonTrigger.cpp
857+
Source/GameLogic/Map/SidesList.cpp
858+
Source/GameLogic/Map/TerrainLogic.cpp
859859
# Source/GameLogic/Object/Armor.cpp
860860
# Source/GameLogic/Object/Behavior/AutoHealBehavior.cpp
861861
# Source/GameLogic/Object/Behavior/BattleBusSlowDeathBehavior.cpp

GeneralsMD/Code/GameEngine/Include/GameLogic/PolygonTrigger.h renamed to Core/GameEngine/Include/GameLogic/PolygonTrigger.h

File renamed without changes.
File renamed without changes.

GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h renamed to Core/GameEngine/Include/GameLogic/TerrainLogic.h

File renamed without changes.

GeneralsMD/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp renamed to Core/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp

File renamed without changes.

GeneralsMD/Code/GameEngine/Source/GameLogic/Map/SidesList.cpp renamed to Core/GameEngine/Source/GameLogic/Map/SidesList.cpp

File renamed without changes.

GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp renamed to Core/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp

File renamed without changes.

Generals/Code/GameEngine/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -437,16 +437,16 @@ set(GAMEENGINE_SRC
437437
Include/GameLogic/ObjectScriptStatusBits.h
438438
Include/GameLogic/ObjectTypes.h
439439
Include/GameLogic/PartitionManager.h
440-
Include/GameLogic/PolygonTrigger.h
440+
# Include/GameLogic/PolygonTrigger.h
441441
Include/GameLogic/Powers.h
442442
# Include/GameLogic/RankInfo.h
443443
Include/GameLogic/ScriptActions.h
444444
Include/GameLogic/ScriptConditions.h
445445
Include/GameLogic/ScriptEngine.h
446446
Include/GameLogic/Scripts.h
447-
Include/GameLogic/SidesList.h
447+
# Include/GameLogic/SidesList.h
448448
Include/GameLogic/Squad.h
449-
Include/GameLogic/TerrainLogic.h
449+
# Include/GameLogic/TerrainLogic.h
450450
Include/GameLogic/TurretAI.h
451451
Include/GameLogic/VictoryConditions.h
452452
Include/GameLogic/Weapon.h
@@ -787,9 +787,9 @@ set(GAMEENGINE_SRC
787787
Source/GameLogic/AI/AITNGuard.cpp
788788
Source/GameLogic/AI/Squad.cpp
789789
Source/GameLogic/AI/TurretAI.cpp
790-
Source/GameLogic/Map/PolygonTrigger.cpp
791-
Source/GameLogic/Map/SidesList.cpp
792-
Source/GameLogic/Map/TerrainLogic.cpp
790+
# Source/GameLogic/Map/PolygonTrigger.cpp
791+
# Source/GameLogic/Map/SidesList.cpp
792+
# Source/GameLogic/Map/TerrainLogic.cpp
793793
Source/GameLogic/Object/Armor.cpp
794794
Source/GameLogic/Object/Behavior/AutoHealBehavior.cpp
795795
Source/GameLogic/Object/Behavior/BehaviorModule.cpp

Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h

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

0 commit comments

Comments
 (0)