diff options
Diffstat (limited to 'src/KingSystem/ActorSystem/actActorUtil.cpp')
| -rw-r--r-- | src/KingSystem/ActorSystem/actActorUtil.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/KingSystem/ActorSystem/actActorUtil.cpp b/src/KingSystem/ActorSystem/actActorUtil.cpp index 24fb1011..443e4046 100644 --- a/src/KingSystem/ActorSystem/actActorUtil.cpp +++ b/src/KingSystem/ActorSystem/actActorUtil.cpp @@ -113,7 +113,8 @@ bool hasOneTagAtLeast(const ActorConstDataAccess& accessor, const sead::SafeStri return false; } -// NON_MATCHING: this version doesn't have unnecessary register moves. +// this version doesn't have unnecessary register moves. +#ifdef NON_MATCHING bool shouldSkipSpawnWhenRaining(map::Object* obj) { if (obj->getFlags().isOff(map::Object::Flag::CreateNotRain)) return false; @@ -124,6 +125,7 @@ bool shouldSkipSpawnWhenRaining(map::Object* obj) { const auto pos = obj->getTranslate(); return !world::Manager::instance()->isRaining(pos); } +#endif bool shouldSkipSpawnIfGodForestOff(map::Object* obj) { bool value = false; @@ -177,7 +179,8 @@ auto initSpawnConditionGameDataFlags_dummy() { return sIsGetStopTimerLv2Handle; } -// NON_MATCHING: redundant branches in the original code. +// redundant branches in the original code. +#ifdef NON_MATCHING bool hasAnyRevivalTag(const sead::SafeString& actor) { auto* info = InfoData::instance(); al::ByamlIter iter; @@ -198,6 +201,7 @@ bool hasAnyRevivalTag(const sead::SafeString& actor) { } return false; } +#endif bool hasStopTimerMiddleTag(Actor* actor) { return hasTag(actor, tags::StopTimerMiddle); @@ -207,10 +211,12 @@ bool hasStopTimerShortTag(Actor* actor) { return hasTag(actor, tags::StopTimerShort); } -// NON_MATCHING: ??? +// ??? +#ifdef NON_MATCHING const char* arrowTypeToString(ArrowType idx) { return sArrowTypes[u32(idx)]; } +#endif ArrowType arrowTypeFromString(const sead::SafeString& name) { for (s32 i = 0; i < sArrowTypes.size(); ++i) { |