Match 3 more d_a_tn funcs, clean up some inlines

5 files changed, 12 insertions, 12 deletions

diff --git a/include/SSystem/SComponent/c_bg_s_gnd_chk.h b/include/SSystem/SComponent/c_bg_s_gnd_chk.h
index a102cfc3..a4ebace1 100644
--- a/include/SSystem/SComponent/c_bg_s_gnd_chk.h
+++ b/include/SSystem/SComponent/c_bg_s_gnd_chk.h
@@ -12,7 +12,9 @@ public:
         m_pos = *pos;
     }
     void SetPos(Vec* pos) {
-        m_pos = *pos;
+        m_pos.x = pos->x;
+        m_pos.y = pos->y;
+        m_pos.z = pos->z;
     }
 
     virtual ~cBgS_GndChk() {}
diff --git a/include/d/actor/d_a_tn.h b/include/d/actor/d_a_tn.h
index 5ec081fb..b19eb9c1 100644
--- a/include/d/actor/d_a_tn.h
+++ b/include/d/actor/d_a_tn.h
@@ -40,7 +40,7 @@ struct tn_class {
     /* 0x02C4 */ mDoExt_McaMorf* mpBodyMorf;
     /* 0x02C8 */ mDoExt_McaMorf* mpShieldMorf;
     /* 0x02CC */ mDoExt_McaMorf* mpArmorMorf;
-    /* 0x02D0 */ u8 mRemainingEquipmentPieces;
+    /* 0x02D0 */ s8 mRemainingEquipmentPieces;
     /* 0x02D1 */ u8 m02D1[0x02D4 - 0x02D1];
     /* 0x02D4 */ u32 mShadowId;
     /* 0x02D8 */ mDoExt_brkAnm* mpBrkAnm;
diff --git a/include/d/d_cc_uty.h b/include/d/d_cc_uty.h
index dd96413e..a1891019 100644
--- a/include/d/d_cc_uty.h
+++ b/include/d/d_cc_uty.h
@@ -29,6 +29,8 @@ void def_se_set_p(fopAc_ac_c*, cXyz*, cCcD_Obj*, unsigned long);
 fopAc_ac_c* at_power_check(CcAtInfo*);
 fopAc_ac_c* cc_at_check(fopAc_ac_c*, CcAtInfo*);
 
-inline void dCc_GetAc(void*) {}
+inline fopAc_ac_c* dCc_GetAc(void* i_actor) {
+    return static_cast<fopAc_ac_c*>(i_actor);
+}
 
 #endif /* D_CC_UTY_H */
diff --git a/include/d/d_path.h b/include/d/d_path.h
index c791a10b..9c83e611 100644
--- a/include/d/d_path.h
+++ b/include/d/d_path.h
@@ -22,7 +22,7 @@ struct dPath {
     /* 0x08 */ dPnt* m_points;
 };
 
-inline BOOL dPath_ChkClose(dPath* i_path) { return i_path->m_closed & 1; }
+inline BOOL dPath_ChkClose(dPath* i_path) { return (i_path->m_closed & 1) != 0; }
 
 dPath* dPath_GetRoomPath(int, int);
 dPath* dPath_GetNextRoomPath(dPath*, int);
diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h
index 8462ecf9..c01a4479 100644
--- a/include/f_op/f_op_actor_mng.h
+++ b/include/f_op/f_op_actor_mng.h
@@ -127,7 +127,7 @@ inline MtxP fopAcM_GetMtx(fopAc_ac_c* pActor) {
     return pActor->cullMtx;
 }
 
-inline bool fopAcM_CheckStatus(fopAc_ac_c* pActor, u32 status) {
+inline u32 fopAcM_CheckStatus(fopAc_ac_c* pActor, u32 status) {
     return pActor->actor_status & status;
 }
 
@@ -155,8 +155,8 @@ inline void fopAcM_SetParam(void* p_actor, u32 param) {
     fpcM_SetParam(p_actor, param);
 }
 
-inline void fopAcM_SetJntHit(fopAc_ac_c* i_actorP, JntHit_c* i_jntHitP) {
-    i_actorP->jntHit = i_jntHitP;
+inline void fopAcM_SetJntHit(fopAc_ac_c* i_actorP, void* i_jntHitP) {
+    i_actorP->jntHit = (JntHit_c*)i_jntHitP;
 }
 
 inline s16 fopAcM_GetProfName(void* pActor) {
@@ -475,12 +475,8 @@ fpc_ProcID fopAcM_create(char*, u32 i_parameter, cXyz* i_pos = NULL, int i_roomN
                    csXyz* i_angle = NULL, cXyz* i_scale = NULL,
                    createFunc i_createFunc = NULL);
 
-inline fpc_ProcID fopAcM_create(s16 i_procName, createFunc i_createFunc, void* params) {
-    return fpcM_Create(i_procName, i_createFunc, params);
-}
-
 inline fpc_ProcID fopAcM_Create(s16 i_procName, createFunc i_createFunc, void* params) {
-    return fpcM_Create(i_procName, i_createFunc,params);
+    return fpcM_Create(i_procName, i_createFunc, params);
 }
 
 void* fopAcM_fastCreate(s16 procName, u32 parameter, cXyz* p_pos = NULL, int roomNo = -1,