fix: remove dZoneManager from global include

CMakeLists.txt

@@ -214,8 +214,6 @@ set(INCLUDED_DIRECTORIES
 	"dNavigation"
 	"dNavigation/dTerrain"
 
-	"dZoneManager"
-
 	"dDatabase"
 	"dDatabase/CDClientDatabase"
 	"dDatabase/CDClientDatabase/CDClientTables"

dGame/CMakeLists.txt

@@ -16,7 +16,9 @@ include_directories(
 add_library(dGameBase ${DGAME_SOURCES})
 target_precompile_headers(dGameBase PRIVATE ${HEADERS_DGAME})
 target_include_directories(dGameBase PUBLIC "." "dEntity"
-	PRIVATE "dComponents" "dGameMessages" "dBehaviors" "dMission" "dUtilities" "dInventory")
+	PRIVATE "dComponents" "dGameMessages" "dBehaviors" "dMission" "dUtilities" "dInventory"
+	"${PROJECT_SOURCE_DIR}/dZoneManager"	
+)
 target_link_libraries(dGameBase
 	PUBLIC dDatabase dPhysics
 	INTERFACE dComponents dEntity)

dGame/dBehaviors/CMakeLists.txt

@@ -65,5 +65,6 @@ target_include_directories(dBehaviors PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dGame/dUtilities" # Preconditions.h via QuickBuildComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager.h, Spawner.h
 	"${PROJECT_SOURCE_DIR}/dGame/dInventory" # via CharacterComponent.h
+	"${PROJECT_SOURCE_DIR}/dZoneManager" # via BasicAttackBehavior.cpp
 )
 target_precompile_headers(dBehaviors REUSE_FROM dGameBase)

dGame/dComponents/CMakeLists.txt

@@ -59,6 +59,7 @@ target_include_directories(dComponents PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # direct
 	"${PROJECT_SOURCE_DIR}/dGame/dUtilities" # direct Loot.h
 	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager/Spawner.h
+	"${PROJECT_SOURCE_DIR}/dZoneManager" # via BouncerComponent.cpp, ActivityComponent.cpp
 )
 target_precompile_headers(dComponents REUSE_FROM dGameBase)
 target_link_libraries(dComponents

dGame/dGameMessages/CMakeLists.txt

@@ -18,5 +18,6 @@ target_include_directories(dGameMessages PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" # via InventoryComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dInventory" # via InventoryComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager/Spawner.h
+	"${PROJECT_SOURCE_DIR}/dZoneManager" # via GameMessages.cpp, GameMessageHandler.cpp
 )
 target_precompile_headers(dGameMessages REUSE_FROM dGameBase)

dGame/dInventory/CMakeLists.txt

@@ -14,6 +14,7 @@ target_include_directories(dInventory PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" # via InventoryComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager/Spawner.h
 	"${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h
+	"${PROJECT_SOURCE_DIR}/dZoneManager" # via Item.cpp
 )
 target_link_libraries(dInventory INTERFACE dNet)
 target_precompile_headers(dInventory REUSE_FROM dGameBase)

dGame/dMission/CMakeLists.txt

@@ -13,5 +13,6 @@ target_include_directories(dMission PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # via LevelProgressionComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager/Spawner.h
 	"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" # via InventoryComponent.h
+	"${PROJECT_SOURCE_DIR}/dZoneManager" # via Mission.cpp, MissionTask.cpp
 )
 target_precompile_headers(dMission REUSE_FROM dGameBase)

dGame/dUtilities/CMakeLists.txt

@@ -18,6 +18,7 @@ target_include_directories(dUtilities PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" # transitive via InventoryComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dMission" # transitive via MissionComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # transitive via dZoneManager/Spawner.h
+	"${PROJECT_SOURCE_DIR}/dZoneManager" # Mail.cpp
 )
 target_link_libraries(dUtilities
 	PUBLIC dDatabase dPhysics

dMasterServer/CMakeLists.txt

@@ -7,7 +7,9 @@ set(DMASTERSERVER_SOURCES
 add_library(dMasterServer ${DMASTERSERVER_SOURCES})
 add_executable(MasterServer "MasterServer.cpp")
 add_compile_definitions(MasterServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"")
-
+target_include_directories(dMasterServer PUBLIC "."
+	"${PROJECT_SOURCE_DIR}/dZoneManager" # InstanceManager.h uses dZMCommon.h
+)
 target_link_libraries(dMasterServer ${COMMON_LIBRARIES})
 target_link_libraries(MasterServer ${COMMON_LIBRARIES} dMasterServer)
 

dScripts/CMakeLists.txt

@@ -32,6 +32,7 @@ include_directories(
 	"${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" # viaInventoryComponent.h
 	"${PROJECT_SOURCE_DIR}/dGame/dInventory" # via InventoryComponent.h
+	"${PROJECT_SOURCE_DIR}/dZoneManager"
 )
 link_libraries(dScriptsBase)
 # dComponents

dZoneManager/CMakeLists.txt

@@ -7,7 +7,7 @@ add_library(dZoneManager STATIC ${DZONEMANAGER_SOURCES})
 target_link_libraries(dZoneManager
 	PUBLIC dPhysics
 	INTERFACE dWorldServer)
-target_include_directories(dZoneManager PUBLIC
+target_include_directories(dZoneManager PUBLIC "."
 	${PROJECT_SOURCE_DIR}/dGame # Entity.h
 	${PROJECT_SOURCE_DIR}/dGame/dEntity # EntityInfo.h
 	PRIVATE