diff options
| author | AlexApps99 <alex.apps99@gmail.com> | 2021-07-26 21:58:51 +1200 |
|---|---|---|
| committer | AlexApps99 <alex.apps99@gmail.com> | 2021-07-26 23:05:19 +1200 |
| commit | 42807160cfb33af9f3cf2fa6b0ba98f232208cdb (patch) | |
| tree | 95b1b16a3f4cf7d0ab51e90b3d73e53f74ba7f2b /src/KingSystem/ActorSystem/actAiClassDef.cpp | |
| parent | 88bcc9eec1481b47361dc717c83e4953e8929a2b (diff) | |
Add #ifdef declarations for NON_MATCHING code
Diffstat (limited to 'src/KingSystem/ActorSystem/actAiClassDef.cpp')
| -rw-r--r-- | src/KingSystem/ActorSystem/actAiClassDef.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/KingSystem/ActorSystem/actAiClassDef.cpp b/src/KingSystem/ActorSystem/actAiClassDef.cpp index 378d2248..064aa883 100644 --- a/src/KingSystem/ActorSystem/actAiClassDef.cpp +++ b/src/KingSystem/ActorSystem/actAiClassDef.cpp @@ -42,7 +42,8 @@ void AIClassDef::init(const sead::SafeString& aidef_file_name, sead::Heap* heap) mData->load(heap); } -// NON_MATCHING: not trying to match the heap sort. The rest should be equivalent +// not trying to match the heap sort. The rest should be equivalent +#ifdef NON_MATCHING 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); @@ -82,6 +83,7 @@ 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); @@ -137,7 +139,8 @@ void AIClassDef::getDef(const sead::SafeString& class_name, AIDefSet* set, data->inst_params_key_idx[s32(AIDefInstParamKind::AITree)]); } -// NON_MATCHING: CalcTiming ifs are reordered +// CalcTiming ifs are reordered +#ifdef NON_MATCHING void AIClassDef::doGetDef(AIDef* def, const al::ByamlIter& iter, AIDefInstParamKind param_kind, AIDefType class_type, s32 key_idx) const { def->no_stop = false; @@ -259,6 +262,7 @@ 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 { |