mirror/botw
1
0
Fork 0
mirror of https://github.com/zeldaret/botw synced 2026-07-08 21:55:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add #ifdef declarations for NON_MATCHING code"

Browse Source 
This reverts commit 42807160cf.

It makes searching for NON_MATCHING comment descriptions much less
convenient in most text editors or IDEs, and we want the function
CSV to be the single source of truth for function statuses. Having
a function marked as matching but not built because of a stray #ifdef
would be bad.
This commit is contained in:
Léo Lam
2022-02-27 12:48:28 +01:00
parent a564186002
commit df36d65665
52 changed files with 93 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/KingSystem/GameData/gdtManager.cpp
+2 -6
View File
@@ -76,8 +76,7 @@ Manager::~Manager() {
}
}
// address differences for the static bgdata_factory that causes different regalloc
#ifdef NON_MATCHING
// NON_MATCHING: address differences for the static bgdata_factory that causes different regalloc
void Manager::init(sead::Heap* heap, sead::Framework* framework) {
sead::TickTime a;
sead::TickTime b;
@@ -138,7 +137,6 @@ 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;
@@ -797,8 +795,7 @@ void Manager::syncStart() {
util::safeDeleteArray(buffer);
}
// recordFlagChange calls not being merged, or merged in the wrong way
#ifdef NON_MATCHING
// NON_MATCHING: recordFlagChange calls not being merged, or merged in the wrong way
void Manager::syncUpdate(const char* data) {
const sead::SafeString cmd = data;
auto it = cmd.tokenBegin("|");
@@ -1035,7 +1032,6 @@ 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) {