From ec2ec9ad6dc334522d5175967be8e4a468874896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Mon, 28 Sep 2026 03:39:31 +0200 Subject: [PATCH] Damage: move Game/Damage under Game/Actor Link order: the damage code is interleaved with actor TUs inside the Game/Actor block, not in a block of its own. (AI assisted using Claude Fable 5.1 and Claude Opus 5.5) --- src/Game/Actor/CMakeLists.txt | 1 + src/Game/{ => Actor}/Damage/CMakeLists.txt | 0 src/Game/{ => Actor}/Damage/dmgDamageCallback.h | 0 src/Game/{ => Actor}/Damage/dmgDamageManagerBase.cpp | 4 ++-- src/Game/{ => Actor}/Damage/dmgDamageManagerBase.h | 4 ++-- src/Game/{ => Actor}/Damage/dmgInfoManager.cpp | 2 +- src/Game/{ => Actor}/Damage/dmgInfoManager.h | 0 src/Game/{ => Actor}/Damage/dmgStruct20.cpp | 2 +- src/Game/{ => Actor}/Damage/dmgStruct20.h | 0 src/Game/CMakeLists.txt | 1 - src/Game/UI/uiUtils.cpp | 2 +- 11 files changed, 8 insertions(+), 8 deletions(-) rename src/Game/{ => Actor}/Damage/CMakeLists.txt (100%) rename src/Game/{ => Actor}/Damage/dmgDamageCallback.h (100%) rename src/Game/{ => Actor}/Damage/dmgDamageManagerBase.cpp (98%) rename src/Game/{ => Actor}/Damage/dmgDamageManagerBase.h (97%) rename src/Game/{ => Actor}/Damage/dmgInfoManager.cpp (97%) rename src/Game/{ => Actor}/Damage/dmgInfoManager.h (100%) rename src/Game/{ => Actor}/Damage/dmgStruct20.cpp (96%) rename src/Game/{ => Actor}/Damage/dmgStruct20.h (100%) diff --git a/src/Game/Actor/CMakeLists.txt b/src/Game/Actor/CMakeLists.txt index 895f21de..7a61adbc 100644 --- a/src/Game/Actor/CMakeLists.txt +++ b/src/Game/Actor/CMakeLists.txt @@ -2,6 +2,7 @@ add_subdirectory(Action) add_subdirectory(AI) add_subdirectory(Area) add_subdirectory(Camera) +add_subdirectory(Damage) add_subdirectory(Event) add_subdirectory(Horse) add_subdirectory(NPC) diff --git a/src/Game/Damage/CMakeLists.txt b/src/Game/Actor/Damage/CMakeLists.txt similarity index 100% rename from src/Game/Damage/CMakeLists.txt rename to src/Game/Actor/Damage/CMakeLists.txt diff --git a/src/Game/Damage/dmgDamageCallback.h b/src/Game/Actor/Damage/dmgDamageCallback.h similarity index 100% rename from src/Game/Damage/dmgDamageCallback.h rename to src/Game/Actor/Damage/dmgDamageCallback.h diff --git a/src/Game/Damage/dmgDamageManagerBase.cpp b/src/Game/Actor/Damage/dmgDamageManagerBase.cpp similarity index 98% rename from src/Game/Damage/dmgDamageManagerBase.cpp rename to src/Game/Actor/Damage/dmgDamageManagerBase.cpp index ce029d3e..b99cac50 100644 --- a/src/Game/Damage/dmgDamageManagerBase.cpp +++ b/src/Game/Actor/Damage/dmgDamageManagerBase.cpp @@ -1,6 +1,6 @@ -#include "Game/Damage/dmgDamageManagerBase.h" +#include "Game/Actor/Damage/dmgDamageManagerBase.h" +#include "Game/Actor/Damage/dmgDamageCallback.h" #include "Game/DLC/aocHardModeManager.h" -#include "Game/Damage/dmgDamageCallback.h" #include "KingSystem/ActorSystem/actActor.h" #include "KingSystem/ActorSystem/actActorConstDataAccess.h" #include "KingSystem/ActorSystem/actActorParam.h" diff --git a/src/Game/Damage/dmgDamageManagerBase.h b/src/Game/Actor/Damage/dmgDamageManagerBase.h similarity index 97% rename from src/Game/Damage/dmgDamageManagerBase.h rename to src/Game/Actor/Damage/dmgDamageManagerBase.h index a324f3eb..9fa6a9e8 100644 --- a/src/Game/Damage/dmgDamageManagerBase.h +++ b/src/Game/Actor/Damage/dmgDamageManagerBase.h @@ -5,8 +5,8 @@ #include #include -#include "Game/Damage/dmgInfoManager.h" -#include "Game/Damage/dmgStruct20.h" +#include "Game/Actor/Damage/dmgInfoManager.h" +#include "Game/Actor/Damage/dmgStruct20.h" #include "KingSystem/ActorSystem/actBaseProcLink.h" namespace ksys::act { diff --git a/src/Game/Damage/dmgInfoManager.cpp b/src/Game/Actor/Damage/dmgInfoManager.cpp similarity index 97% rename from src/Game/Damage/dmgInfoManager.cpp rename to src/Game/Actor/Damage/dmgInfoManager.cpp index b6c008ba..0b220990 100644 --- a/src/Game/Damage/dmgInfoManager.cpp +++ b/src/Game/Actor/Damage/dmgInfoManager.cpp @@ -1,4 +1,4 @@ -#include "Game/Damage/dmgInfoManager.h" +#include "Game/Actor/Damage/dmgInfoManager.h" #include "Game/Scene/gameScene.h" #include "KingSystem/ActorSystem/actGlobalParameter.h" #include "KingSystem/GameData/gdtCommonFlagsUtils.h" diff --git a/src/Game/Damage/dmgInfoManager.h b/src/Game/Actor/Damage/dmgInfoManager.h similarity index 100% rename from src/Game/Damage/dmgInfoManager.h rename to src/Game/Actor/Damage/dmgInfoManager.h diff --git a/src/Game/Damage/dmgStruct20.cpp b/src/Game/Actor/Damage/dmgStruct20.cpp similarity index 96% rename from src/Game/Damage/dmgStruct20.cpp rename to src/Game/Actor/Damage/dmgStruct20.cpp index faa95706..d52eb3a6 100644 --- a/src/Game/Damage/dmgStruct20.cpp +++ b/src/Game/Actor/Damage/dmgStruct20.cpp @@ -1,4 +1,4 @@ -#include "Game/Damage/dmgStruct20.h" +#include "Game/Actor/Damage/dmgStruct20.h" namespace uking::dmg { diff --git a/src/Game/Damage/dmgStruct20.h b/src/Game/Actor/Damage/dmgStruct20.h similarity index 100% rename from src/Game/Damage/dmgStruct20.h rename to src/Game/Actor/Damage/dmgStruct20.h diff --git a/src/Game/CMakeLists.txt b/src/Game/CMakeLists.txt index 56791781..457b3f56 100644 --- a/src/Game/CMakeLists.txt +++ b/src/Game/CMakeLists.txt @@ -1,6 +1,5 @@ add_subdirectory(Actor) add_subdirectory(Cooking) -add_subdirectory(Damage) add_subdirectory(DLC) add_subdirectory(Scene) add_subdirectory(UI) diff --git a/src/Game/UI/uiUtils.cpp b/src/Game/UI/uiUtils.cpp index 49ea4852..06462c7b 100644 --- a/src/Game/UI/uiUtils.cpp +++ b/src/Game/UI/uiUtils.cpp @@ -1,8 +1,8 @@ #include "Game/UI/uiUtils.h" +#include "Game/Actor/Damage/dmgInfoManager.h" #include "Game/Actor/actPlayerCreateMgr.h" #include "Game/Actor/actWeapon.h" #include "Game/DLC/aocHardModeManager.h" -#include "Game/Damage/dmgInfoManager.h" #include "Game/UI/uiPauseMenuDataMgr.h" #include "KingSystem/ActorSystem/actInfoCommon.h" #include "KingSystem/ActorSystem/actInfoData.h"