From 56f9c3ac0c2486c00d031ac1664fec6322a2762e Mon Sep 17 00:00:00 2001 From: Wildex999 Date: Tue, 3 Nov 2020 01:35:31 +0100 Subject: ksys/utils/byaml: First iteration of implementation. 4 Functions are still not fully matching with their inlined functions, and at least one function is still missing. --- src/KingSystem/ActorSystem/actActorParam.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/KingSystem/ActorSystem/actActorParam.cpp') diff --git a/src/KingSystem/ActorSystem/actActorParam.cpp b/src/KingSystem/ActorSystem/actActorParam.cpp index b358375a..639f6b3f 100644 --- a/src/KingSystem/ActorSystem/actActorParam.cpp +++ b/src/KingSystem/ActorSystem/actActorParam.cpp @@ -3,7 +3,7 @@ #include #include "KingSystem/ActorSystem/actActorParamMgr.h" #include "KingSystem/ActorSystem/actActorTemplate.h" -#include "KingSystem/Utils/Byaml.h" +#include "KingSystem/Utils/Byaml/Byaml.h" namespace ksys::act { -- cgit v1.2.3 From ffe38d0076fd487bae46edd092171469ec08d439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Thu, 12 Nov 2020 16:03:03 +0100 Subject: ksys/act: Implement more ActorParamMgr functions --- src/KingSystem/ActorSystem/actActorParam.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/KingSystem/ActorSystem/actActorParam.cpp') diff --git a/src/KingSystem/ActorSystem/actActorParam.cpp b/src/KingSystem/ActorSystem/actActorParam.cpp index 639f6b3f..dbe2096e 100644 --- a/src/KingSystem/ActorSystem/actActorParam.cpp +++ b/src/KingSystem/ActorSystem/actActorParam.cpp @@ -49,8 +49,8 @@ void ActorParam::deleteResHandles() { handles.freeBuffer(); } -bool ActorParam::isDummyParam(res::ActorLink::Users::User user) const { - return mRes.mActorLink->getUsers().getUserName(user) == "Dummy"; +bool ActorParam::isDummyParam(res::ActorLink::User user) const { + return sead::SafeString(mRes.mActorLink->getUserName(user)) == "Dummy"; } void ActorParam::allocResHandles(sead::Heap* heap, u32 buffer_idx, s32 count) { @@ -154,4 +154,6 @@ void ActorParam::setProfileAndPriority(const char* profile, const char* priority } } +void ActorParam::onLoadFinished(ActorParamMgr*) {} + } // namespace ksys::act -- cgit v1.2.3