summaryrefslogtreecommitdiff
path: root/src/KingSystem/Resource/Actor/resResourceBoneControl.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/resResourceBoneControl.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/resResourceBoneControl.cpp')
-rw-r--r--src/KingSystem/Resource/Actor/resResourceBoneControl.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/KingSystem/Resource/Actor/resResourceBoneControl.cpp b/src/KingSystem/Resource/Actor/resResourceBoneControl.cpp
index f9d7356b..1c4fe869 100644
--- a/src/KingSystem/Resource/Actor/resResourceBoneControl.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceBoneControl.cpp
@@ -16,8 +16,7 @@ BoneControl::~BoneControl() {
void BoneControl::doCreate_(u8* buffer, u32 buffer_size, sead::Heap* heap) {}
-// mFootIkController.isInvalidFt (???)
-#ifdef NON_MATCHING
+// NON_MATCHING: mFootIkController.isInvalidFt (???)
bool BoneControl::parse_(u8* data, size_t size, sead::Heap* heap) {
if (!data)
return true;
@@ -226,7 +225,6 @@ bool BoneControl::parse_(u8* data, size_t size, sead::Heap* heap) {
applyResParameterArchive(agl::utl::ResParameterArchive{data});
return true;
}
-#endif
const BoneControl::BoneGroup* BoneControl::getBoneGroup(const sead::SafeString& name) const {
const auto idx = mBoneGroups.binarySearch(