diff options
| author | AlexApps99 <alex.apps99@gmail.com> | 2021-07-26 21:58:51 +1200 |
|---|---|---|
| committer | AlexApps99 <alex.apps99@gmail.com> | 2021-07-26 23:05:19 +1200 |
| commit | 42807160cfb33af9f3cf2fa6b0ba98f232208cdb (patch) | |
| tree | 95b1b16a3f4cf7d0ab51e90b3d73e53f74ba7f2b /src/Game/Actor | |
| parent | 88bcc9eec1481b47361dc717c83e4953e8929a2b (diff) | |
Add #ifdef declarations for NON_MATCHING code
Diffstat (limited to 'src/Game/Actor')
| -rw-r--r-- | src/Game/Actor/actWeapon.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/Game/Actor/actWeapon.cpp b/src/Game/Actor/actWeapon.cpp index 7ea6c2dc..7cee1bbe 100644 --- a/src/Game/Actor/actWeapon.cpp +++ b/src/Game/Actor/actWeapon.cpp @@ -309,7 +309,8 @@ bool WeaponModifierInfo::pickRandomYellowModifierAmiibo(const sead::SafeString& return pickRandomModifierAmiibo(ranges); } -// NON_MATCHING: isConfigValid() somehow does not match when inlined (but matches the Wii U version) +// isConfigValid() somehow does not match when inlined (but matches the Wii U version) +#ifdef NON_MATCHING bool WeaponModifierInfo::pickRandomBlueModifierTbox(const sead::SafeString& actor) { auto* info = ksys::act::InfoData::instance(); if (!info) @@ -328,6 +329,7 @@ bool WeaponModifierInfo::pickRandomBlueModifierTbox(const sead::SafeString& acto return pickRandomModifier(ranges); } +#endif bool WeaponModifierInfo::pickRandomModifier(const WeaponModifierRanges& ranges) { const auto modifier = ranges.getRandomModifier(); @@ -408,7 +410,8 @@ bool WeaponModifierRanges::loadTierBlue(const ksys::res::GParamList& gparamlist) return true; } -// NON_MATCHING: isConfigValid() somehow does not match when inlined (but matches the Wii U version) +// isConfigValid() somehow does not match when inlined (but matches the Wii U version) +#ifdef NON_MATCHING bool WeaponModifierInfo::pickRandomBlueModifierActor(const ksys::act::ActorConstDataAccess& acc) { WeaponModifierRanges ranges; const auto& gparamlist = *acc.getGParamList(); @@ -419,8 +422,10 @@ bool WeaponModifierInfo::pickRandomBlueModifierActor(const ksys::act::ActorConst } return false; } +#endif -// NON_MATCHING: isConfigValid() somehow does not match when inlined (but matches the Wii U version) +// isConfigValid() somehow does not match when inlined (but matches the Wii U version) +#ifdef NON_MATCHING bool WeaponModifierInfo::pickRandomYellowModifierTbox(const sead::SafeString& actor) { auto* info = ksys::act::InfoData::instance(); if (!info) @@ -439,6 +444,7 @@ bool WeaponModifierInfo::pickRandomYellowModifierTbox(const sead::SafeString& ac return pickRandomModifier(ranges); } +#endif bool WeaponModifierRanges::loadTierYellow(const ksys::res::GParamList& gparamlist) { const auto* param = gparamlist.getWeaponCommon(); @@ -459,7 +465,8 @@ bool WeaponModifierRanges::loadTierYellow(const ksys::res::GParamList& gparamlis return true; } -// NON_MATCHING: isConfigValid() somehow does not match when inlined (but matches the Wii U version) +// isConfigValid() somehow does not match when inlined (but matches the Wii U version) +#ifdef NON_MATCHING bool WeaponModifierInfo::pickRandomYellowModifierActor(const ksys::act::ActorConstDataAccess& acc) { WeaponModifierRanges ranges; const auto& gparamlist = *acc.getGParamList(); @@ -470,5 +477,6 @@ bool WeaponModifierInfo::pickRandomYellowModifierActor(const ksys::act::ActorCon } return false; } +#endif } // namespace uking::act |