diff options
| author | Léo Lam <leo@leolam.fr> | 2021-07-26 13:07:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 13:07:34 +0200 |
| commit | d7b2e846b989fae4fce8a05b9c31a0bd74478ae1 (patch) | |
| tree | 95b1b16a3f4cf7d0ab51e90b3d73e53f74ba7f2b /src/KingSystem/Ecosystem/ecoSystem.cpp | |
| parent | 5bd0cde8bb938f5676e0d541c4552acf7317d42c (diff) | |
| parent | 42807160cfb33af9f3cf2fa6b0ba98f232208cdb (diff) | |
Merge pull request #49 from AlexApps99/master
Add #ifdef declarations for NON_MATCHING code
Diffstat (limited to 'src/KingSystem/Ecosystem/ecoSystem.cpp')
| -rw-r--r-- | src/KingSystem/Ecosystem/ecoSystem.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/KingSystem/Ecosystem/ecoSystem.cpp b/src/KingSystem/Ecosystem/ecoSystem.cpp index 42da40ac..6f8252bf 100644 --- a/src/KingSystem/Ecosystem/ecoSystem.cpp +++ b/src/KingSystem/Ecosystem/ecoSystem.cpp @@ -29,7 +29,8 @@ SEAD_SINGLETON_DISPOSER_IMPL(Ecosystem) void Ecosystem::calc() {} -// NON_MATCHING: FP instructions rearranged. +// FP instructions rearranged. +#ifdef NON_MATCHING s32 Ecosystem::getMapArea(const EcoMapInfo& info, f32 posX, f32 posZ) const { posX = sead::clamp(posX, -5000.0F, 4999.0F); posZ = sead::clamp(posZ, -4000.0F, 4000.0F); @@ -62,6 +63,7 @@ s32 Ecosystem::getMapArea(const EcoMapInfo& info, f32 posX, f32 posZ) const { return -1; } } +#endif void Ecosystem::getAreaNameByNum(s32 areaNum, const char** out) const { *out = nullptr; @@ -75,7 +77,8 @@ void Ecosystem::getAreaNameByNum(s32 areaNum, const char** out) const { iter.tryGetStringByKey(out, "Area"); } -// NON_MATCHING: Equivalent, minor conditional differences and register usage +// Equivalent, minor conditional differences and register usage +#ifdef NON_MATCHING void Ecosystem::getStatusEffectInfo(StatusEffect statusEffectIdx, s32 idx, eco::StatusEffectInfo* out) const { al::ByamlIter listIter; @@ -135,6 +138,7 @@ void Ecosystem::getStatusEffectInfo(StatusEffect statusEffectIdx, s32 idx, out->val._f32 = val2; } } +#endif void Ecosystem::getClimateNameByNum(s32 areaNum, const char** out) const { *out = nullptr; |