diff --git a/src/KingSystem/ActorSystem/actActorParam.h b/src/KingSystem/ActorSystem/actActorParam.h index 7bbe536d..c0d7346c 100644 --- a/src/KingSystem/ActorSystem/actActorParam.h +++ b/src/KingSystem/ActorSystem/actActorParam.h @@ -8,8 +8,8 @@ #include #include "KingSystem/ActorSystem/actBaseProcJob.h" #include "KingSystem/Resource/resHandle.h" -#include "KingSystem/Utils/Thread/Event.h" #include "KingSystem/Resource/resResourceActorLink.h" +#include "KingSystem/Utils/Thread/Event.h" namespace ksys { @@ -103,8 +103,25 @@ public: ActorParam(); virtual ~ActorParam(); + const sead::SafeString& getActorName() const { return mActorName; } + const sead::SafeString& getProfile() const { return mProfile; } + const char* getClassName() const { return mClassName; } + Priority getPriority() const { return mPriority; } + u32 get74() const { return _74; } + const Resources& getRes() const { return mRes; } + bool isDummyParam(res::ActorLink::Users::User user) const; + static void resetDummyResources(); + + static Resources sDummyResources; + +private: + friend class ActorParamMgr; + + void deleteData(); + void deleteResHandles(); + u16 _8 = 0; u8 _a = 0; sead::FixedSafeString<64> mActorName; @@ -116,17 +133,6 @@ public: std::array, 2> mHandles; std::array mNumHandles; u32 _168{}; - - static void resetDummyResources(); - - static Resources sDummyResources; - -private: - friend class ActorParamMgr; - - void deleteData(); - void deleteResHandles(); - sead::CriticalSection mCS{nullptr}; util::Event mEvent{nullptr, sead::IDisposer::HeapNullOption::DoNotAppendDisposerIfNoHeapSpecified, true}; diff --git a/src/KingSystem/Damage/dmgDamageManagerBase.cpp b/src/KingSystem/Damage/dmgDamageManagerBase.cpp index 68fe41a8..8fc37c54 100644 --- a/src/KingSystem/Damage/dmgDamageManagerBase.cpp +++ b/src/KingSystem/Damage/dmgDamageManagerBase.cpp @@ -104,7 +104,7 @@ void DamageManagerBase::removeDamageCallback(DamageCallback* callback) { } bool DamageManagerBase::applyDamage(s32& life) { - auto* param_list = mActor->mActorParam->mRes.mGParamList; + auto* param_list = mActor->mActorParam->getRes().mGParamList; const res::GParamListObjectGeneral& params = param_list->getGeneral(); if (params.mIsLifeInfinite.ref()) {