From ad95be2d0802bb9789db8cf47be50b2fcb7ee794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Fri, 22 Jan 2021 16:33:50 +0100 Subject: ksys/act: Fix missing parameter for InfoData::getStringByKey Callers in actInfoData.cpp still matched because LLVM detected that the last argument is unused and optimized it out (or inlined the function entirely) --- src/KingSystem/ActorSystem/actInfoData.cpp | 2 +- src/KingSystem/ActorSystem/actInfoData.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/KingSystem/ActorSystem/actInfoData.cpp b/src/KingSystem/ActorSystem/actInfoData.cpp index c23a94de..028cb26e 100644 --- a/src/KingSystem/ActorSystem/actInfoData.cpp +++ b/src/KingSystem/ActorSystem/actInfoData.cpp @@ -210,7 +210,7 @@ s32 InfoData::getIntByKey(const al::ByamlIter& iter, const char* key, s32 defaul } const char* InfoData::getStringByKey(const al::ByamlIter& iter, const char* key, - const sead::SafeString& default_) { + const sead::SafeString& default_, bool) { const char* value; return iter.tryGetStringByKey(&value, key) ? value : default_.cstr(); } diff --git a/src/KingSystem/ActorSystem/actInfoData.h b/src/KingSystem/ActorSystem/actInfoData.h index 7295ad10..bdaf24eb 100644 --- a/src/KingSystem/ActorSystem/actInfoData.h +++ b/src/KingSystem/ActorSystem/actInfoData.h @@ -142,7 +142,8 @@ public: bool x = true); static const char* getStringByKey(const al::ByamlIter& iter, const char* key, - const sead::SafeString& default_ = sead::SafeString::cEmptyString); + const sead::SafeString& default_ = sead::SafeString::cEmptyString, + bool x = true); private: struct DebugEntry { -- cgit v1.2.3