diff options
| author | ThePixelGamer <thepixelmaster2354@gmail.com> | 2021-10-06 18:02:53 -0500 |
|---|---|---|
| committer | ThePixelGamer <thepixelmaster2354@gmail.com> | 2021-10-10 05:21:18 -0500 |
| commit | 20df9e7c7d9715173b2bdfd5697526b2f49b8dbe (patch) | |
| tree | e0c5d2f9b2419aceb870721f1a22e52ec9614f5c /src/KingSystem/ActorSystem | |
| parent | a82333ef9060f622e52a25ee0d815d33b0e91d91 (diff) | |
Update misc files to match sead math changes
Diffstat (limited to 'src/KingSystem/ActorSystem')
| -rw-r--r-- | src/KingSystem/ActorSystem/actActorUtil.cpp | 4 | ||||
| -rw-r--r-- | src/KingSystem/ActorSystem/actInfoData.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/KingSystem/ActorSystem/actActorUtil.cpp b/src/KingSystem/ActorSystem/actActorUtil.cpp index 443e4046..75de3637 100644 --- a/src/KingSystem/ActorSystem/actActorUtil.cpp +++ b/src/KingSystem/ActorSystem/actActorUtil.cpp @@ -533,8 +533,8 @@ bool isAirOctaWoodPlatformDlc(const sead::SafeString& name) { } void getRevivalGridPosition(const sead::Vector3f& pos, int* col1, int* row1, int* col2, int* row2) { - const int col = sead::clamp((int(pos.x) + 5000) / 1000, 0, 9); - const int row = sead::clamp((int(pos.z) + 4000) / 1000, 0, 7); + const int col = sead::Mathi::clamp((int(pos.x) + 5000) / 1000, 0, 9); + const int row = sead::Mathi::clamp((int(pos.z) + 4000) / 1000, 0, 7); const auto x = (float(col) + 0.5f) * 1000.0f - 5000.0f; const auto z = (float(row) + 0.5f) * 1000.0f - 4000.0f; diff --git a/src/KingSystem/ActorSystem/actInfoData.cpp b/src/KingSystem/ActorSystem/actInfoData.cpp index 94fb092d..6a4b1c21 100644 --- a/src/KingSystem/ActorSystem/actInfoData.cpp +++ b/src/KingSystem/ActorSystem/actInfoData.cpp @@ -587,7 +587,7 @@ bool InfoData::getYLimitAlgorithm(const char** algorithm, const char* actor) con f32 InfoData::getAabbNorm(const char* actor, bool x) const { sead::Vector3f min, max; if (getAAbbMinMax(actor, &min, &max, x)) - return sead::norm2(max - min); + return (max - min).length(); return 0.0; } |
