summaryrefslogtreecommitdiff
path: root/src/KingSystem/Resource/resUnit.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/resUnit.cpp
parent88bcc9eec1481b47361dc717c83e4953e8929a2b (diff)
Add #ifdef declarations for NON_MATCHING code
Diffstat (limited to 'src/KingSystem/Resource/resUnit.cpp')
-rw-r--r--src/KingSystem/Resource/resUnit.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/KingSystem/Resource/resUnit.cpp b/src/KingSystem/Resource/resUnit.cpp
index ee252d84..ff458e36 100644
--- a/src/KingSystem/Resource/resUnit.cpp
+++ b/src/KingSystem/Resource/resUnit.cpp
@@ -146,12 +146,14 @@ static const ResourceUnit::Status sUnitStatusTransitionTable[] = {
ResourceUnit::Status::_14, ResourceUnit::Status::_14,
};
-// NON_MATCHING: ldr + sxtw -> ldrsw
+// ldr + sxtw -> ldrsw
+#ifdef NON_MATCHING
void ResourceUnit::updateStatus() {
const s32 idx = mStatus;
if (Status::_2 <= idx && idx <= Status::_6)
mStatus = sUnitStatusTransitionTable[idx];
}
+#endif
bool ResourceUnit::isTask1NotQueued() const {
return mTask1.getStatus() == util::Task::Status::RemovedFromQueue;
@@ -184,7 +186,8 @@ bool ResourceUnit::isStatus9_12_15() const {
return mStatus == Status::_9 || mStatus == Status::_12 || mStatus == Status::_15;
}
-// NON_MATCHING: branching for the second if
+// branching for the second if
+#ifdef NON_MATCHING
bool ResourceUnit::isParseOk() const {
auto* ksys_res = sead::DynamicCast<res::Resource>(mResource);
@@ -201,6 +204,7 @@ bool ResourceUnit::isParseOk() const {
return false;
}
+#endif
bool ResourceUnit::isStatusFlag8000Set() const {
return mStatusFlags.isOn(StatusFlag::NeedToIncrementRefCount);