From 15fb041a7c8af73089c3819983c678174f06d622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Wed, 23 Dec 2020 16:00:26 +0100 Subject: [PATCH] ksys/gdt: Add missing bool parameter for some getters --- data/uking_functions.csv | 28 +++++----- src/KingSystem/GameData/gdtTriggerParam.cpp | 46 +++++++++-------- src/KingSystem/GameData/gdtTriggerParam.h | 57 ++++++++++++--------- 3 files changed, 71 insertions(+), 60 deletions(-) diff --git a/data/uking_functions.csv b/data/uking_functions.csv index b183a67b..eed7d215 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -76134,14 +76134,14 @@ 0x0000007100ddf2f0,TriggerParam::getString64ByIdx,140,_ZNK4ksys3gdt12TriggerParam8getStr64EPPKcib 0x0000007100ddf37c,_ZNK4ksys3gdt12TriggerParam9getStr256EPPKcib,0x8c,_ZNK4ksys3gdt12TriggerParam9getStr256EPPKcib 0x0000007100ddf408,TriggerParam::getVec3ByIdx,124,_ZNK4ksys3gdt12TriggerParam8getVec3fEPN4sead7Vector3IfEEib -0x0000007100ddf484,TriggerParam::getBoolByKey_0,368,_ZNK4ksys3gdt12TriggerParam7getBoolEPbRKN4sead14SafeStringBaseIcEEb -0x0000007100ddf5f4,TriggerParam::getBoolByKey,368,_ZNK4ksys3gdt12TriggerParam8getBool2EPbRKN4sead14SafeStringBaseIcEEb -0x0000007100ddf764,TriggerParam::getIntByKey,364,_ZNK4ksys3gdt12TriggerParam6getS32EPiRKN4sead14SafeStringBaseIcEEb -0x0000007100ddf8d0,TriggerParam::getFloatByKey,364,_ZNK4ksys3gdt12TriggerParam6getF32EPfRKN4sead14SafeStringBaseIcEEb -0x0000007100ddfa3c,TriggerParam::getString32ByKey,384,_ZNK4ksys3gdt12TriggerParam6getStrEPPKcRKN4sead14SafeStringBaseIcEEb -0x0000007100ddfbbc,TriggerParam::getString64ByKey,384,_ZNK4ksys3gdt12TriggerParam8getStr64EPPKcRKN4sead14SafeStringBaseIcEEb -0x0000007100ddfd3c,TriggerParam::getString256ByKey,384,_ZNK4ksys3gdt12TriggerParam9getStr256EPPKcRKN4sead14SafeStringBaseIcEEb -0x0000007100ddfebc,TriggerParam::getVec3ByKey,368,_ZNK4ksys3gdt12TriggerParam8getVec3fEPN4sead7Vector3IfEERKNS2_14SafeStringBaseIcEEb +0x0000007100ddf484,TriggerParam::getBoolByKey_0,368,_ZNK4ksys3gdt12TriggerParam7getBoolEPbRKN4sead14SafeStringBaseIcEEbb +0x0000007100ddf5f4,TriggerParam::getBoolByKey,368,_ZNK4ksys3gdt12TriggerParam8getBool2EPbRKN4sead14SafeStringBaseIcEEbb +0x0000007100ddf764,TriggerParam::getIntByKey,364,_ZNK4ksys3gdt12TriggerParam6getS32EPiRKN4sead14SafeStringBaseIcEEbb +0x0000007100ddf8d0,TriggerParam::getFloatByKey,364,_ZNK4ksys3gdt12TriggerParam6getF32EPfRKN4sead14SafeStringBaseIcEEbb +0x0000007100ddfa3c,TriggerParam::getString32ByKey,384,_ZNK4ksys3gdt12TriggerParam6getStrEPPKcRKN4sead14SafeStringBaseIcEEbb +0x0000007100ddfbbc,TriggerParam::getString64ByKey,384,_ZNK4ksys3gdt12TriggerParam8getStr64EPPKcRKN4sead14SafeStringBaseIcEEbb +0x0000007100ddfd3c,TriggerParam::getString256ByKey,384,_ZNK4ksys3gdt12TriggerParam9getStr256EPPKcRKN4sead14SafeStringBaseIcEEbb +0x0000007100ddfebc,TriggerParam::getVec3ByKey,368,_ZNK4ksys3gdt12TriggerParam8getVec3fEPN4sead7Vector3IfEERKNS2_14SafeStringBaseIcEEbb 0x0000007100de002c,TriggerParam::getBoolFromArray,164,_ZNK4ksys3gdt12TriggerParam7getBoolEPbiib 0x0000007100de00d0,TriggerParam::getS32FromArray,160,_ZNK4ksys3gdt12TriggerParam6getS32EPiiib 0x0000007100de0170,TriggerParam::getF32FromArray,160,_ZNK4ksys3gdt12TriggerParam6getF32EPfiib @@ -76149,12 +76149,12 @@ 0x0000007100de02c4,TriggerParam::getString256FromArray,180,_ZNK4ksys3gdt12TriggerParam9getStr256EPPKciib 0x0000007100DE0378,_ZNK4ksys3gdt12TriggerParam8getVec2fEPN4sead7Vector2IfEEiib,0xa0,_ZNK4ksys3gdt12TriggerParam8getVec2fEPN4sead7Vector2IfEEiib 0x0000007100DE0418,_ZNK4ksys3gdt12TriggerParam8getVec3fEPN4sead7Vector3IfEEiib,0xa4,_ZNK4ksys3gdt12TriggerParam8getVec3fEPN4sead7Vector3IfEEiib -0x0000007100de04bc,TriggerParam::getBoolFromArrayByKey,356,_ZNK4ksys3gdt12TriggerParam7getBoolEPbRKN4sead14SafeStringBaseIcEEib -0x0000007100de0620,TriggerParam::getIntFromArrayByKey,352,_ZNK4ksys3gdt12TriggerParam6getS32EPiRKN4sead14SafeStringBaseIcEEib -0x0000007100de0780,TriggerParam::getFloatFromArrayByKey,352,_ZNK4ksys3gdt12TriggerParam6getF32EPfRKN4sead14SafeStringBaseIcEEib -0x0000007100de08e0,TriggerParam::getString32FromArrayByKey,372,_ZNK4ksys3gdt12TriggerParam6getStrEPPKcRKN4sead14SafeStringBaseIcEEib -0x0000007100de0a54,TriggerParam::getString64FromArrayByKey,372,_ZNK4ksys3gdt12TriggerParam8getStr64EPPKcRKN4sead14SafeStringBaseIcEEib -0x0000007100de0bc8,TriggerParam::getString256FromArrayByKey,372,_ZNK4ksys3gdt12TriggerParam9getStr256EPPKcRKN4sead14SafeStringBaseIcEEib +0x0000007100de04bc,TriggerParam::getBoolFromArrayByKey,356,_ZNK4ksys3gdt12TriggerParam7getBoolEPbRKN4sead14SafeStringBaseIcEEibb +0x0000007100de0620,TriggerParam::getIntFromArrayByKey,352,_ZNK4ksys3gdt12TriggerParam6getS32EPiRKN4sead14SafeStringBaseIcEEibb +0x0000007100de0780,TriggerParam::getFloatFromArrayByKey,352,_ZNK4ksys3gdt12TriggerParam6getF32EPfRKN4sead14SafeStringBaseIcEEibb +0x0000007100de08e0,TriggerParam::getString32FromArrayByKey,372,_ZNK4ksys3gdt12TriggerParam6getStrEPPKcRKN4sead14SafeStringBaseIcEEibb +0x0000007100de0a54,TriggerParam::getString64FromArrayByKey,372,_ZNK4ksys3gdt12TriggerParam8getStr64EPPKcRKN4sead14SafeStringBaseIcEEibb +0x0000007100de0bc8,TriggerParam::getString256FromArrayByKey,372,_ZNK4ksys3gdt12TriggerParam9getStr256EPPKcRKN4sead14SafeStringBaseIcEEibb 0x0000007100de0d3c,sub_7100DE0D3C,56,_ZNK4ksys3gdt12TriggerParam16getBoolArraySizeEPii 0x0000007100de0d74,sub_7100DE0D74,56,_ZNK4ksys3gdt12TriggerParam15getS32ArraySizeEPii 0x0000007100de0dac,sub_7100DE0DAC,56,_ZNK4ksys3gdt12TriggerParam15getF32ArraySizeEPii diff --git a/src/KingSystem/GameData/gdtTriggerParam.cpp b/src/KingSystem/GameData/gdtTriggerParam.cpp index 94c1888e..98d49f4a 100644 --- a/src/KingSystem/GameData/gdtTriggerParam.cpp +++ b/src/KingSystem/GameData/gdtTriggerParam.cpp @@ -1039,51 +1039,53 @@ bool TriggerParam::getVec4f(sead::Vector4f* value, s32 index, bool check_permiss return getFlagValue(mVector4fFlags, value, index, check_permissions); } -bool TriggerParam::getBool(bool* value, const sead::SafeString& name, - bool check_permissions) const { +bool TriggerParam::getBool(bool* value, const sead::SafeString& name, bool check_permissions, + bool x) const { return getBool(value, getBoolIdx(name), check_permissions); } -bool TriggerParam::getBool2(bool* value, const sead::SafeString& name, - bool check_permissions) const { +bool TriggerParam::getBool2(bool* value, const sead::SafeString& name, bool check_permissions, + bool x) const { return getBool(value, getBoolIdx(name), check_permissions); } -bool TriggerParam::getS32(s32* value, const sead::SafeString& name, bool check_permissions) const { +bool TriggerParam::getS32(s32* value, const sead::SafeString& name, bool check_permissions, + bool x) const { return getS32(value, getS32Idx(name), check_permissions); } -bool TriggerParam::getF32(f32* value, const sead::SafeString& name, bool check_permissions) const { +bool TriggerParam::getF32(f32* value, const sead::SafeString& name, bool check_permissions, + bool x) const { return getF32(value, getF32Idx(name), check_permissions); } -bool TriggerParam::getStr(const char** value, const sead::SafeString& name, - bool check_permissions) const { +bool TriggerParam::getStr(const char** value, const sead::SafeString& name, bool check_permissions, + bool x) const { return getStr(value, getStrIdx(name), check_permissions); } bool TriggerParam::getStr64(const char** value, const sead::SafeString& name, - bool check_permissions) const { + bool check_permissions, bool x) const { return getStr64(value, getStr64Idx(name), check_permissions); } bool TriggerParam::getStr256(const char** value, const sead::SafeString& name, - bool check_permissions) const { + bool check_permissions, bool x) const { return getStr256(value, getStr256Idx(name), check_permissions); } bool TriggerParam::getVec2f(sead::Vector2f* value, const sead::SafeString& name, - bool check_permissions) const { + bool check_permissions, bool x) const { return getVec2f(value, getVec2fIdx(name), check_permissions); } bool TriggerParam::getVec3f(sead::Vector3f* value, const sead::SafeString& name, - bool check_permissions) const { + bool check_permissions, bool x) const { return getVec3f(value, getVec3fIdx(name), check_permissions); } bool TriggerParam::getVec4f(sead::Vector4f* value, const sead::SafeString& name, - bool check_permissions) const { + bool check_permissions, bool x) const { return getVec4f(value, getVec4fIdx(name), check_permissions); } @@ -1133,47 +1135,47 @@ bool TriggerParam::getVec4f(sead::Vector4f* value, s32 array_index, s32 index, } bool TriggerParam::getBool(bool* value, const sead::SafeString& name, s32 index, - bool check_permissions) const { + bool check_permissions, bool x) const { return getBool(value, getBoolArrayIdx(name), index, check_permissions); } bool TriggerParam::getS32(s32* value, const sead::SafeString& name, s32 index, - bool check_permissions) const { + bool check_permissions, bool x) const { return getS32(value, getS32ArrayIdx(name), index, check_permissions); } bool TriggerParam::getF32(f32* value, const sead::SafeString& name, s32 index, - bool check_permissions) const { + bool check_permissions, bool x) const { return getF32(value, getF32ArrayIdx(name), index, check_permissions); } bool TriggerParam::getStr(const char** value, const sead::SafeString& name, s32 index, - bool check_permissions) const { + bool check_permissions, bool x) const { return getStr(value, getStrArrayIdx(name), index, check_permissions); } bool TriggerParam::getStr64(const char** value, const sead::SafeString& name, s32 index, - bool check_permissions) const { + bool check_permissions, bool x) const { return getStr64(value, getStr64ArrayIdx(name), index, check_permissions); } bool TriggerParam::getStr256(const char** value, const sead::SafeString& name, s32 index, - bool check_permissions) const { + bool check_permissions, bool x) const { return getStr256(value, getStr256ArrayIdx(name), index, check_permissions); } bool TriggerParam::getVec2f(sead::Vector2f* value, const sead::SafeString& name, s32 index, - bool check_permissions) const { + bool check_permissions, bool x) const { return getVec2f(value, getVec2fArrayIdx(name), index, check_permissions); } bool TriggerParam::getVec3f(sead::Vector3f* value, const sead::SafeString& name, s32 index, - bool check_permissions) const { + bool check_permissions, bool x) const { return getVec3f(value, getVec3fArrayIdx(name), index, check_permissions); } bool TriggerParam::getVec4f(sead::Vector4f* value, const sead::SafeString& name, s32 index, - bool check_permissions) const { + bool check_permissions, bool x) const { return getVec4f(value, getVec4fArrayIdx(name), index, check_permissions); } diff --git a/src/KingSystem/GameData/gdtTriggerParam.h b/src/KingSystem/GameData/gdtTriggerParam.h index 90660cd6..9a4c6fd3 100644 --- a/src/KingSystem/GameData/gdtTriggerParam.h +++ b/src/KingSystem/GameData/gdtTriggerParam.h @@ -99,36 +99,45 @@ public: // region Value getters (by name) - bool getBool(bool* value, const sead::SafeString& name, bool check_permissions) const; - bool getBool2(bool* value, const sead::SafeString& name, bool check_permissions) const; - bool getS32(s32* value, const sead::SafeString& name, bool check_permissions) const; - bool getF32(f32* value, const sead::SafeString& name, bool check_permissions) const; - bool getStr(const char** value, const sead::SafeString& name, bool check_permissions) const; - bool getStr64(const char** value, const sead::SafeString& name, bool check_permissions) const; - bool getStr256(const char** value, const sead::SafeString& name, bool check_permissions) const; - bool getVec2f(sead::Vector2f* value, const sead::SafeString& name, - bool check_permissions) const; - bool getVec3f(sead::Vector3f* value, const sead::SafeString& name, - bool check_permissions) const; - bool getVec4f(sead::Vector4f* value, const sead::SafeString& name, - bool check_permissions) const; + bool getBool(bool* value, const sead::SafeString& name, bool check_permissions, + bool x = true) const; + bool getBool2(bool* value, const sead::SafeString& name, bool check_permissions, + bool x = true) const; + bool getS32(s32* value, const sead::SafeString& name, bool check_permissions, + bool x = true) const; + bool getF32(f32* value, const sead::SafeString& name, bool check_permissions, + bool x = true) const; + bool getStr(const char** value, const sead::SafeString& name, bool check_permissions, + bool x = true) const; + bool getStr64(const char** value, const sead::SafeString& name, bool check_permissions, + bool x = true) const; + bool getStr256(const char** value, const sead::SafeString& name, bool check_permissions, + bool x = true) const; + bool getVec2f(sead::Vector2f* value, const sead::SafeString& name, bool check_permissions, + bool x = true) const; + bool getVec3f(sead::Vector3f* value, const sead::SafeString& name, bool check_permissions, + bool x = true) const; + bool getVec4f(sead::Vector4f* value, const sead::SafeString& name, bool check_permissions, + bool x = true) const; - bool getBool(bool* value, const sead::SafeString& name, s32 index, - bool check_permissions) const; - bool getS32(s32* value, const sead::SafeString& name, s32 index, bool check_permissions) const; - bool getF32(f32* value, const sead::SafeString& name, s32 index, bool check_permissions) const; - bool getStr(const char** value, const sead::SafeString& name, s32 index, - bool check_permissions) const; + bool getBool(bool* value, const sead::SafeString& name, s32 index, bool check_permissions, + bool x = true) const; + bool getS32(s32* value, const sead::SafeString& name, s32 index, bool check_permissions, + bool x = true) const; + bool getF32(f32* value, const sead::SafeString& name, s32 index, bool check_permissions, + bool x = true) const; + bool getStr(const char** value, const sead::SafeString& name, s32 index, bool check_permissions, + bool x = true) const; bool getStr64(const char** value, const sead::SafeString& name, s32 index, - bool check_permissions) const; + bool check_permissions, bool x = true) const; bool getStr256(const char** value, const sead::SafeString& name, s32 index, - bool check_permissions) const; + bool check_permissions, bool x = true) const; bool getVec2f(sead::Vector2f* value, const sead::SafeString& name, s32 index, - bool check_permissions) const; + bool check_permissions, bool x = true) const; bool getVec3f(sead::Vector3f* value, const sead::SafeString& name, s32 index, - bool check_permissions) const; + bool check_permissions, bool x = true) const; bool getVec4f(sead::Vector4f* value, const sead::SafeString& name, s32 index, - bool check_permissions) const; + bool check_permissions, bool x = true) const; // endregion