diff --git a/data/status_query.yml b/data/status_query.yml index 29e8d086..416f76f6 100644 --- a/data/status_query.yml +++ b/data/status_query.yml @@ -75,7 +75,7 @@ query::CheckFadeState: query::CheckFame: status: pending query::CheckFlag: - status: pending + status: done query::CheckGameDataFloat: status: done query::CheckGameDataInt: diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 9225c58d..c6130469 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -40795,7 +40795,7 @@ 0x000000710068cd44,AI_Query_CheckFlag::ctor,72,_ZN5uking5query9CheckFlagC1ERKN4ksys3act2ai5Query7InitArgE 0x000000710068cd8c,AI_Query_CheckFlag::dtor,20,_ZN5uking5query9CheckFlagD1Ev 0x000000710068cda0,AI_Query_CheckFlag::dtorDelete,52,_ZN5uking5query9CheckFlagD0Ev -0x000000710068cdd4,AI_Query_CheckFlag::doQuery,72, +0x000000710068cdd4,AI_Query_CheckFlag::doQuery,72,_ZN5uking5query9CheckFlag7doQueryEv 0x000000710068ce1c,AI_Query_CheckFlag::m10,64,_ZN5uking5query9CheckFlag10loadParamsERKN4evfl8QueryArgE 0x000000710068ce5c,AI_Query_CheckFlag::loadParams,64,_ZN5uking5query9CheckFlag10loadParamsEv 0x000000710068ce9c,AI_Query_CheckFlag::rtti1,204,_ZNK5uking5query9CheckFlag27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE diff --git a/src/Game/AI/Query/queryCheckFlag.cpp b/src/Game/AI/Query/queryCheckFlag.cpp index 17f28b79..8549f3df 100644 --- a/src/Game/AI/Query/queryCheckFlag.cpp +++ b/src/Game/AI/Query/queryCheckFlag.cpp @@ -1,5 +1,6 @@ #include "Game/AI/Query/queryCheckFlag.h" #include +#include "KingSystem/GameData/gdtManager.h" namespace uking::query { @@ -7,9 +8,10 @@ CheckFlag::CheckFlag(const InitArg& arg) : ksys::act::ai::Query(arg) {} CheckFlag::~CheckFlag() = default; -// FIXME: implement int CheckFlag::doQuery() { - return -1; + bool value = false; + ksys::gdt::Manager::instance()->getParamBypassPerm().get().getBool(&value, mFlagName); + return value; } void CheckFlag::loadParams(const evfl::QueryArg& arg) {