diff options
| author | Léo Lam <leo@leolam.fr> | 2022-02-27 12:48:28 +0100 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2022-02-27 12:50:52 +0100 |
| commit | df36d656650198b3cbf140e2982752a95b3f2c6d (patch) | |
| tree | 1af53905980b13aa03ab2f78dd548407370eb98c /src/KingSystem/ActorSystem/actActorUtil.cpp | |
| parent | a5641860025aed373da045ef1ac43a6487529932 (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/actActorUtil.cpp')
| -rw-r--r-- | src/KingSystem/ActorSystem/actActorUtil.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/KingSystem/ActorSystem/actActorUtil.cpp b/src/KingSystem/ActorSystem/actActorUtil.cpp index 798506b8..3f5e3a74 100644 --- a/src/KingSystem/ActorSystem/actActorUtil.cpp +++ b/src/KingSystem/ActorSystem/actActorUtil.cpp @@ -115,8 +115,7 @@ bool hasOneTagAtLeast(const ActorConstDataAccess& accessor, const sead::SafeStri return false; } -// this version doesn't have unnecessary register moves. -#ifdef NON_MATCHING +// NON_MATCHING: this version doesn't have unnecessary register moves. bool shouldSkipSpawnWhenRaining(map::Object* obj) { if (obj->getFlags().isOff(map::Object::Flag::CreateNotRain)) return false; @@ -127,7 +126,6 @@ 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; @@ -181,8 +179,7 @@ auto initSpawnConditionGameDataFlags_dummy() { return sIsGetStopTimerLv2Handle; } -// redundant branches in the original code. -#ifdef NON_MATCHING +// NON_MATCHING: redundant branches in the original code. bool hasAnyRevivalTag(const sead::SafeString& actor) { auto* info = InfoData::instance(); al::ByamlIter iter; @@ -203,7 +200,6 @@ bool hasAnyRevivalTag(const sead::SafeString& actor) { } return false; } -#endif bool hasStopTimerMiddleTag(Actor* actor) { return hasTag(actor, tags::StopTimerMiddle); @@ -213,12 +209,10 @@ bool hasStopTimerShortTag(Actor* actor) { return hasTag(actor, tags::StopTimerShort); } -// ??? -#ifdef NON_MATCHING +// 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) { |