clean up some inlines

9 files changed, 26 insertions, 26 deletions

diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp
index a2896100..9bb53a1e 100644
--- a/src/d/actor/d_a_agb.cpp
+++ b/src/d/actor/d_a_agb.cpp
@@ -1568,11 +1568,11 @@ static int daAgb_Create(fopAc_ac_c* i_this) {
             return cPhs_ERROR_e;
         }
 
-        a_this->mCrrPos.Set(&fopAcM_GetPosition_p(a_this), &fopAcM_GetOldPosition_p(a_this), (void*)NULL, NULL);
+        a_this->mCrrPos.Set(fopAcM_GetPosition_p(a_this), fopAcM_GetOldPosition_p(a_this), (void*)NULL, NULL);
         a_this->mCrrPos.SetWall(171.0f, 50.0f);
         a_this->mCrrPos.SetGndUpY(170.0f);
         a_this->mCrrPos.ClrNoRoof();
-        a_this->mAcch.Set(&fopAcM_GetPosition_p(a_this), &fopAcM_GetOldPosition_p(a_this), a_this, 1, &a_this->mAcchCir);
+        a_this->mAcch.Set(fopAcM_GetPosition_p(a_this), fopAcM_GetOldPosition_p(a_this), a_this, 1, &a_this->mAcchCir);
         a_this->mAcch.OnLineCheck();
         a_this->mAcch.SetGrndNone();
         a_this->mAcchCir.SetWall(171.0f, 40.0f);
diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp
index 3a9cb977..95fda218 100644
--- a/src/d/actor/d_a_am.cpp
+++ b/src/d/actor/d_a_am.cpp
@@ -1241,8 +1241,8 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
         i_this->mAttentionInfo.mFlags = 0;
 
         i_this->mAcch.Set(
-            &fopAcM_GetPosition_p(i_this), &fopAcM_GetOldPosition_p(i_this),
-            i_this, 1, &i_this->mAcchCir, &fopAcM_GetSpeed_p(i_this)
+            fopAcM_GetPosition_p(i_this), fopAcM_GetOldPosition_p(i_this),
+            i_this, 1, &i_this->mAcchCir, fopAcM_GetSpeed_p(i_this)
         );
         i_this->mStts.Init(254, 1, i_this);
 
diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp
index e244406c..20055d3f 100644
--- a/src/d/actor/d_a_am2.cpp
+++ b/src/d/actor/d_a_am2.cpp
@@ -1347,8 +1347,8 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
         i_this->mAttentionInfo.mFlags = 0;
 
         i_this->mAcch.Set(
-            &fopAcM_GetPosition_p(i_this), &fopAcM_GetOldPosition_p(i_this),
-            i_this, 1, &i_this->mAcchCir, &fopAcM_GetSpeed_p(i_this)
+            fopAcM_GetPosition_p(i_this), fopAcM_GetOldPosition_p(i_this),
+            i_this, 1, &i_this->mAcchCir, fopAcM_GetSpeed_p(i_this)
         );
         i_this->mStts.Init(254, 1, i_this);
 
diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp
index ee9a648f..ab5c2a48 100644
--- a/src/d/actor/d_a_bk.cpp
+++ b/src/d/actor/d_a_bk.cpp
@@ -809,9 +809,9 @@ static s32 daBk_Create(fopAc_ac_c* i_actor) {
         }
         
         i_this->mDamageReaction.mAcch.Set(
-            &fopAcM_GetPosition_p(i_this), &fopAcM_GetOldPosition_p(i_this),
+            fopAcM_GetPosition_p(i_this), fopAcM_GetOldPosition_p(i_this),
             i_this, 1, &i_this->mDamageReaction.mAcchCir,
-            &fopAcM_GetSpeed_p(i_this)
+            fopAcM_GetSpeed_p(i_this)
         );
         i_this->mDamageReaction.mAcchCir.SetWall(40.0f, 40.0f);
         i_this->mDamageReaction.mAcch.ClrRoofNone();
diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp
index 045b5543..cc35a9a5 100644
--- a/src/d/actor/d_a_ghostship.cpp
+++ b/src/d/actor/d_a_ghostship.cpp
@@ -217,7 +217,7 @@ void daGhostship_c::createInit() {
     }
 
     mCir.SetWall(30.0f, 30.0f);
-    mAcch.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, 1, &mCir, &fopAcM_GetSpeed_p(this));
+    mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mCir, fopAcM_GetSpeed_p(this));
     mAcch.SetWallNone();
     mAcch.SetRoofNone();
     dLib_waveRot(&current.pos, 0.0f, &mWave);
diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp
index a912c4b7..a340aa9c 100644
--- a/src/d/actor/d_a_item.cpp
+++ b/src/d/actor/d_a_item.cpp
@@ -134,7 +134,7 @@ void itemGetCallBack(fopAc_ac_c* item_actor, dCcD_GObjInf*, fopAc_ac_c* collided
 /* 800F5044-800F53EC       .text CreateInit__8daItem_cFv */
 void daItem_c::CreateInit() {
     mAcchCir.SetWall(30.0f, 30.0f);
-    mAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, &fopAcM_GetSpeed_p(this));
+    mAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, fopAcM_GetSpeed_p(this));
     mAcch.m_flags &= ~0x400;
     mAcch.m_flags &= ~0x8;
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -157,7 +157,7 @@ void daItem_c::CreateInit() {
     
     mDisappearTimer = getData()->mDuration;
     field_0x65a = getData()->field_0x18;
-    field_0x650 = fopAcM_GetSpeed_p(this).y;
+    field_0x650 = fopAcM_GetSpeed(this).y;
     mItemStatus = 0;
     
     mType = daItem_prm::getType(this);
diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp
index c540d49e..3be5a8f0 100644
--- a/src/d/actor/d_a_npc_btsw2.cpp
+++ b/src/d/actor/d_a_npc_btsw2.cpp
@@ -145,17 +145,17 @@ daNpc_Btsw2_HIO_c::daNpc_Btsw2_HIO_c() {
 const char daNpc_Btsw2_c::m_arc_name[] = "Btsw";
 
 static const int l_bck_ix_tbl[] = {
-	BTSW_INDEX_BCK_BN_WAIT01,
-	BTSW_INDEX_BCK_BN_WAIT02,
-	BTSW_INDEX_BCK_BN_TALK01,
-	BTSW_INDEX_BCK_BN_TALK02,
-	BTSW_INDEX_BCK_BN_ONEGAI,
-	BTSW_INDEX_BCK_BN_SUGOI,
-	BTSW_INDEX_BCK_BN_SUGOI,
-	BTSW_INDEX_BCK_BN_WALK,
-	BTSW_INDEX_BCK_BN_KASIGE,
-	BTSW_INDEX_BCK_BN_SIWAKE01,
-	BTSW_INDEX_BCK_BN_SIWAKE02,
+    BTSW_INDEX_BCK_BN_WAIT01,
+    BTSW_INDEX_BCK_BN_WAIT02,
+    BTSW_INDEX_BCK_BN_TALK01,
+    BTSW_INDEX_BCK_BN_TALK02,
+    BTSW_INDEX_BCK_BN_ONEGAI,
+    BTSW_INDEX_BCK_BN_SUGOI,
+    BTSW_INDEX_BCK_BN_SUGOI,
+    BTSW_INDEX_BCK_BN_WALK,
+    BTSW_INDEX_BCK_BN_KASIGE,
+    BTSW_INDEX_BCK_BN_SIWAKE01,
+    BTSW_INDEX_BCK_BN_SIWAKE02,
 };
 
 static const int l_btp_ix_tbl[] = {
diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc
index 4b61dd1f..df7f39d8 100644
--- a/src/d/actor/d_a_player_sword.inc
+++ b/src/d/actor/d_a_player_sword.inc
@@ -27,7 +27,7 @@ void daPy_lk_c::setSwordModel(BOOL r28) {
         /* 0x0E */ u16 tipStabBrk;
     };
     static const sword_model_tbl_s sword_model_tbl[] = {
-	    {
+        {
             LINK_BDL_SWA,
             LINK_BDL_YHSLS00,
             LKANM_BTK_YHSLS00,
@@ -37,7 +37,7 @@ void daPy_lk_c::setSwordModel(BOOL r28) {
             LKANM_BTK_CUTFH,
             LKANM_BRK_CUTFH
         },
-	    {
+        {
             LINK_BDL_SWMS,
             LINK_BDL_YMSLI00,
             LKANM_BTK_YMSLI00,
diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp
index 5ba205c2..a47a2d95 100644
--- a/src/d/actor/d_a_rd.cpp
+++ b/src/d/actor/d_a_rd.cpp
@@ -839,7 +839,7 @@ void daRd_c::modeDeath() {
     fopAcM_onActor(this);
     
     // Do not consider the ReDead to be a living enemy while its death animation is playing out.
-    mGroup = fopAc_ENV_e;
+    fopAcM_SetGroup(this, fopAc_ENV_e);
     
     if (cLib_calcTimer(&mTimer1) == 0) {
         fopAcM_createDisappear(this, &current.pos, 5);
@@ -1773,7 +1773,7 @@ void daRd_c::createInit() {
     mCyl.Set(m_cyl_src);
     mCyl.SetStts(&mStts);
     mAcchCir.SetWall(30.0f, 30.0f);
-    mAcch.Set(&fopAcM_GetPosition_p(this), &fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, &fopAcM_GetSpeed_p(this));
+    mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this));
     mAcch.SetRoofNone();
     J3DModelData* modelData = mpMorf->getModel()->getModelData();
     mJntCtrl.setHeadJntNum(0x0A); // ree_kubi_1