mirror/botw
1
0
Fork 0
mirror of https://github.com/zeldaret/botw synced 2026-10-22 01:19:55 -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/ActorSystem/actAiClassDef.cpp
+2 -6
View File
@@ -42,8 +42,7 @@ void AIClassDef::init(const sead::SafeString& aidef_file_name, sead::Heap* heap)
mData->load(heap);
}
// not trying to match the heap sort. The rest should be equivalent
#ifdef NON_MATCHING
// NON_MATCHING: not trying to match the heap sort. The rest should be equivalent
bool AIClassDef::Data::load(sead::Heap* heap) {
root_iter.tryGetIterByKey(&iters[s32(AIDefType::AI)], str_AIs);
root_iter.tryGetIterByKey(&iters[s32(AIDefType::Action)], str_Actions);
@@ -83,7 +82,6 @@ bool AIClassDef::Data::load(sead::Heap* heap) {
return true;
}
#endif
s32 AIClassDef::getRawDefIdx(const sead::SafeString& def_name, AIDefType type) const {
const auto hash = sead::HashCRC32::calcStringHash(def_name);
@@ -139,8 +137,7 @@ void AIClassDef::getDef(const sead::SafeString& class_name, AIDefSet* set,
data->inst_params_key_idx[s32(AIDefInstParamKind::AITree)]);
}
// CalcTiming ifs are reordered
#ifdef NON_MATCHING
// NON_MATCHING: CalcTiming ifs are reordered
void AIClassDef::doGetDef(AIDef* def, const al::ByamlIter& iter, AIDefInstParamKind param_kind,
AIDefType class_type, s32 key_idx) const {
def->no_stop = false;
@@ -262,7 +259,6 @@ void AIClassDef::doGetDef(AIDef* def, const al::ByamlIter& iter, AIDefInstParamK
++def->num_params;
}
}
#endif
void AIClassDef::getDef(AIDef* def, const sead::SafeString& class_name,
AIDefInstParamKind param_kind, AIDefType class_type) const {