position -> mPosition

5 files changed, 27 insertions, 27 deletions

diff --git a/src/d/a/obj/d_a_obj_boomerang.cpp b/src/d/a/obj/d_a_obj_boomerang.cpp
index 85d61f92..7176add3 100644
--- a/src/d/a/obj/d_a_obj_boomerang.cpp
+++ b/src/d/a/obj/d_a_obj_boomerang.cpp
@@ -82,7 +82,7 @@ void dAcBoomerang_c::atHitCallback(cCcD_Obj *i_objInfA, dAcObjBase_c *i_actorB,
     }
 
     if (!i_objInfB->ChkTgBonk()) {
-        field_0x8D8 = position - i_actorB->position;
+        field_0x8D8 = mPosition - i_actorB->mPosition;
         field_0x8D8.y = 0.f;
 
         if (cM::isZero(field_0x8D8.normalize())) {
@@ -275,7 +275,7 @@ void dAcBoomerang_c::placeOnArm() {
     mWorldMtx += m;
     mWorldMtx.ZYXrotM(mAng::fromDeg(90.f), 0, mAng::fromDeg(90.f));
     mMdl.setLocalMtx(mWorldMtx);
-    mWorldMtx.getTranslation(position);
+    mWorldMtx.getTranslation(mPosition);
     mWorldMtx.getTranslation(mOldPosition);
 }
 
@@ -427,7 +427,7 @@ void dAcBoomerang_c::initializeState_Move() {
     mRotation.z.set(0);
     field_0x8B2 = 0;
 
-    mOldPosition = position;
+    mOldPosition = mPosition;
     mOldPosition.y += 60.f;
 
     field_0x8BC = dPad::ex_c::m_current_ex->mMPLS.getVerticalAngle();
@@ -571,7 +571,7 @@ int dAcBoomerang_c::draw() {
     if (!mStateMgr.isState(StateID_Wait)) {
         mProc.entry();
         static mQuat_c shadow(mVec3_c::Zero, 50.f);
-        drawShadow(mShadow, nullptr, mWorldMtx, &shadow, -1, -1, -1, -1, -1, position.y - mAcch.GetGroundH());
+        drawShadow(mShadow, nullptr, mWorldMtx, &shadow, -1, -1, -1, -1, -1, mPosition.y - mAcch.GetGroundH());
     }
     return SUCCEEDED;
 }
diff --git a/src/d/a/obj/d_a_obj_fairy.cpp b/src/d/a/obj/d_a_obj_fairy.cpp
index 3216e0d2..ee562d97 100644
--- a/src/d/a/obj/d_a_obj_fairy.cpp
+++ b/src/d/a/obj/d_a_obj_fairy.cpp
@@ -53,7 +53,7 @@ int dAcObjFairy_c::draw() {
         if (!isCuring()) {
             static mQuat_c rot(0.0f, 0.0f, 0.0f, 10.0f);
             f32 f = field_0x4B0;
-            drawShadow(mShadow, nullptr, mWorldMtx, &rot, -1, -1, -1, -1, -1, position.y - f);
+            drawShadow(mShadow, nullptr, mWorldMtx, &rot, -1, -1, -1, -1, -1, mPosition.y - f);
         }
     }
 
@@ -102,7 +102,7 @@ void dAcObjFairy_c::finalizeState_CatchDemo() {
 bool dAcObjFairy_c::shouldAvoidLink() const {
     // TODO shuffles
     if (dAcPy_c::LINK->isUsingBugnet()) {
-        mVec3_c dist = dAcPy_c::LINK->getBugNetPos() - position;
+        mVec3_c dist = dAcPy_c::LINK->getBugNetPos() - mPosition;
         bool isClose = false;
         if (dist.mag() < 100.0f && velocity.dot(dist) > 0.0f) {
             isClose = true;
diff --git a/src/d/a/obj/d_a_obj_switch.cpp b/src/d/a/obj/d_a_obj_switch.cpp
index 1b175935..d432bf9b 100644
--- a/src/d/a/obj/d_a_obj_switch.cpp
+++ b/src/d/a/obj/d_a_obj_switch.cpp
@@ -114,7 +114,7 @@ int dAcOsw_c::actorCreate() {
 
 int dAcOsw_c::actorPostCreate() {
     if (mCanBeSeen) {
-        field_0x5A0.check(roomid, position, 0, 30.0f, 0.1f);
+        field_0x5A0.check(roomid, mPosition, 0, 30.0f, 0.1f);
         if (field_0x5A0.field_0x00 <= 0.0f) {
             mHidden = true;
             mScale.set(0.0f, 0.0f, 0.0f);
@@ -127,8 +127,8 @@ int dAcOsw_c::actorPostCreate() {
     dAcBase_c *parent = nullptr;
     do {
         parent = static_cast<dAcBase_c *>(fManager_c::searchBaseByProfName(fProfile::OBJ_VSD, parent));
-        if (parent != nullptr && nw4r::math::FAbs(parent->position.y - position.y) < 30.0f) {
-            if (getSquareDistanceTo(parent->position) < 900.0f) {
+        if (parent != nullptr && nw4r::math::FAbs(parent->mPosition.y - mPosition.y) < 30.0f) {
+            if (getSquareDistanceTo(parent->mPosition) < 900.0f) {
                 mObjRef.link(static_cast<dAcOScatterSand_tmp *>(parent));
                 break;
             }
@@ -153,12 +153,12 @@ int dAcOsw_c::doDelete() {
 int dAcOsw_c::actorExecute() {
     mStateMgr.executeState();
     if (mCanBeSeen) {
-        field_0x5A0.check(roomid, position, 0, 30.0f, 0.1f);
+        field_0x5A0.check(roomid, mPosition, 0, 30.0f, 0.1f);
         if (field_0x5A0.field_0x00 <= 0.0f) {
             if (mScale.x >= 1.0f) {
                 if (!mHidden) {
                     dJEffManager_c::spawnEffect(
-                        PARTICLE_RESOURCE_ID_MAPPING_754_, position, &mRotation, nullptr, nullptr, nullptr, 0, 0
+                        PARTICLE_RESOURCE_ID_MAPPING_754_, mPosition, &mRotation, nullptr, nullptr, nullptr, 0, 0
                     );
                     startSound(SE_TIMESLIP_TIMESLIP_REV);
                     mHidden = true;
@@ -173,7 +173,7 @@ int dAcOsw_c::actorExecute() {
             if (mScale.x <= 0.0f) {
                 if (!mShown) {
                     dJEffManager_c::spawnEffect(
-                        PARTICLE_RESOURCE_ID_MAPPING_754_, position, &mRotation, nullptr, nullptr, nullptr, 0, 0
+                        PARTICLE_RESOURCE_ID_MAPPING_754_, mPosition, &mRotation, nullptr, nullptr, nullptr, 0, 0
                     );
                     startSound(SE_TIMESLIP_TIMESLIP);
                     mShown = true;
diff --git a/src/d/a/obj/d_a_obj_tbox.cpp b/src/d/a/obj/d_a_obj_tbox.cpp
index c22b72fd..851f03b1 100644
--- a/src/d/a/obj/d_a_obj_tbox.cpp
+++ b/src/d/a/obj/d_a_obj_tbox.cpp
@@ -1152,7 +1152,7 @@ int dAcTbox_c::create() {
     mLightInfo.mClr.b = 0;
 
     mLightInfo.SetScale(0.f);
-    mLightInfo.SetPosition(position);
+    mLightInfo.SetPosition(mPosition);
     mLightInfo.mPos.y += 100.0f;
 
     return SUCCEEDED;
@@ -1218,7 +1218,7 @@ int dAcTbox_c::actorExecute() {
         v1 *= field_0x11E8;
         v2 *= field_0x11E8;
         mCcD3.Set(v1, v2);
-        mCcD3.Set(position, mRotation.y);
+        mCcD3.Set(mPosition, mRotation.y);
         mVec3_c cylC;
         f32 width, height;
         getCylParams(&cylC, &width, &height);
@@ -1280,7 +1280,7 @@ int dAcTbox_c::actorExecute() {
         v1 *= field_0x11E8;
         v2 *= field_0x11E8;
         mCcD1.Set(v1, v2);
-        mCcD1.Set(position, mRotation.y);
+        mCcD1.Set(mPosition, mRotation.y);
         if (field_0x120C == 1) {
             mCcD2.OnTgSet();
             switch ((u32)mVariant) {
@@ -1366,7 +1366,7 @@ int dAcTbox_c::actorExecuteInEvent() {
             fn_8026DAC0(a1);
             dAcPy_c *link = dAcPy_c::LINK;
             if (field_0x120B < 3) {
-                mVec3_c pos = link->position;
+                mVec3_c pos = link->mPosition;
                 f32 f9 = cLib::addCalcPosXZ(&pos, v1, 0.25, 200.0f, 0.1f);
                 s16 rot2 = link->mRotation.y;
                 s16 d = sLib::addCalcAngle(&rot2, a1, 2, 0x3FFF, 1);
@@ -1404,7 +1404,7 @@ int dAcTbox_c::actorExecuteInEvent() {
         v1 *= field_0x11E8;
         v2 *= field_0x11E8;
         mCcD3.Set(v1, v2);
-        mCcD3.Set(position, mRotation.y);
+        mCcD3.Set(mPosition, mRotation.y);
         mVec3_c cylC;
         f32 width, height;
         getCylParams(&cylC, &width, &height);
@@ -1466,7 +1466,7 @@ int dAcTbox_c::actorExecuteInEvent() {
         v1 *= field_0x11E8;
         v2 *= field_0x11E8;
         mCcD1.Set(v1, v2);
-        mCcD1.Set(position, mRotation.y);
+        mCcD1.Set(mPosition, mRotation.y);
         if (field_0x120C == 1) {
             mCcD2.OnTgSet();
             switch ((u32)mVariant) {
@@ -1599,9 +1599,9 @@ int dAcTbox_c::fn_8026B370() const {
 
 void dAcTbox_c::fn_8026B380(mVec3_c &out) const {
     if (mVariant == BOSS) {
-        out.x = position.x;
-        out.y = position.y;
-        out.z = position.z;
+        out.x = mPosition.x;
+        out.y = mPosition.y;
+        out.z = mPosition.z;
     } else {
         fn_8026DAD0(&sVec1, &out);
     }
@@ -2369,14 +2369,14 @@ void dAcTbox_c::unregisterDowsing() {
 
 void dAcTbox_c::spawnAppearEffect() {
     dJEffManager_c::spawnEffect(
-        PARTICLE_RESOURCE_ID_MAPPING_208_, position, &mRotation, nullptr, nullptr, nullptr, 0, 0
+        PARTICLE_RESOURCE_ID_MAPPING_208_, mPosition, &mRotation, nullptr, nullptr, nullptr, 0, 0
     );
 }
 
 bool dAcTbox_c::checkIsClear() const {
     f32 fs[] = {
-        position.y,
-        position.y,
+        mPosition.y,
+        mPosition.y,
     };
     fs[0] += 20.0f;
     fs[1] += 60.0f;
@@ -2631,7 +2631,7 @@ bool dAcTbox_c::checkForLinkBonk() {
     }
 
     mVec3_c linkPos;
-    PSMTXMultVec(mCcD3.mInvMtx, link->position, linkPos);
+    PSMTXMultVec(mCcD3.mInvMtx, link->mPosition, linkPos);
     mVec3_c ccLo, ccHi;
     getCCBounds(&ccLo, &ccHi);
     // Math performed in local coordinate space
@@ -2669,7 +2669,7 @@ bool dAcTbox_c::checkForLinkBonk() {
 
 void dAcTbox_c::fn_8026E630() {
     mVec3_c offset = mVec3_c::Ey * 10.0f;
-    mVec3_c checkPos = position + offset;
+    mVec3_c checkPos = mPosition + offset;
     // TODO reference vs pointer
     if (dBgS_ObjGndChk::CheckPos(checkPos) && &dBgS_ObjGndChk::GetInstance()) {
         cBgS_PolyInfo p = dBgS_ObjGndChk::GetInstance();
diff --git a/src/d/a/obj/d_a_obj_water_spout.cpp b/src/d/a/obj/d_a_obj_water_spout.cpp
index 2b995595..5046a5ba 100644
--- a/src/d/a/obj/d_a_obj_water_spout.cpp
+++ b/src/d/a/obj/d_a_obj_water_spout.cpp
@@ -64,7 +64,7 @@ void dAcOwaterSpout_c::initializeState_Wait() {
     if (mParams == 1) {
         return;
     }
-    dJEffManager_c::spawnEffect(PARTICLE_RESOURCE_ID_MAPPING_213_, position, nullptr, &mScale, nullptr, nullptr, 0, 0);
+    dJEffManager_c::spawnEffect(PARTICLE_RESOURCE_ID_MAPPING_213_, mPosition, nullptr, &mScale, nullptr, nullptr, 0, 0);
 }
 void dAcOwaterSpout_c::executeState_Wait() {
     if (mMdl.getAnm().isStop()) {