From 2ae06d6b390368d9a30d3e5d7cfbbda804219adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 10 Jan 2021 20:47:15 +0100 Subject: [PATCH] uking/ui: Fix another minor accuracy issue (add inline function) Both versions match perfectly, but there is a wrapper function for getSameGroupActorName in the Wii U version. --- src/Game/UI/uiPauseMenuDataMgr.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Game/UI/uiPauseMenuDataMgr.cpp b/src/Game/UI/uiPauseMenuDataMgr.cpp index 6e5d5740..03abb8bd 100644 --- a/src/Game/UI/uiPauseMenuDataMgr.cpp +++ b/src/Game/UI/uiPauseMenuDataMgr.cpp @@ -126,6 +126,15 @@ struct PouchConstants { PouchConstants sValues; +void getSameGroupActorName(sead::SafeString* group, const sead::SafeString& item, + al::ByamlIter* iter) { + if (iter) { + ksys::act::getSameGroupActorName(group, item, iter); + } else { + ksys::act::getSameGroupActorName(group, item); + } +} + } // namespace PauseMenuDataMgr::PauseMenuDataMgr() { @@ -218,11 +227,7 @@ void PauseMenuDataMgr::initForNewSave() { PouchItemType PauseMenuDataMgr::getType(const sead::SafeString& item, al::ByamlIter* iter) { sead::SafeString group; - if (iter) { - ksys::act::getSameGroupActorName(&group, item, iter); - } else { - ksys::act::getSameGroupActorName(&group, item); - } + getSameGroupActorName(&group, item, iter); al::ByamlIter actor_iter; if (iter && iter->isValid() && group == item) {