diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 13882fd3..c2d25c13 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -74059,8 +74059,8 @@ 0x0000007100d5a654,sub_7100D5A654,184, 0x0000007100d5a70c,sub_7100D5A70C,184, 0x0000007100d5a7c4,sub_7100D5A7C4,184, -0x0000007100d5a87c,sub_7100D5A87C,12, -0x0000007100d5a888,sub_7100D5A888,12, +0x0000007100d5a87c,sub_7100D5A87C,12,_ZNK4ksys3act2ai5Query17getAITreeVariableEPPN4sead14SafeStringBaseIcEERKS5_ +0x0000007100d5a888,sub_7100D5A888,12,_ZNK4ksys3act2ai5Query17getAITreeVariableEPPvRKN4sead14SafeStringBaseIcEE 0x0000007100d5a894,sub_7100D5A894,236, 0x0000007100d5a980,ai::Queries::ctor,28, 0x0000007100d5a99c,sub_7100D5A99C,4, diff --git a/src/KingSystem/ActorSystem/actAiQuery.cpp b/src/KingSystem/ActorSystem/actAiQuery.cpp index 9ba2adae..8cd16602 100644 --- a/src/KingSystem/ActorSystem/actAiQuery.cpp +++ b/src/KingSystem/ActorSystem/actAiQuery.cpp @@ -69,6 +69,14 @@ bool Query::getDInstParam(const bool** value, const sead::SafeString& param) con return ret != nullptr; } +bool Query::getAITreeVariable(sead::SafeString** value, const sead::SafeString& param) const { + return mActor->getRootAi()->getAITreeVariable(value, param); +} + +bool Query::getAITreeVariable(void** value, const sead::SafeString& param) const { + return mActor->getRootAi()->getAITreeVariable(value, param); +} + template class ClassContainer; } // namespace ksys::act::ai diff --git a/src/KingSystem/ActorSystem/actAiQuery.h b/src/KingSystem/ActorSystem/actAiQuery.h index 18f9efcf..99ed7977 100644 --- a/src/KingSystem/ActorSystem/actAiQuery.h +++ b/src/KingSystem/ActorSystem/actAiQuery.h @@ -47,8 +47,8 @@ public: bool loadFloat(evfl::ParamAccessor* accessor, const sead::SafeString& param); bool loadBool(evfl::ParamAccessor* accessor, const sead::SafeString& param); - bool getAITreeVariable(const sead::SafeString** value, const sead::SafeString& param) const; - bool getAITreeVariable(const char** value, const sead::SafeString& param) const; + bool getAITreeVariable(sead::SafeString** value, const sead::SafeString& param) const; + bool getAITreeVariable(void** value, const sead::SafeString& param) const; virtual bool m4() { return false; } virtual bool m5() { return false; }