From da65708ded005b1613ce868337952d72bdf80e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 2 May 2021 11:18:59 +0200 Subject: ksys/world: Implement more TimeMgr functions --- src/KingSystem/GameData/gdtManager.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/KingSystem/GameData') diff --git a/src/KingSystem/GameData/gdtManager.h b/src/KingSystem/GameData/gdtManager.h index 2ddc0308..9d51decf 100644 --- a/src/KingSystem/GameData/gdtManager.h +++ b/src/KingSystem/GameData/gdtManager.h @@ -281,14 +281,18 @@ public: #undef GDT_GET_HANDLE_ #define GDT_GET_(NAME, T) \ - bool NAME(FlagHandle handle, T* value, bool debug = false) { \ + bool NAME(FlagHandle handle, T* value, bool debug = false, \ + bool ignore_trigger_param_result = false) { \ return unwrapHandle(handle, debug, [&](u32 idx, TriggerParamRef& ref) { \ - return ref.get().NAME(value, idx); \ + const bool result = ref.get().NAME(value, idx); \ + return ignore_trigger_param_result || result; \ }); \ } \ - bool NAME(FlagHandle handle, T* value, s32 sub_idx, bool debug = false) { \ + bool NAME(FlagHandle handle, T* value, s32 sub_idx, bool debug = false, \ + bool ignore_trigger_param_result = false) { \ return unwrapHandle(handle, debug, [&](u32 idx, TriggerParamRef& ref) { \ - return ref.get().NAME(value, idx, sub_idx); \ + const bool result = ref.get().NAME(value, idx, sub_idx); \ + return ignore_trigger_param_result || result; \ }); \ } -- cgit v1.2.3