ksys/act: Finish Query

2 files changed, 38 insertions, 3 deletions

diff --git a/src/KingSystem/ActorSystem/actAiParam.h b/src/KingSystem/ActorSystem/actAiParam.h
index 5644b56c..e132ef8b 100644
--- a/src/KingSystem/ActorSystem/actAiParam.h
+++ b/src/KingSystem/ActorSystem/actAiParam.h
@@ -74,10 +74,12 @@ public:
     T* getVariable(const sead::SafeString& key, AIDefParamType type, bool a4 = true) const;
 
     template <typename T>
-    void setVariable(const sead::SafeString& key, AIDefParamType type, const T& val) const {
+    bool setVariable(const sead::SafeString& key, AIDefParamType type, const T& val) const {
         T* variable = getVariable<T>(key, type, true);
-        if (variable)
-            *variable = val;
+        if (!variable)
+            return false;
+        *variable = val;
+        return true;
     }
 
     bool load(const Actor& actor, const ParamNameTypePairs& pairs, s32 count, sead::Heap* heap);
diff --git a/src/KingSystem/ActorSystem/actAiQuery.cpp b/src/KingSystem/ActorSystem/actAiQuery.cpp
index b5467bb2..87b7af6b 100644
--- a/src/KingSystem/ActorSystem/actAiQuery.cpp
+++ b/src/KingSystem/ActorSystem/actAiQuery.cpp
@@ -1,4 +1,5 @@
 #include "KingSystem/ActorSystem/actAiQuery.h"
+#include <evfl/Param.h>
 #include "KingSystem/ActorSystem/actActor.h"
 #include "KingSystem/ActorSystem/actActorParam.h"
 #include "KingSystem/ActorSystem/actAiClassDef.h"
@@ -70,6 +71,38 @@ bool Query::getDynamicParam(bool** value, const sead::SafeString& param) const {
     return ret != nullptr;
 }
 
+bool Query::loadString(const evfl::ParamAccessor& accessor, const sead::SafeString& param) {
+    ore::StringView value;
+    if (!accessor.FindString(&value, param.cstr()))
+        return false;
+
+    return mParamPack.setString(value.data(), param);
+}
+
+bool Query::loadInt(const evfl::ParamAccessor& accessor, const sead::SafeString& param) {
+    int value;
+    if (!accessor.FindInt(&value, param.cstr()))
+        return false;
+
+    return mParamPack.setVariable(param, AIDefParamType::Int, value);
+}
+
+bool Query::loadFloat(const evfl::ParamAccessor& accessor, const sead::SafeString& param) {
+    float value;
+    if (!accessor.FindFloat(&value, param.cstr()))
+        return false;
+
+    return mParamPack.setVariable(param, AIDefParamType::Float, value);
+}
+
+bool Query::loadBool(const evfl::ParamAccessor& accessor, const sead::SafeString& param) {
+    bool value;
+    if (!accessor.FindBool(&value, param.cstr()))
+        return false;
+
+    return mParamPack.setVariable(param, AIDefParamType::Bool, value);
+}
+
 bool Query::getAITreeVariable(sead::SafeString** value, const sead::SafeString& param) const {
     return mActor->getRootAi()->getAITreeVariable(value, param);
 }