Update misc files to match sead math changes

This commit is contained in:
ThePixelGamer
2021-10-06 18:02:53 -05:00
parent a82333ef90
commit 20df9e7c7d
11 changed files with 28 additions and 34 deletions
+2 -2
View File
@@ -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;
+1 -1
View File
@@ -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;
}