diff options
| author | Léo Lam <leo@leolam.fr> | 2020-11-10 21:40:33 +0100 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2020-11-10 21:52:48 +0100 |
| commit | 93b1b179794bbac2cb46aef2ffe34f3f2d96221d (patch) | |
| tree | f8291119b2d8d7b424bd96df8341d069f966a362 /src/KingSystem/GameData | |
| parent | 7e7a76f92695535c31618879ebb23753e72dc822 (diff) | |
Fix matching errors
Diffstat (limited to 'src/KingSystem/GameData')
| -rw-r--r-- | src/KingSystem/GameData/gdtCommonFlagsUtils.cpp | 4 | ||||
| -rw-r--r-- | src/KingSystem/GameData/gdtCommonFlagsUtils.h | 4 | ||||
| -rw-r--r-- | src/KingSystem/GameData/gdtManager.h | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/KingSystem/GameData/gdtCommonFlagsUtils.cpp b/src/KingSystem/GameData/gdtCommonFlagsUtils.cpp index 0363fbe6..ae11e4c2 100644 --- a/src/KingSystem/GameData/gdtCommonFlagsUtils.cpp +++ b/src/KingSystem/GameData/gdtCommonFlagsUtils.cpp @@ -141,8 +141,8 @@ bool getFlag_AoC_DragonFireChallengeRing_Advent(bool debug) { return getBool(fla void setFlag_AoC_DragonFireChallengeRing_Advent(bool value, bool debug) { setBool(value, flag_AoC_DragonFireChallengeRing_Advent(), debug); } bool getFlag_AoC_HardMode_Enabled(bool debug) { return getBool(flag_AoC_HardMode_Enabled(), debug); } void setFlag_AoC_HardMode_Enabled(bool value, bool debug) { setBool(value, flag_AoC_HardMode_Enabled(), debug); } -void getFlag_AoC_RandomSpawnTreasure_Contents(char const** value, bool debug) { getStr64(flag_AoC_RandomSpawnTreasure_Contents(), value, debug); } -void setFlag_AoC_RandomSpawnTreasure_Contents(const sead::SafeString& value, bool debug) { setStr64(value, flag_AoC_RandomSpawnTreasure_Contents(), debug); } +void getFlag_AoC_RandomSpawnTreasure_Contents(char const** value, s32 idx, bool debug) { getStr64(flag_AoC_RandomSpawnTreasure_Contents(), value, idx, debug); } +void setFlag_AoC_RandomSpawnTreasure_Contents(const sead::SafeString& value, s32 idx, bool debug) { setStr64(value, flag_AoC_RandomSpawnTreasure_Contents(), idx, debug); } bool getFlag_AoC_RandomSpawnTreasure_IsRandomized(bool debug) { return getBool(flag_AoC_RandomSpawnTreasure_IsRandomized(), debug); } void setFlag_AoC_RandomSpawnTreasure_IsRandomized(bool value, bool debug) { setBool(value, flag_AoC_RandomSpawnTreasure_IsRandomized(), debug); } bool getFlag_AoC_TestProg_Imoto_Flag_00(bool debug) { return getBool(flag_AoC_TestProg_Imoto_Flag_00(), debug); } diff --git a/src/KingSystem/GameData/gdtCommonFlagsUtils.h b/src/KingSystem/GameData/gdtCommonFlagsUtils.h index e0104d69..377de94a 100644 --- a/src/KingSystem/GameData/gdtCommonFlagsUtils.h +++ b/src/KingSystem/GameData/gdtCommonFlagsUtils.h @@ -144,8 +144,8 @@ bool getFlag_AoC_DragonFireChallengeRing_Advent(bool debug = false); void setFlag_AoC_DragonFireChallengeRing_Advent(bool value, bool debug = false); bool getFlag_AoC_HardMode_Enabled(bool debug = false); void setFlag_AoC_HardMode_Enabled(bool value, bool debug = false); -void getFlag_AoC_RandomSpawnTreasure_Contents(char const** value, bool debug = false); -void setFlag_AoC_RandomSpawnTreasure_Contents(const sead::SafeString& value, bool debug = false); +void getFlag_AoC_RandomSpawnTreasure_Contents(char const** value, s32 idx, bool debug = false); +void setFlag_AoC_RandomSpawnTreasure_Contents(const sead::SafeString& value, s32 idx, bool debug = false); bool getFlag_AoC_RandomSpawnTreasure_IsRandomized(bool debug = false); void setFlag_AoC_RandomSpawnTreasure_IsRandomized(bool value, bool debug = false); bool getFlag_AoC_TestProg_Imoto_Flag_00(bool debug = false); diff --git a/src/KingSystem/GameData/gdtManager.h b/src/KingSystem/GameData/gdtManager.h index 6a14dba2..cd8d31dc 100644 --- a/src/KingSystem/GameData/gdtManager.h +++ b/src/KingSystem/GameData/gdtManager.h @@ -7,6 +7,7 @@ #include <heap/seadDisposer.h> #include <prim/seadDelegateEventSlot.h> #include <prim/seadTypedBitFlag.h> +#include <thread/seadMutex.h> #include <type_traits> #include "KingSystem/GameData/gdtTriggerParam.h" #include "KingSystem/Resource/resHandle.h" @@ -510,7 +511,7 @@ private: sead::FixedSafeString<64> mStr; // TODO: rename u32 mTrackerBlockSaveNumberFlagCrc32 = 0; u32 mSyncStep = 0; - sead::CriticalSection mCriticalSection; + sead::Mutex mMutex; }; KSYS_CHECK_SIZE_NX150(Manager, 0xdc8); |
