summaryrefslogtreecommitdiff
path: root/src/KingSystem/Resource/Actor/resResourceModelList.cpp
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2022-02-27 12:48:28 +0100
committerLéo Lam <leo@leolam.fr>2022-02-27 12:50:52 +0100
commitdf36d656650198b3cbf140e2982752a95b3f2c6d (patch)
tree1af53905980b13aa03ab2f78dd548407370eb98c /src/KingSystem/Resource/Actor/resResourceModelList.cpp
parenta5641860025aed373da045ef1ac43a6487529932 (diff)
Revert "Add #ifdef declarations for NON_MATCHING code"
This reverts commit 42807160cfb33af9f3cf2fa6b0ba98f232208cdb. 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.
Diffstat (limited to 'src/KingSystem/Resource/Actor/resResourceModelList.cpp')
-rw-r--r--src/KingSystem/Resource/Actor/resResourceModelList.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/KingSystem/Resource/Actor/resResourceModelList.cpp b/src/KingSystem/Resource/Actor/resResourceModelList.cpp
index c58bc178..603c9cee 100644
--- a/src/KingSystem/Resource/Actor/resResourceModelList.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceModelList.cpp
@@ -36,6 +36,7 @@ ModelList::~ModelList() {
void ModelList::doCreate_(u8* buffer, u32 buffer_size, sead::Heap* heap) {}
+// NON_MATCHING: reorderings
bool ModelList::parse_(u8* data, size_t size, sead::Heap* heap) {
agl::utl::ResParameterArchive archive{data};
const auto root = archive.getRootList();
@@ -306,8 +307,7 @@ act::InfoData::Locator::Type ModelList::getLocatorTypeFromStr(const sead::SafeSt
return act::InfoData::Locator::Type::Invalid;
}
-// weird unrolling and Vector3f store (str should be a stp)
-#ifdef NON_MATCHING
+// NON_MATCHING: weird unrolling and Vector3f store (str should be a stp)
bool ModelList::getLocatorInfo(act::InfoData::Locator* info,
act::InfoData::Locator::Type type) const {
agl::utl::ResParameterArchive archive{mRawData};
@@ -332,7 +332,6 @@ 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();