Merge pull request #162 from hgh32/master

match more ai::Query

1 files changed, 11 insertions, 14 deletions

diff --git a/src/Game/AI/Query/queryHasSetItem.cpp b/src/Game/AI/Query/queryHasSetItem.cpp
index 7b8ccd7d..6b5d0c89 100644
--- a/src/Game/AI/Query/queryHasSetItem.cpp
+++ b/src/Game/AI/Query/queryHasSetItem.cpp
@@ -8,22 +8,19 @@ HasSetItem::HasSetItem(const InitArg& arg) : ksys::act::ai::Query(arg) {}
 
 HasSetItem::~HasSetItem() = default;
 
-// NON_MATCHING: temp duplication
 int HasSetItem::doQuery() {
     auto* gdm = ksys::gdt::Manager::instance();
-    if (gdm == nullptr)
-        return 0;
-
-    auto flag_type = gdm->getParam().get1().getBuffer()->getFlagType(mItemName);
-
-    if (flag_type == ksys::gdt::FlagType::Bool) {
-        bool value = false;
-        if (gdm->getParamBypassPerm().get().getBool(&value, mItemName))
-            return value;
-    } else if (flag_type == ksys::gdt::FlagType::S32) {
-        s32 value = 0;
-        if (gdm->getParamBypassPerm().get().getS32(&value, mItemName))
-            return value >= *mCount;
+    if (gdm != nullptr) {
+        auto flag_type = gdm->getParam().get1().getBuffer()->getFlagType(mItemName);
+        if (flag_type == ksys::gdt::FlagType::Bool) {
+            bool value = false;
+            if (gdm->getParamBypassPerm().get().getBool(&value, mItemName))
+                return value;
+        } else if (flag_type == ksys::gdt::FlagType::S32) {
+            s32 value = 0;
+            if (gdm->getParamBypassPerm().get().getS32(&value, mItemName))
+                return value >= *mCount;
+        }
     }
     return 0;
 }