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/Game/Actor/actWeapon.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/Game/Actor/actWeapon.cpp')
| -rw-r--r-- | src/Game/Actor/actWeapon.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/Game/Actor/actWeapon.cpp b/src/Game/Actor/actWeapon.cpp index 7cee1bbe..7ea6c2dc 100644 --- a/src/Game/Actor/actWeapon.cpp +++ b/src/Game/Actor/actWeapon.cpp @@ -309,8 +309,7 @@ bool WeaponModifierInfo::pickRandomYellowModifierAmiibo(const sead::SafeString& return pickRandomModifierAmiibo(ranges); } -// isConfigValid() somehow does not match when inlined (but matches the Wii U version) -#ifdef NON_MATCHING +// NON_MATCHING: isConfigValid() somehow does not match when inlined (but matches the Wii U version) bool WeaponModifierInfo::pickRandomBlueModifierTbox(const sead::SafeString& actor) { auto* info = ksys::act::InfoData::instance(); if (!info) @@ -329,7 +328,6 @@ bool WeaponModifierInfo::pickRandomBlueModifierTbox(const sead::SafeString& acto return pickRandomModifier(ranges); } -#endif bool WeaponModifierInfo::pickRandomModifier(const WeaponModifierRanges& ranges) { const auto modifier = ranges.getRandomModifier(); @@ -410,8 +408,7 @@ bool WeaponModifierRanges::loadTierBlue(const ksys::res::GParamList& gparamlist) return true; } -// isConfigValid() somehow does not match when inlined (but matches the Wii U version) -#ifdef NON_MATCHING +// NON_MATCHING: isConfigValid() somehow does not match when inlined (but matches the Wii U version) bool WeaponModifierInfo::pickRandomBlueModifierActor(const ksys::act::ActorConstDataAccess& acc) { WeaponModifierRanges ranges; const auto& gparamlist = *acc.getGParamList(); @@ -422,10 +419,8 @@ bool WeaponModifierInfo::pickRandomBlueModifierActor(const ksys::act::ActorConst } return false; } -#endif -// isConfigValid() somehow does not match when inlined (but matches the Wii U version) -#ifdef NON_MATCHING +// NON_MATCHING: isConfigValid() somehow does not match when inlined (but matches the Wii U version) bool WeaponModifierInfo::pickRandomYellowModifierTbox(const sead::SafeString& actor) { auto* info = ksys::act::InfoData::instance(); if (!info) @@ -444,7 +439,6 @@ bool WeaponModifierInfo::pickRandomYellowModifierTbox(const sead::SafeString& ac return pickRandomModifier(ranges); } -#endif bool WeaponModifierRanges::loadTierYellow(const ksys::res::GParamList& gparamlist) { const auto* param = gparamlist.getWeaponCommon(); @@ -465,8 +459,7 @@ bool WeaponModifierRanges::loadTierYellow(const ksys::res::GParamList& gparamlis return true; } -// isConfigValid() somehow does not match when inlined (but matches the Wii U version) -#ifdef NON_MATCHING +// NON_MATCHING: isConfigValid() somehow does not match when inlined (but matches the Wii U version) bool WeaponModifierInfo::pickRandomYellowModifierActor(const ksys::act::ActorConstDataAccess& acc) { WeaponModifierRanges ranges; const auto& gparamlist = *acc.getGParamList(); @@ -477,6 +470,5 @@ bool WeaponModifierInfo::pickRandomYellowModifierActor(const ksys::act::ActorCon } return false; } -#endif } // namespace uking::act |