From df36d656650198b3cbf140e2982752a95b3f2c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 27 Feb 2022 12:48:28 +0100 Subject: 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. --- src/KingSystem/Resource/Actor/resResourceBoneControl.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/KingSystem/Resource/Actor/resResourceBoneControl.cpp') 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( -- cgit v1.2.3