From fbd7fd509eb8dd9aacfc602a1ef4b7853183be02 Mon Sep 17 00:00:00 2001 From: RobbyV2 Date: Fri, 31 Jul 2026 10:41:26 -0400 Subject: [PATCH] query: match IsOnEnterDungeonFlag::doQuery --- data/uking_functions.csv | 2 +- src/Game/AI/Query/queryIsOnEnterDungeonFlag.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 390b92ce2..68234a61a 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -41760,7 +41760,7 @@ Address,Quality,Size,Name 0x000000710069f880,O,000048,_ZN5uking5query20IsOnEnterDungeonFlagC1ERKN4ksys3act2ai5Query7InitArgE 0x000000710069f8b0,O,000020,_ZN5uking5query20IsOnEnterDungeonFlagD1Ev 0x000000710069f8c4,O,000052,_ZN5uking5query20IsOnEnterDungeonFlagD0Ev -0x000000710069f8f8,U,000032,AI_Query_IsOnEnterDungeonFlag::doQuery +0x000000710069f8f8,O,000032,_ZN5uking5query20IsOnEnterDungeonFlag7doQueryEv 0x000000710069f918,O,000004,_ZN5uking5query20IsOnEnterDungeonFlag10loadParamsERKN4evfl8QueryArgE 0x000000710069f91c,O,000004,_ZN5uking5query20IsOnEnterDungeonFlag10loadParamsEv 0x000000710069f920,O,000204,_ZNK5uking5query20IsOnEnterDungeonFlag27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE diff --git a/src/Game/AI/Query/queryIsOnEnterDungeonFlag.cpp b/src/Game/AI/Query/queryIsOnEnterDungeonFlag.cpp index 56f45800c..542f25589 100644 --- a/src/Game/AI/Query/queryIsOnEnterDungeonFlag.cpp +++ b/src/Game/AI/Query/queryIsOnEnterDungeonFlag.cpp @@ -1,5 +1,7 @@ #include "Game/AI/Query/queryIsOnEnterDungeonFlag.h" #include +#include "Game/gameScene.h" +#include "KingSystem/GameData/gdtSpecialFlags.h" namespace uking::query { @@ -7,9 +9,8 @@ IsOnEnterDungeonFlag::IsOnEnterDungeonFlag(const InitArg& arg) : ksys::act::ai:: IsOnEnterDungeonFlag::~IsOnEnterDungeonFlag() = default; -// FIXME: implement int IsOnEnterDungeonFlag::doQuery() { - return -1; + return ksys::gdt::isDungeonEntered(GameScene::getCurrentMapName(), false); } void IsOnEnterDungeonFlag::loadParams(const evfl::QueryArg& arg) {}