Merge pull request #313 from robojumper/vec-mtx-cleanup

Cleanup

3 files changed, 11 insertions, 11 deletions

diff --git a/src/d/a/d_a_base.cpp b/src/d/a/d_a_base.cpp
index f5588812..8619d9b2 100644
--- a/src/d/a/d_a_base.cpp
+++ b/src/d/a/d_a_base.cpp
@@ -391,7 +391,7 @@ bool dAcBase_c::getDistanceToActor(dAcBase_c *actor, f32 distThresh, f32 *outDis
     bool isWithinThreshhold = false;
 
     if (actor != nullptr) {
-        distSquared = PSVECSquareDistance(mPosition, actor->mPosition);
+        distSquared = VECSquareDistance(mPosition, actor->mPosition);
 
         if (distSquared <= distThresh * distThresh) {
             isWithinThreshhold = true;
@@ -414,7 +414,7 @@ bool dAcBase_c::getDistanceAndAngleToActor(
     mAng angleToActorY(0), angleToActorX(0);
 
     if (actor != nullptr) {
-        distSquared = PSVECSquareDistance(mPosition, actor->mPosition);
+        distSquared = VECSquareDistance(mPosition, actor->mPosition);
         angleToActorY.set(cLib::targetAngleY(mPosition, actor->mPosition));
         angleToActorX.set(cLib::targetAngleX(mPosition, actor->mPosition));
 
@@ -453,11 +453,11 @@ bool dAcBase_c::getDistanceAndAngleToPlayer(
 }
 
 f32 dAcBase_c::getDistToPlayer() {
-    return EGG::Math<f32>::sqrt(PSVECSquareDistance(mPosition, dAcPy_c::LINK->mPosition));
+    return EGG::Math<f32>::sqrt(VECSquareDistance(mPosition, dAcPy_c::LINK->mPosition));
 }
 
 f32 dAcBase_c::getSquareDistToPlayer() {
-    return PSVECSquareDistance(mPosition, dAcPy_c::LINK->mPosition);
+    return VECSquareDistance(mPosition, dAcPy_c::LINK->mPosition);
 }
 
 // Some weirdness with the float registers being used
diff --git a/src/d/a/obj/d_a_obj_switch.cpp b/src/d/a/obj/d_a_obj_switch.cpp
index 9f75909b..6ffba7c8 100644
--- a/src/d/a/obj/d_a_obj_switch.cpp
+++ b/src/d/a/obj/d_a_obj_switch.cpp
@@ -26,8 +26,8 @@ void dAcOswMdlCallback_c::timingB(u32 nodeId, nw4r::g3d::WorldMtxManip *manip, n
         mMtx_c mtx1;
         mMtx_c mtx2;
         manip->GetMtx(mtx1);
-        PSMTXTrans(mtx2, mElevation, 0.0f, 0.0f);
-        PSMTXConcat(mtx1, mtx2, mtx1);
+        MTXTrans(mtx2, mElevation, 0.0f, 0.0f);
+        MTXConcat(mtx1, mtx2, mtx1);
         manip->SetMtx(mtx1);
     }
 }
@@ -189,8 +189,8 @@ int dAcOsw_c::actorExecute() {
     updateMatrix();
     field_0x5B8.copyFrom(mWorldMtx);
     mMtx_c tmp;
-    PSMTXTrans(tmp, 0.0f, mButtonCtrl.mElevation, 0.0f);
-    PSMTXConcat(field_0x5B8, tmp, field_0x5B8);
+    MTXTrans(tmp, 0.0f, mButtonCtrl.mElevation, 0.0f);
+    MTXConcat(field_0x5B8, tmp, field_0x5B8);
     mModel.setScale(mScale);
     mModel.setLocalMtx(mWorldMtx);
     mModel.calc(false);
diff --git a/src/d/a/obj/d_a_obj_tbox.cpp b/src/d/a/obj/d_a_obj_tbox.cpp
index 07264a7d..931dc459 100644
--- a/src/d/a/obj/d_a_obj_tbox.cpp
+++ b/src/d/a/obj/d_a_obj_tbox.cpp
@@ -2418,7 +2418,7 @@ void dAcTbox_c::fn_8026DAC0(mAng &ang) {
 }
 
 void dAcTbox_c::fn_8026DAD0(const mVec3_c *a, mVec3_c *b) const {
-    PSMTXMultVec(mWorldMtx, *a, *b);
+    MTXMultVec(mWorldMtx, *a, *b);
 }
 
 void dAcTbox_c::getCylParams(mVec3_c *c, f32 *r, f32 *h) const {
@@ -2529,7 +2529,7 @@ void dAcTbox_c::getCylParams(mVec3_c *c, f32 *r, f32 *h) const {
             break;
     }
     if (c != nullptr) {
-        PSMTXMultVec(mWorldMtx, *c, *c);
+        MTXMultVec(mWorldMtx, *c, *c);
     }
 }
 
@@ -2631,7 +2631,7 @@ bool dAcTbox_c::checkForLinkBonk() {
     }
 
     mVec3_c linkPos;
-    PSMTXMultVec(mCcD3.mInvMtx, link->mPosition, linkPos);
+    MTXMultVec(mCcD3.mInvMtx, link->mPosition, linkPos);
     mVec3_c ccLo, ccHi;
     getCCBounds(&ccLo, &ccHi);
     // Math performed in local coordinate space