falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix matching errors

This commit is contained in:
Léo Lam 2020-11-10 21:40:33 +01:00
parent 7e7a76f926
commit 93b1b17979
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
7 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Game/DLC/aoc2.cpp
View File

@ -45,8 +45,8 @@ void aoc2::setHardModeEnabledFlag(ksys::gdt::Manager::ResetEvent*) {
void aoc2::initFlagHandles(ksys::gdt::Manager::ReinitEvent*) { void aoc2::initFlagHandles(ksys::gdt::Manager::ReinitEvent*) {
auto* gdm = ksys::gdt::Manager::instance(); auto* gdm = ksys::gdt::Manager::instance();
mHardModeHighScoreFlag = gdm->getS32Handle(sData.flag_name_HardMode_HighScore); mHardModeHighScoreFlag = gdm->getS32Handle(sData.flag_name_HardMode_HighScore);
mAoCHardModeEnabledFlag = gdm->getS32Handle(sData.flag_name_AoC_HardMode_Enabled); mAoCHardModeEnabledFlag = gdm->getBoolHandle(sData.flag_name_AoC_HardMode_Enabled);
mIsLastPlayHardModeFlag = gdm->getS32Handle(sData.flag_name_IsLastPlayHardMode); mIsLastPlayHardModeFlag = gdm->getBoolHandle(sData.flag_name_IsLastPlayHardMode);
} }
aoc2::~aoc2() { aoc2::~aoc2() {

2
src/KingSystem/ActorSystem/actBaseProcMgr.cpp
View File

@ -26,7 +26,7 @@ void BaseProcMgr::unregisterProc(BaseProc& proc) {
void BaseProcMgr::addToPreDeleteList(BaseProc& proc) { void BaseProcMgr::addToPreDeleteList(BaseProc& proc) {
auto lock = sead::makeScopedLock(mProcPreDeleteListCS); auto lock = sead::makeScopedLock(mProcPreDeleteListCS);
mProcPreDeleteList.pushBack(&proc); mProcPreDeleteList.pushFront(&proc);
} }
void BaseProcMgr::doAddToUpdateStateList_(BaseProc& proc) { void BaseProcMgr::doAddToUpdateStateList_(BaseProc& proc) {

4
src/KingSystem/GameData/gdtCommonFlagsUtils.cpp
View File

@ -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); } 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); } 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 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 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, bool debug) { setStr64(value, flag_AoC_RandomSpawnTreasure_Contents(), 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); } 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); } 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); } bool getFlag_AoC_TestProg_Imoto_Flag_00(bool debug) { return getBool(flag_AoC_TestProg_Imoto_Flag_00(), debug); }

4
src/KingSystem/GameData/gdtCommonFlagsUtils.h
View File

@ -144,8 +144,8 @@ bool getFlag_AoC_DragonFireChallengeRing_Advent(bool debug = false);
void setFlag_AoC_DragonFireChallengeRing_Advent(bool value, bool debug = false); void setFlag_AoC_DragonFireChallengeRing_Advent(bool value, bool debug = false);
bool getFlag_AoC_HardMode_Enabled(bool debug = false); bool getFlag_AoC_HardMode_Enabled(bool debug = false);
void setFlag_AoC_HardMode_Enabled(bool value, 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 getFlag_AoC_RandomSpawnTreasure_Contents(char const** value, s32 idx, bool debug = false);
void setFlag_AoC_RandomSpawnTreasure_Contents(const sead::SafeString& value, 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); bool getFlag_AoC_RandomSpawnTreasure_IsRandomized(bool debug = false);
void setFlag_AoC_RandomSpawnTreasure_IsRandomized(bool value, bool debug = false); void setFlag_AoC_RandomSpawnTreasure_IsRandomized(bool value, bool debug = false);
bool getFlag_AoC_TestProg_Imoto_Flag_00(bool debug = false); bool getFlag_AoC_TestProg_Imoto_Flag_00(bool debug = false);

3
src/KingSystem/GameData/gdtManager.h
View File

@ -7,6 +7,7 @@
#include <heap/seadDisposer.h> #include <heap/seadDisposer.h>
#include <prim/seadDelegateEventSlot.h> #include <prim/seadDelegateEventSlot.h>
#include <prim/seadTypedBitFlag.h> #include <prim/seadTypedBitFlag.h>
#include <thread/seadMutex.h>
#include <type_traits> #include <type_traits>
#include "KingSystem/GameData/gdtTriggerParam.h" #include "KingSystem/GameData/gdtTriggerParam.h"
#include "KingSystem/Resource/resHandle.h" #include "KingSystem/Resource/resHandle.h"
@ -510,7 +511,7 @@ private:
sead::FixedSafeString<64> mStr; // TODO: rename sead::FixedSafeString<64> mStr; // TODO: rename
u32 mTrackerBlockSaveNumberFlagCrc32 = 0; u32 mTrackerBlockSaveNumberFlagCrc32 = 0;
u32 mSyncStep = 0; u32 mSyncStep = 0;
sead::CriticalSection mCriticalSection; sead::Mutex mMutex;
}; };
KSYS_CHECK_SIZE_NX150(Manager, 0xdc8); KSYS_CHECK_SIZE_NX150(Manager, 0xdc8);

4
src/KingSystem/Resource/resResourceMgrTask.cpp
View File

@ -69,7 +69,7 @@ ResourceMgrTask::~ResourceMgrTask() {
} }
util::safeDeleteArray(mCompactedHeapMainBuffer2); util::safeDeleteArray(mCompactedHeapMainBuffer2);
util::safeDeleteArray(mOffsetReadBuf); util::safeDelete(mOffsetReadBuf);
mExtensions2.freeBuffer(); mExtensions2.freeBuffer();
mExtensions1.freeBuffer(); mExtensions1.freeBuffer();
@ -547,7 +547,7 @@ ResourceUnit* ResourceMgrTask::clearCachesAndGetUnit(const GetUnitArg& arg) {
++it; ++it;
} }
unit = mUnitPool.tryAlloc(); unit = mUnitPool.alloc();
} }
if (!unit->init(*arg.unit_init_arg)) if (!unit->init(*arg.unit_init_arg))

2
tools/generate_gdt_common_flags.py
View File

@ -61,7 +61,7 @@ flag_type_info = {
def add_development_remnant_flags(flags: tp.Dict[str, str]): def add_development_remnant_flags(flags: tp.Dict[str, str]):
_flags = { _flags = {
"AoC_DragonFireChallengeRing_Advent": "bool_data", "AoC_DragonFireChallengeRing_Advent": "bool_data",
"AoC_RandomSpawnTreasure_Contents": "string64_data", "AoC_RandomSpawnTreasure_Contents": "string64_array_data",
"AoC_RandomSpawnTreasure_IsRandomized": "bool_data", "AoC_RandomSpawnTreasure_IsRandomized": "bool_data",
"AoC_TestProg_Imoto_Flag_00": "bool_data", "AoC_TestProg_Imoto_Flag_00": "bool_data",
"AoC_TestProg_Imoto_TagCount_00": "s32_data", "AoC_TestProg_Imoto_TagCount_00": "s32_data",