summaryrefslogtreecommitdiff
path: root/src/KingSystem/ActorSystem/actActorParamMgr.cpp
diff options
context:
space:
mode:
authorAlexApps99 <alex.apps99@gmail.com>2021-07-26 21:58:51 +1200
committerAlexApps99 <alex.apps99@gmail.com>2021-07-26 23:05:19 +1200
commit42807160cfb33af9f3cf2fa6b0ba98f232208cdb (patch)
tree95b1b16a3f4cf7d0ab51e90b3d73e53f74ba7f2b /src/KingSystem/ActorSystem/actActorParamMgr.cpp
parent88bcc9eec1481b47361dc717c83e4953e8929a2b (diff)
Add #ifdef declarations for NON_MATCHING code
Diffstat (limited to 'src/KingSystem/ActorSystem/actActorParamMgr.cpp')
-rw-r--r--src/KingSystem/ActorSystem/actActorParamMgr.cpp8
1 files changed, 6 insertions, 2 deletions
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<ParamIO*>(res)->getPath()
+// different address calculation for static_cast<ParamIO*>(res)->getPath()
+#ifdef NON_MATCHING
template <typename T>
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;