From c808135ef195804baab949391b1130dbf8901d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Tue, 6 Jul 2021 00:03:33 +0200 Subject: [PATCH] query: Fix matching issue in CheckRupee --- data/uking_functions.csv | 2 +- src/Game/AI/Query/queryCheckRupee.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/uking_functions.csv b/data/uking_functions.csv index a4a55e19..dfc60848 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -41110,7 +41110,7 @@ 0x0000007100694aac,AI_Query_CheckRupee::ctor,52,_ZN5uking5query10CheckRupeeC1ERKN4ksys3act2ai5Query7InitArgE 0x0000007100694ae0,AI_Query_CheckRupee::dtor,20,_ZN5uking5query10CheckRupeeD1Ev 0x0000007100694af4,AI_Query_CheckRupee::dtorDelete,52,_ZN5uking5query10CheckRupeeD0Ev -0x0000007100694b28,AI_Query_CheckRupee::doQuery,140,_ZN5uking5query10CheckRupee7doQueryEv? +0x0000007100694b28,AI_Query_CheckRupee::doQuery,140,_ZN5uking5query10CheckRupee7doQueryEv 0x0000007100694bb4,AI_Query_CheckRupee::m10,64,_ZN5uking5query10CheckRupee10loadParamsERKN4evfl8QueryArgE 0x0000007100694bf4,AI_Query_CheckRupee::loadParams,64,_ZN5uking5query10CheckRupee10loadParamsEv 0x0000007100694c34,AI_Query_CheckRupee::rtti1,204,_ZNK5uking5query10CheckRupee27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE diff --git a/src/Game/AI/Query/queryCheckRupee.cpp b/src/Game/AI/Query/queryCheckRupee.cpp index 59dcb572..46b766af 100644 --- a/src/Game/AI/Query/queryCheckRupee.cpp +++ b/src/Game/AI/Query/queryCheckRupee.cpp @@ -8,10 +8,10 @@ CheckRupee::CheckRupee(const InitArg& arg) : ksys::act::ai::Query(arg) {} CheckRupee::~CheckRupee() = default; -// NON_MATCHING int CheckRupee::doQuery() { + auto* mgr = ksys::gdt::Manager::instance(); s32 value = 0; - if (!ksys::gdt::Manager::instance()->getParamBypassPerm().get().getS32(&value, "CurrentRupee")) + if (!mgr->getParamBypassPerm().get().getS32(&value, "CurrentRupee")) return 0; return value >= *mValue; }