From 98f0c80f1d0b9d3ca19f0b38efcb597ee65d9dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Mon, 28 Sep 2026 03:39:31 +0200 Subject: The task and thread families are plain ksys:: They link in the same block as the plain-ksys:: Message family. getItemValue and applyScreenFade sit in engine UI TUs, hence ksys::ui. (AI assisted using Claude Fable 5.1 and Claude Opus 5.5) --- src/Game/Actor/Query/queryHasPorchArrow.cpp | 8 ++++---- src/Game/Actor/Query/queryHasPorchItem.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Game/Actor/Query') diff --git a/src/Game/Actor/Query/queryHasPorchArrow.cpp b/src/Game/Actor/Query/queryHasPorchArrow.cpp index 7867b388..e0d53e32 100644 --- a/src/Game/Actor/Query/queryHasPorchArrow.cpp +++ b/src/Game/Actor/Query/queryHasPorchArrow.cpp @@ -1,6 +1,6 @@ #include "Game/Actor/Query/queryHasPorchArrow.h" #include -#include "Game/UI/uiUtils.h" +#include "KingSystem/System/UIGlue.h" namespace uking::query { @@ -9,9 +9,9 @@ HasPorchArrow::HasPorchArrow(const InitArg& arg) : ksys::act::ai::Query(arg) {} HasPorchArrow::~HasPorchArrow() = default; int HasPorchArrow::doQuery() { - s32 arrow_cnt = ui::getItemValue("NormalArrow") + ui::getItemValue("FireArrow") + - ui::getItemValue("IceArrow") + ui::getItemValue("ElectricArrow") + - ui::getItemValue("BombArrow_A") + ui::getItemValue("AncientArrow"); + s32 arrow_cnt = ksys::ui::getItemValue("NormalArrow") + ksys::ui::getItemValue("FireArrow") + + ksys::ui::getItemValue("IceArrow") + ksys::ui::getItemValue("ElectricArrow") + + ksys::ui::getItemValue("BombArrow_A") + ksys::ui::getItemValue("AncientArrow"); return arrow_cnt < *mCheckNum; } diff --git a/src/Game/Actor/Query/queryHasPorchItem.cpp b/src/Game/Actor/Query/queryHasPorchItem.cpp index f8ac4e74..e16d0ac3 100644 --- a/src/Game/Actor/Query/queryHasPorchItem.cpp +++ b/src/Game/Actor/Query/queryHasPorchItem.cpp @@ -1,6 +1,6 @@ #include "Game/Actor/Query/queryHasPorchItem.h" #include -#include "Game/UI/uiUtils.h" +#include "KingSystem/System/UIGlue.h" namespace uking::query { @@ -9,7 +9,7 @@ HasPorchItem::HasPorchItem(const InitArg& arg) : ksys::act::ai::Query(arg) {} HasPorchItem::~HasPorchItem() = default; int HasPorchItem::doQuery() { - return ui::getItemValue(mPorchItemName) >= *mCount; + return ksys::ui::getItemValue(mPorchItemName) >= *mCount; } void HasPorchItem::loadParams(const evfl::QueryArg& arg) { -- cgit v1.2.3