From c948e4bb8455efb24c2a49ced63a11b204524b2f Mon Sep 17 00:00:00 2001 From: wincent Date: Sun, 8 Sep 2024 17:54:43 +0200 Subject: [PATCH] Update to new apis --- dGame/dBehaviors/CMakeLists.txt | 1 + dGame/dCinema/CMakeLists.txt | 13 +++++++++++++ dGame/dCinema/Recorder.cpp | 2 -- dGame/dGameMessages/CMakeLists.txt | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dGame/dBehaviors/CMakeLists.txt b/dGame/dBehaviors/CMakeLists.txt index 35d8cae6..e8b5f34a 100644 --- a/dGame/dBehaviors/CMakeLists.txt +++ b/dGame/dBehaviors/CMakeLists.txt @@ -63,6 +63,7 @@ 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}/dGame/dCinema" "${PROJECT_SOURCE_DIR}/dZoneManager" # via BasicAttackBehavior.cpp ) target_precompile_headers(dBehaviors REUSE_FROM dGameBase) diff --git a/dGame/dCinema/CMakeLists.txt b/dGame/dCinema/CMakeLists.txt index c6d2c0d1..a8983e86 100644 --- a/dGame/dCinema/CMakeLists.txt +++ b/dGame/dCinema/CMakeLists.txt @@ -9,3 +9,16 @@ target_link_libraries(dCinema PUBLIC dPhysics dDatabase INTERFACE dUtilities dCommon dBehaviors dChatFilter dMission dInventory dComponents ) + +target_include_directories(dCinema PUBLIC "." + PRIVATE + "${PROJECT_SOURCE_DIR}/dGame/dComponents" # direct MissionComponent.h + "${PROJECT_SOURCE_DIR}/dGame/dUtilities" # direct SlashCommandHandler.h + "${PROJECT_SOURCE_DIR}/dGame/dPropertyBehaviors" # direct ControlBehaviors.h + "${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h + "${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}/dGame/dGameMessages" + "${PROJECT_SOURCE_DIR}/dZoneManager" # via GameMessages.cpp, GameMessageHandler.cpp +) \ No newline at end of file diff --git a/dGame/dCinema/Recorder.cpp b/dGame/dCinema/Recorder.cpp index 7e69e933..56eef721 100644 --- a/dGame/dCinema/Recorder.cpp +++ b/dGame/dCinema/Recorder.cpp @@ -554,8 +554,6 @@ void MovementRecord::Act(Entity* actor) { controllableComponent->SetVelocity(velocity); controllableComponent->SetAngularVelocity(angularVelocity); controllableComponent->SetIsOnGround(onGround); - controllableComponent->SetDirtyVelocity(dirtyVelocity); - controllableComponent->SetDirtyAngularVelocity(dirtyAngularVelocity); } Game::entityManager->SerializeEntity(actor); diff --git a/dGame/dGameMessages/CMakeLists.txt b/dGame/dGameMessages/CMakeLists.txt index 0f28dea4..9ee88764 100644 --- a/dGame/dGameMessages/CMakeLists.txt +++ b/dGame/dGameMessages/CMakeLists.txt @@ -18,6 +18,7 @@ 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}/dGame/dCinema" "${PROJECT_SOURCE_DIR}/dZoneManager" # via GameMessages.cpp, GameMessageHandler.cpp ) target_precompile_headers(dGameMessages REUSE_FROM dGameBase)