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/Resource/Actor/resResourceModelList.cpp | |
| parent | 88bcc9eec1481b47361dc717c83e4953e8929a2b (diff) | |
Add #ifdef declarations for NON_MATCHING code
Diffstat (limited to 'src/KingSystem/Resource/Actor/resResourceModelList.cpp')
| -rw-r--r-- | src/KingSystem/Resource/Actor/resResourceModelList.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/KingSystem/Resource/Actor/resResourceModelList.cpp b/src/KingSystem/Resource/Actor/resResourceModelList.cpp index 18b9c0e8..a76c9931 100644 --- a/src/KingSystem/Resource/Actor/resResourceModelList.cpp +++ b/src/KingSystem/Resource/Actor/resResourceModelList.cpp @@ -36,7 +36,8 @@ ModelList::~ModelList() { void ModelList::doCreate_(u8* buffer, u32 buffer_size, sead::Heap* heap) {} -// NON_MATCHING: reorderings +// reorderings +#ifdef NON_MATCHING bool ModelList::parse_(u8* data, size_t size, sead::Heap* heap) { agl::utl::ResParameterArchive archive{data}; const auto root = archive.getRootList(); @@ -103,6 +104,7 @@ bool ModelList::parse_(u8* data, size_t size, sead::Heap* heap) { return true; } +#endif bool ModelList::parseModelData(const agl::utl::ResParameterList& res, sead::Heap* heap) { if (!mModelData.tryAllocBuffer(res.getResParameterListNum() != 0, heap)) @@ -310,7 +312,8 @@ act::InfoData::Locator::Type ModelList::getLocatorTypeFromStr(const sead::SafeSt return act::InfoData::Locator::Type::Invalid; } -// NON_MATCHING: weird unrolling and Vector3f store (str should be a stp) +// weird unrolling and Vector3f store (str should be a stp) +#ifdef NON_MATCHING bool ModelList::getLocatorInfo(act::InfoData::Locator* info, act::InfoData::Locator::Type type) const { agl::utl::ResParameterArchive archive{mRawData}; @@ -335,6 +338,7 @@ bool ModelList::getLocatorInfo(act::InfoData::Locator* info, return false; } +#endif bool ModelList::isParticalEnable(int anm_target_idx) const { return mAnmTargets[anm_target_idx].is_partical_enable.ref(); |
