From 42807160cfb33af9f3cf2fa6b0ba98f232208cdb Mon Sep 17 00:00:00 2001 From: AlexApps99 Date: Mon, 26 Jul 2021 21:58:51 +1200 Subject: Add #ifdef declarations for NON_MATCHING code --- src/KingSystem/ActorSystem/actActorParamMgr.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/KingSystem/ActorSystem/actActorParamMgr.cpp') diff --git a/src/KingSystem/ActorSystem/actActorParamMgr.cpp b/src/KingSystem/ActorSystem/actActorParamMgr.cpp index e2ace0d4..3e8d4317 100644 --- a/src/KingSystem/ActorSystem/actActorParamMgr.cpp +++ b/src/KingSystem/ActorSystem/actActorParamMgr.cpp @@ -175,7 +175,8 @@ ActorParam* ActorParamMgr::allocParam(const char* actor_name, bool* allocated_ne return param; } -// NON_MATCHING: addressing mode +// addressing mode +#ifdef NON_MATCHING ActorParam* ActorParamMgr::getParam(const char* actor_name, ActorParam** out_free_param) const { auto lock = sead::makeScopedLock(mCS); for (s32 i = 0; i < NumParams; ++i) { @@ -189,6 +190,7 @@ 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) { @@ -291,7 +293,8 @@ bool ActorParamMgr::loadFileAsync(ActorParam* param, ActorParam::ResourceType ty return true; } -// NON_MATCHING: different address calculation for static_cast(res)->getPath() +// different address calculation for static_cast(res)->getPath() +#ifdef NON_MATCHING template T* ActorParamMgr::handleAsyncFileLoad(ActorParam* param, s32* idx, ActorParam::ResourceType type, void*) { @@ -329,6 +332,7 @@ 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