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/ActorSystem/actActorParamMgr.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/KingSystem/ActorSystem/actActorParamMgr.cpp') diff --git a/src/KingSystem/ActorSystem/actActorParamMgr.cpp b/src/KingSystem/ActorSystem/actActorParamMgr.cpp index 3e8d4317..e2ace0d4 100644 --- a/src/KingSystem/ActorSystem/actActorParamMgr.cpp +++ b/src/KingSystem/ActorSystem/actActorParamMgr.cpp @@ -175,8 +175,7 @@ ActorParam* ActorParamMgr::allocParam(const char* actor_name, bool* allocated_ne return param; } -// addressing mode -#ifdef NON_MATCHING +// NON_MATCHING: addressing mode ActorParam* ActorParamMgr::getParam(const char* actor_name, ActorParam** out_free_param) const { auto lock = sead::makeScopedLock(mCS); for (s32 i = 0; i < NumParams; ++i) { @@ -190,7 +189,6 @@ ActorParam* ActorParamMgr::getParam(const char* actor_name, ActorParam** out_fre } return nullptr; } -#endif ActorParam* ActorParamMgr::loadParam(const char* actor_name, res::Handle* pack_handle, void* x, u32 load_req_c) { @@ -293,8 +291,7 @@ bool ActorParamMgr::loadFileAsync(ActorParam* param, ActorParam::ResourceType ty return true; } -// different address calculation for static_cast(res)->getPath() -#ifdef NON_MATCHING +// NON_MATCHING: different address calculation for static_cast(res)->getPath() template T* ActorParamMgr::handleAsyncFileLoad(ActorParam* param, s32* idx, ActorParam::ResourceType type, void*) { @@ -332,7 +329,6 @@ T* ActorParamMgr::handleAsyncFileLoad(ActorParam* param, s32* idx, ActorParam::R return res; } -#endif bool ActorParamMgr::finishLoadingActorLink(ActorParam* param, void* x) { s32 idx = 0; -- cgit v1.2.3