summaryrefslogtreecommitdiff
path: root/src/KingSystem/World/worldManager.cpp
diff options
context:
space:
mode:
authorThePixelGamer <thepixelmaster2354@gmail.com>2021-10-06 18:02:53 -0500
committerThePixelGamer <thepixelmaster2354@gmail.com>2021-10-10 05:21:18 -0500
commit20df9e7c7d9715173b2bdfd5697526b2f49b8dbe (patch)
treee0c5d2f9b2419aceb870721f1a22e52ec9614f5c /src/KingSystem/World/worldManager.cpp
parenta82333ef9060f622e52a25ee0d815d33b0e91d91 (diff)
Update misc files to match sead math changes
Diffstat (limited to 'src/KingSystem/World/worldManager.cpp')
-rw-r--r--src/KingSystem/World/worldManager.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/KingSystem/World/worldManager.cpp b/src/KingSystem/World/worldManager.cpp
index 0dc18cef..b95b62e7 100644
--- a/src/KingSystem/World/worldManager.cpp
+++ b/src/KingSystem/World/worldManager.cpp
@@ -796,11 +796,11 @@ bool Manager::isGerudoDesertClimate() const {
}
bool Manager::hasCameraOrPlayerMoved(float distance_threshold) const {
- const auto camera_dist = sead::norm2(mCameraPos - mPrevCameraPos);
- const auto player_dist = sead::norm2(mPlayerPos - mPrevPlayerPos);
+ const auto camera_dist = (mCameraPos - mPrevCameraPos).length();
+ const auto player_dist = (mPlayerPos - mPrevPlayerPos).length();
const bool moved = player_dist >= distance_threshold || camera_dist >= distance_threshold;
- if (sead::norm2(mPlayerPos - mPrevPlayerPos) <= 100.0 &&
+ if ((mPlayerPos - mPrevPlayerPos).length() <= 100.0 &&
evt::Manager::instance()->hasActiveEvent()) {
return false;
}
@@ -830,7 +830,7 @@ float Manager::getDungeonLightLongitude() const {
void Manager::setCameraDistForRemainsElectric(sead::Vector3f pos) {
_7ac = 10;
- _770 = sead::norm2(mCameraPos - pos);
+ _770 = (mCameraPos - pos).length();
}
void Manager::setFocusDist(float dist) {
@@ -888,7 +888,7 @@ void Manager::setIgnitedLevel(int level, float radius, sead::Vector3f center) {
const sead::Vector3f unk_center{-2004, mPlayerPos.y, 1710};
mIgnitedLevel = level;
- if (sead::norm2(mPlayerPos - unk_center) < 20.0) {
+ if ((mPlayerPos - unk_center).length() < 20.0) {
mIgnitedCenter = unk_center;
mIgnitedRadius = 7.0;
}