Cleanup

8 files changed, 36 insertions, 36 deletions

diff --git a/src/JSystem/JAudio/JASTrack.cpp b/src/JSystem/JAudio/JASTrack.cpp
index 15822a06..a8d93d91 100644
--- a/src/JSystem/JAudio/JASTrack.cpp
+++ b/src/JSystem/JAudio/JASTrack.cpp
@@ -1328,10 +1328,7 @@ void JASystem::TTrack::writeSelfPort(int param_1, u16 param_2) {
 int JASystem::TTrack::writePortAppDirect(u32 port, u16 value) {
     mTrackPort.writeImport(port, value);
     if (port == 0 || port == 1) {
-        TIntrMgr& intrMgr = mIntrMgr;
-
-        u32 intrParam = port == 0 ? REQUEST_UNK_3 : REQUEST_UNK_4;
-        intrMgr.request(intrParam);
+        mIntrMgr.request(port == 0 ? REQUEST_UNK_3 : REQUEST_UNK_4);
     }
     return 1;
 }
diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp
index 4b53c6a1..aec2ce14 100644
--- a/src/d/actor/d_a_fganon.cpp
+++ b/src/d/actor/d_a_fganon.cpp
@@ -794,8 +794,7 @@ void down(fganon_class* i_this) {
             break;
         }
         case 3: {
-            int frame = i_this->mpMorf->getFrame();
-            if (frame == 2) {
+            if ((int)i_this->mpMorf->getFrame() == 2) {
                 fopAcM_monsSeStart(a_this, JA_SE_CV_PG_TIRED, 0);
             }
             break;
diff --git a/src/d/actor/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp
index 11b2f9ad..5078e0cd 100644
--- a/src/d/actor/d_a_ikari.cpp
+++ b/src/d/actor/d_a_ikari.cpp
@@ -146,7 +146,7 @@ cPhs_State daIkari_c::_create() {
                 160.0f * scaleX, 100.0f * scaleX, 600.0f * scaleX);
             fopAcM_setCullSizeFar(this, 10.0f);
 
-            mTimer = (short)(int)cM_rndF(32768.0f);
+            mTimer = (s16)(int)cM_rndF(32768.0f);
         }
     }
 
diff --git a/src/d/actor/d_a_npc_hr.cpp b/src/d/actor/d_a_npc_hr.cpp
index bcea2785..240809c4 100644
--- a/src/d/actor/d_a_npc_hr.cpp
+++ b/src/d/actor/d_a_npc_hr.cpp
@@ -809,7 +809,7 @@ bool daNpc_Hr_c::demoProc() {
             case 10:
                 pLink->offPlayerNoDraw();
                 break;
-            case 11:
+            case 11: {
                 cXyz* pPos = dComIfGp_evmng_getMyXyzP(mStaffIdx, "Pos");
 
                 if (pPos != NULL) {
@@ -826,10 +826,11 @@ bool daNpc_Hr_c::demoProc() {
                 mAnmIdx = -1;
                 setAnm(0);
                 break;
+            }
             case 12:
                 demoInitMove();
                 break;
-            case 13:
+            case 13: {
                 mTargetAngle = fopAcM_searchActorAngleY(pLink, this);
                 int* pTimer = dComIfGp_evmng_getMyIntegerP(mStaffIdx, "Timer");
 
@@ -839,6 +840,7 @@ bool daNpc_Hr_c::demoProc() {
                     mMoveTimer = 0;
                 }
                 break;
+            }
             case 14:
                 setAnm(0);
                 demoInitWait();
diff --git a/src/d/actor/d_a_obj_ebomzo.cpp b/src/d/actor/d_a_obj_ebomzo.cpp
index 969816e3..20e16ee5 100644
--- a/src/d/actor/d_a_obj_ebomzo.cpp
+++ b/src/d/actor/d_a_obj_ebomzo.cpp
@@ -76,7 +76,9 @@ BOOL daObjEbomzo::Act_c::Create() {
         mMode = Ebomzo_Mode_Fall;
         current.angle.x = 0x4000;
     }
-    else mMode = Ebomzo_Mode_Check;
+    else {
+        mMode = Ebomzo_Mode_Check;
+    }
 
     return TRUE;
 }
diff --git a/src/d/actor/d_a_obj_swlight.cpp b/src/d/actor/d_a_obj_swlight.cpp
index e573ed70..f211224f 100644
--- a/src/d/actor/d_a_obj_swlight.cpp
+++ b/src/d/actor/d_a_obj_swlight.cpp
@@ -402,7 +402,7 @@ bool Act_c::_execute() {
 }
 
 /* 00001714-0000187C       .text setMaterial__12daObjSwlightFP11J3DMaterialUc */
-void setMaterial(J3DMaterial* material, unsigned char arg2) {
+void setMaterial(J3DMaterial* material, u8 arg2) {
     while (material != NULL) {
         if (arg2 == 0) {
             material->getShape()->hide();
@@ -425,7 +425,7 @@ void setMaterial(J3DMaterial* material, unsigned char arg2) {
 }
 
 /* 0000187C-00001970       .text setMaterial_Before_mirror__12daObjSwlightFP11J3DMaterialUc */
-void setMaterial_Before_mirror(J3DMaterial* material, unsigned char arg2) {
+void setMaterial_Before_mirror(J3DMaterial* material, u8 arg2) {
     while (material != NULL) {
         if (arg2 == 0) {
             material->getShape()->hide();
diff --git a/src/d/actor/d_a_player_swim.inc b/src/d/actor/d_a_player_swim.inc
index 296f29c1..20ef3470 100644
--- a/src/d/actor/d_a_player_swim.inc
+++ b/src/d/actor/d_a_player_swim.inc
@@ -17,8 +17,8 @@
 
 /* 8013CC64-8013CF2C       .text setSpeedAndAngleSwim__9daPy_lk_cFv */
 void daPy_lk_c::setSpeedAndAngleSwim() {
-    float fVar1;
-    short oldAngleY;
+    f32 fVar1;
+    s16 oldAngleY;
 
     BOOL bVar3 = false;
 
@@ -147,7 +147,7 @@ BOOL daPy_lk_c::changeSwimProc() {
                 speed.y = 0.0f;
             }
 
-            float oldSpeedY = mOldSpeed.y * mOldSpeed.y * 0.0004f + 0.2f;
+            f32 oldSpeedY = mOldSpeed.y * mOldSpeed.y * 0.0004f + 0.2f;
 
             if (oldSpeedY > 1.0f) {
                 oldSpeedY = 1.0f;
@@ -283,18 +283,18 @@ f32 daPy_lk_c::getSwimTimerRate() {
 
 /* 8013D6B8-8013D814       .text setSwimTimerStartStop__9daPy_lk_cFv */
 void daPy_lk_c::setSwimTimerStartStop() {
-    float target = 0.0f;
+    f32 target = 0.0f;
 
     if (mAcch.GetGroundH() <= m35D0 - 175.0f) {
         dComIfGp_startItemSwimTimer();
 
         if (checkNoResetFlg0(daPyFlg0_UNK100)) {
-            float swimTimerRate = getSwimTimerRate();
+            f32 swimTimerRate = getSwimTimerRate();
 
             if (swimTimerRate > 0.5f) {
                 target = cM_fcos((1.0f - swimTimerRate) * M_PI) * -m_HIO->mSwim.m.field_0x78;
 
-                if (mFrameCtrlUnder->checkPass(0.0f) && mCurProc != daPyProc_SWIM_UP_e) {
+                if (mFrameCtrlUnder[UNDER_MOVE0_e].checkPass(0.0f) && mCurProc != daPyProc_SWIM_UP_e) {
                     if (mProcVar0.m3570 && !checkNoResetFlg0(daPyFlg0_UNK4000)) {
                         voiceStart(0x22);
                         mProcVar0.m3570 = 0;
@@ -359,22 +359,22 @@ BOOL daPy_lk_c::procSwimUp_init(BOOL param_1) {
 
 /* 8013DA18-8013DB24       .text procSwimUp__9daPy_lk_cFv */
 BOOL daPy_lk_c::procSwimUp() {
-    J3DFrameCtrl* frameCtrl = mFrameCtrlUnder;
+    J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e];
 
     setSpeedAndAngleSwim();
 
     if (!changeSwimOutProc()) {
-        if (frameCtrl->getRate() < 0.01f) {
+        if (frameCtrl.getRate() < 0.01f) {
             procSwimWait_init(FALSE);
         }
         else {
-            if (frameCtrl->getFrame() > m_HIO->mSwim.m.field_0x34) {
+            if (frameCtrl.getFrame() > m_HIO->mSwim.m.field_0x34) {
                 if (mStickDistance > 0.05f) {
                     procSwimMove_init(FALSE);
                 }
             }
             else {
-                if (frameCtrl->checkPass(4.0f)) {
+                if (frameCtrl.checkPass(4.0f)) {
                     voiceStart(0x1A);
                     seStartOnlyReverb(JA_SE_LK_WALK_IN_WATER);
                     seStartOnlyReverb(JA_SE_LK_SWIM);
@@ -392,14 +392,14 @@ BOOL daPy_lk_c::procSwimUp() {
 
 /* 8013DB24-8013DCDC       .text procSwimWait_init__9daPy_lk_cFi */
 BOOL daPy_lk_c::procSwimWait_init(BOOL param_1) {
-    float fVar2;
+    f32 fVar2;
     
-    J3DFrameCtrl* frameCtrl = mFrameCtrlUnder;
+    J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e];
 
     commonProcInit(daPyProc_SWIM_WAIT_e);
 
     if (param_1) {
-        fVar2 = frameCtrl->getFrame() / (float)frameCtrl->getEnd();
+        fVar2 = frameCtrl.getFrame() / (f32)frameCtrl.getEnd();
         mVelocity = speedF * (1.0f - m_HIO->mSwim.m.field_0x60) + speedF * std::fabsf(cM_fcos(fVar2 * M_PI)) * m_HIO->mSwim.m.field_0x60;
     }
     else {
@@ -407,9 +407,9 @@ BOOL daPy_lk_c::procSwimWait_init(BOOL param_1) {
     }
 
     gravity = 0.0f;
-    setSingleMoveAnime(ANM_SWIMWAIT, (float)(getSwimTimerRate() * m_HIO->mSwim.m.field_0x70) + m_HIO->mSwim.m.field_0x40, 0.0f, -1, m_HIO->mSwim.m.field_0x44);
-    frameCtrl->setFrame(fVar2 * frameCtrl->getEnd());
-    mAnmRatioUnder[UNDER_MOVE0_e].getAnmTransform()->setFrame(frameCtrl->getFrame());
+    setSingleMoveAnime(ANM_SWIMWAIT, (f32)(getSwimTimerRate() * m_HIO->mSwim.m.field_0x70) + m_HIO->mSwim.m.field_0x40, 0.0f, -1, m_HIO->mSwim.m.field_0x44);
+    frameCtrl.setFrame(fVar2 * frameCtrl.getEnd());
+    mAnmRatioUnder[UNDER_MOVE0_e].getAnmTransform()->setFrame(frameCtrl.getFrame());
     dComIfGp_setPlayerStatus0(0, daPyStts0_SWIM_e);
 
     if (checkNoResetFlg0(daPyFlg0_UNK100)) {
@@ -429,7 +429,7 @@ BOOL daPy_lk_c::procSwimWait_init(BOOL param_1) {
 /* 8013DCDC-8013DE8C       .text procSwimWait__9daPy_lk_cFv */
 BOOL daPy_lk_c::procSwimWait() {
     setSpeedAndAngleSwim();
-    m34D4 += (short)((cM_rndF(0.3f) + 0.85f) * m_HIO->mSwim.m.field_0x2);
+    m34D4 += (s16)((cM_rndF(0.3f) + 0.85f) * m_HIO->mSwim.m.field_0x2);
     m35C4 = cM_ssin(m34D4) * m_HIO->mSwim.m.field_0x4C + m_HIO->mSwim.m.field_0x48;
 
     if (changeSwimOutProc()) {
@@ -452,7 +452,7 @@ BOOL daPy_lk_c::procSwimWait() {
     if (dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK10_e)) {
         fopAc_ac_c* talkEventPartner = fopAcM_getTalkEventPartner(this);
         if (talkEventPartner) {
-            short targetAngleY = cLib_targetAngleY(&current.pos, &talkEventPartner->eyePos);
+            s16 targetAngleY = cLib_targetAngleY(&current.pos, &talkEventPartner->eyePos);
             cLib_addCalcAngleS(&shape_angle.y, targetAngleY, m_HIO->mTurn.m.field_0x6, m_HIO->mTurn.m.field_0x8, m_HIO->mTurn.m.field_0xA);
             current.angle.y = shape_angle.y;
         }
@@ -508,7 +508,7 @@ BOOL daPy_lk_c::procSwimMove() {
 
     setSpeedAndAngleSwim();
 
-    J3DFrameCtrl* frameCtrl = mFrameCtrlUnder;
+    J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e];
 
     int direction;
     if (!checkAttentionLock()) {
@@ -523,7 +523,7 @@ BOOL daPy_lk_c::procSwimMove() {
 
     if (mDirection != direction) {
         mDirection = direction;
-        float fVar1 = m35C4;
+        f32 fVar1 = m35C4;
 
         if (mDirection == DIR_FORWARD) {
             anm = ANM_SWIMING;
@@ -558,11 +558,11 @@ BOOL daPy_lk_c::procSwimMove() {
         }
     }
     else {
-        frameCtrl[0].setRate((std::fabsf(mVelocity) * (m_HIO->mSwim.m.field_0x54 - m_HIO->mSwim.m.field_0x50)) / mMaxNormalSpeed + m_HIO->mSwim.m.field_0x50 + (float)(getSwimTimerRate() * m_HIO->mSwim.m.field_0x74));
+        frameCtrl.setRate((std::fabsf(mVelocity) * (m_HIO->mSwim.m.field_0x54 - m_HIO->mSwim.m.field_0x50)) / mMaxNormalSpeed + m_HIO->mSwim.m.field_0x50 + (f32)(getSwimTimerRate() * m_HIO->mSwim.m.field_0x74));
     }
 
     if (mDirection == DIR_BACKWARD) {
-        frameCtrl[0].setRate(frameCtrl[0].getRate() * 0.5f);
+        frameCtrl.setRate(frameCtrl.getRate() * 0.5f);
     }
 
     if (changeSwimOutProc()) {
@@ -591,7 +591,7 @@ BOOL daPy_lk_c::procSwimMove() {
     if (mStickDistance <= 0.05f) {
         procSwimWait_init(TRUE);
     }
-    else if ((mDirection == DIR_FORWARD && frameCtrl->checkPass(20.0f)) || (mDirection != DIR_FORWARD && frameCtrl->checkPass(0.0f))) {
+    else if ((mDirection == DIR_FORWARD && frameCtrl.checkPass(20.0f)) || (mDirection != DIR_FORWARD && frameCtrl.checkPass(0.0f))) {
             seStartOnlyReverb(JA_SE_LK_SWIM);
     }
 
diff --git a/src/d/actor/d_a_stone.cpp b/src/d/actor/d_a_stone.cpp
index 2062286a..48fccd5a 100644
--- a/src/d/actor/d_a_stone.cpp
+++ b/src/d/actor/d_a_stone.cpp
@@ -913,7 +913,7 @@ void Act_c::set_senv(int arg1, int arg2) const {
 /* 00003124-0000315C       .text cam_lockoff__Q27daStone5Act_cCFv */
 void Act_c::cam_lockoff() const {
     camera_class* camera = dComIfGp_getCamera(0);
-    camera->mCamera.ForceLockOff(((base_process_class*)this)->mBsPcId);
+    camera->mCamera.ForceLockOff(base.base.mBsPcId);
 }
 
 /* 0000315C-00003358       .text _execute__Q27daStone5Act_cFv */