summaryrefslogtreecommitdiff
path: root/src/KingSystem/Resource/Actor/resResourceLifeCondition.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/Resource/Actor/resResourceLifeCondition.cpp
parent88bcc9eec1481b47361dc717c83e4953e8929a2b (diff)
Add #ifdef declarations for NON_MATCHING code
Diffstat (limited to 'src/KingSystem/Resource/Actor/resResourceLifeCondition.cpp')
-rw-r--r--src/KingSystem/Resource/Actor/resResourceLifeCondition.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/KingSystem/Resource/Actor/resResourceLifeCondition.cpp b/src/KingSystem/Resource/Actor/resResourceLifeCondition.cpp
index 84edd261..21f4675c 100644
--- a/src/KingSystem/Resource/Actor/resResourceLifeCondition.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceLifeCondition.cpp
@@ -2,7 +2,8 @@
namespace ksys::res {
-// NON_MATCHING: two instructions swapped
+// two instructions swapped
+#ifdef NON_MATCHING
bool LifeCondition::parse_(u8* data, size_t, sead::Heap* heap) {
if (!data)
return true;
@@ -55,6 +56,7 @@ bool LifeCondition::parse_(u8* data, size_t, sead::Heap* heap) {
return true;
}
+#endif
void LifeCondition::parseArray(const agl::utl::ResParameterObj* data, agl::utl::IParameterObj* obj,
sead::Buffer<agl::utl::Parameter<sead::SafeString>>* buffer,