diff options
| author | Léo Lam <leo@leolam.fr> | 2026-09-28 03:39:31 +0200 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2026-10-06 03:19:39 +0200 |
| commit | 9d6a597e91fac5ecdca3f9903f90c7bdf5accd96 (patch) | |
| tree | 0019b105b53ec817ebf677e484e475a0bc2cedf2 /src/KingSystem/Resource | |
| parent | 98f0c80f1d0b9d3ca19f0b38efcb597ee65d9dc0 (diff) | |
Actor: ActorFactory is game, CurrentResNameMgr is ksys
ActorFactory's static initialiser fills its table with uking actor
ctors. CurrentResNameMgr (0x71010b770c) links in KingSystem/System right
before GameConfig.
(AI assisted using Claude Fable 5.1 and Claude Opus 5.5)
Diffstat (limited to 'src/KingSystem/Resource')
| -rw-r--r-- | src/KingSystem/Resource/Actor/resResourceAIProgram.cpp | 2 | ||||
| -rw-r--r-- | src/KingSystem/Resource/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/KingSystem/Resource/resCurrentResNameMgr.cpp | 13 | ||||
| -rw-r--r-- | src/KingSystem/Resource/resCurrentResNameMgr.h | 21 |
4 files changed, 1 insertions, 37 deletions
diff --git a/src/KingSystem/Resource/Actor/resResourceAIProgram.cpp b/src/KingSystem/Resource/Actor/resResourceAIProgram.cpp index bbe70ba1..1e0454d0 100644 --- a/src/KingSystem/Resource/Actor/resResourceAIProgram.cpp +++ b/src/KingSystem/Resource/Actor/resResourceAIProgram.cpp @@ -3,7 +3,7 @@ #include <utility/aglParameter.h> #include "KingSystem/ActorSystem/actAiActionBase.h" #include "KingSystem/ActorSystem/actAiClassDef.h" -#include "KingSystem/Resource/resCurrentResNameMgr.h" +#include "KingSystem/System/CurrentResNameMgr.h" #include "KingSystem/Utils/HeapUtil.h" namespace ksys::res { diff --git a/src/KingSystem/Resource/CMakeLists.txt b/src/KingSystem/Resource/CMakeLists.txt index 67177e15..1a9e5b28 100644 --- a/src/KingSystem/Resource/CMakeLists.txt +++ b/src/KingSystem/Resource/CMakeLists.txt @@ -94,8 +94,6 @@ target_sources(uking PRIVATE resControlTask.h resCounter.cpp resCounter.h - resCurrentResNameMgr.cpp - resCurrentResNameMgr.h resEntryFactory.cpp resEntryFactory.h resGameResourceSystem.cpp diff --git a/src/KingSystem/Resource/resCurrentResNameMgr.cpp b/src/KingSystem/Resource/resCurrentResNameMgr.cpp deleted file mode 100644 index f949afb7..00000000 --- a/src/KingSystem/Resource/resCurrentResNameMgr.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "KingSystem/Resource/resCurrentResNameMgr.h" - -namespace ksys::res { - -SEAD_SINGLETON_DISPOSER_IMPL(CurrentResNameMgr) - -void CurrentResNameMgr::init(sead::Heap*) {} - -sead::SafeString CurrentResNameMgr::getCurrentResName() const { - return sead::SafeString::cEmptyString; -} - -} // namespace ksys::res diff --git a/src/KingSystem/Resource/resCurrentResNameMgr.h b/src/KingSystem/Resource/resCurrentResNameMgr.h deleted file mode 100644 index b46487b7..00000000 --- a/src/KingSystem/Resource/resCurrentResNameMgr.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include <heap/seadDisposer.h> -#include <prim/seadSafeString.h> -#include "KingSystem/Utils/Types.h" - -namespace ksys::res { - -/// Current Resource Name Manager? -/// Stubbed in release builds. -class CurrentResNameMgr { - SEAD_SINGLETON_DISPOSER(CurrentResNameMgr) - CurrentResNameMgr() = default; - -public: - void init(sead::Heap* heap); - sead::SafeString getCurrentResName() const; -}; -KSYS_CHECK_SIZE_NX150(CurrentResNameMgr, 0x20); - -} // namespace ksys::res |
