summaryrefslogtreecommitdiff
path: root/src/KingSystem/ActorSystem/actASSetting.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/ActorSystem/actASSetting.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/ActorSystem/actASSetting.cpp')
-rw-r--r--src/KingSystem/ActorSystem/actASSetting.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/KingSystem/ActorSystem/actASSetting.cpp b/src/KingSystem/ActorSystem/actASSetting.cpp
index 164d9e67..2b020cfe 100644
--- a/src/KingSystem/ActorSystem/actASSetting.cpp
+++ b/src/KingSystem/ActorSystem/actASSetting.cpp
@@ -15,8 +15,7 @@ void ASSetting::init(const sead::SafeString& config_path, sead::Heap* heap) {
mHandle.load(config_path, &req);
}
-// sead::DirectResource to res::ASSetting cast nullptr check; branching for the return
-#ifdef NON_MATCHING
+// NON_MATCHING: sead::DirectResource to res::ASSetting cast nullptr check; branching for the return
res::ASParamParser* ASSetting::getBoneParams(const sead::SafeString& key) const {
auto* res = sead::DynamicCast<res::ASSetting>(mHandle.getResource());
if (!res)
@@ -28,6 +27,5 @@ res::ASParamParser* ASSetting::getBoneParams(const sead::SafeString& key) const
}
return nullptr;
}
-#endif
} // namespace ksys::act