mirror/botw
1
0
Fork 0
mirror of https://github.com/zeldaret/botw synced 2026-09-07 03:00:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add #ifdef declarations for NON_MATCHING code

Browse Source
This commit is contained in:
AlexApps99
2021-07-26 21:58:51 +12:00
parent 88bcc9eec1
commit 42807160cf
55 changed files with 274 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/KingSystem/GameData/gdtManager.cpp
+6 -2
View File
@@ -76,7 +76,8 @@ Manager::~Manager() {
}
}
// NON_MATCHING: address differences for the static bgdata_factory that causes different regalloc
// address differences for the static bgdata_factory that causes different regalloc
#ifdef NON_MATCHING
void Manager::init(sead::Heap* heap, sead::Framework* framework) {
sead::TickTime a;
sead::TickTime b;
@@ -137,6 +138,7 @@ void Manager::init(sead::Heap* heap, sead::Framework* framework) {
mBitFlags.set(BitFlag::_1000);
mNumFlagsToReset = 0;
}
#endif
void Manager::loadShopGameDataInfo(const sead::SafeString& path) {
res::LoadRequest req;
@@ -795,7 +797,8 @@ void Manager::syncStart() {
util::safeDeleteArray(buffer);
}
// NON_MATCHING: recordFlagChange calls not being merged, or merged in the wrong way
// recordFlagChange calls not being merged, or merged in the wrong way
#ifdef NON_MATCHING
void Manager::syncUpdate(const char* data) {
const sead::SafeString cmd = data;
auto it = cmd.tokenBegin("|");
@@ -1032,6 +1035,7 @@ void Manager::syncUpdate(const char* data) {
return;
}
}
#endif
void Manager::recordFlagChange(u32 platform_core_id, TriggerParam* tparam, u8 type, const s32& idx,
const s32& sub_idx) {
src/KingSystem/GameData/gdtTriggerParam.cpp
+3 -1
View File
@@ -2462,7 +2462,8 @@ bool shouldLogFlagChange(const sead::SafeString& flag_name, FlagType type) {
return sConfig.shouldLog(flag_name, event_type);
}
// NON_MATCHING: reorderings (which result in other small differences)
// reorderings (which result in other small differences)
#ifdef NON_MATCHING
sead::Color4f getFlagColor(FlagType type) {
if (s32(type) == FlagType::Bool || s32(type) == FlagType::BoolArray)
return sead::Color4f::cRed;
@@ -2480,5 +2481,6 @@ sead::Color4f getFlagColor(FlagType type) {
return sead::Color4f::cBlue;
}
#endif
} // namespace ksys::gdt