zl1 cleanup, inline cleanup

1 files changed, 5 insertions, 5 deletions

diff --git a/src/d/actor/d_a_oship.cpp b/src/d/actor/d_a_oship.cpp
index 6b241c17..20859536 100644
--- a/src/d/actor/d_a_oship.cpp
+++ b/src/d/actor/d_a_oship.cpp
@@ -202,7 +202,7 @@ bool daOship_c::lineCheck(cXyz* param_1, cXyz* param_2) {
 
 /* 000008F8-00000990       .text changeModeByRange__9daOship_cFv */
 void daOship_c::changeModeByRange() {
-    f32 search_ac_dist = fopAcM_searchActorDistanceXZ(this, dComIfGp_getPlayer(0));
+    f32 search_ac_dist = fopAcM_searchPlayerDistanceXZ(this);
     Mode_e proc_no;
 
     if (search_ac_dist < l_HIO.mDistRangeA) {
@@ -470,7 +470,7 @@ void daOship_c::setMtx() {
     dLib_waveRot(&current.pos, sway, &mWave);
     
     s16 temp_r30 = f32(mAttackSwayAmount * (REG12_S(5) + 10)) * cM_ssin(mAttackSwayTimer);
-    s16 temp_r0 = shape_angle.y + fopAcM_searchActorAngleY(this, dComIfGp_getPlayer(0));
+    s16 temp_r0 = shape_angle.y + fopAcM_searchPlayerAngleY(this);
     s16 temp_r4 = f32(temp_r30) * cM_scos(temp_r0);
     s16 temp_r3 = f32(temp_r30) * cM_ssin(temp_r0);
 
@@ -655,7 +655,7 @@ void daOship_c::modeAttackInit() {
         target_dist = 0.0f;
     }
 
-    s16 angle = fopAcM_searchActorAngleY(this, dComIfGp_getPlayer(0));
+    s16 angle = fopAcM_searchPlayerAngleY(this);
 
     mTargetPos.x -= target_dist * cM_ssin(angle);
     mTargetPos.z -= target_dist * cM_scos(angle);
@@ -855,11 +855,11 @@ bool daOship_c::_execute() {
 
     if (fopAcM_GetSpeedF(this) <= 2.0f || 
         cull_box_check || 
-        fopAcM_searchActorDistanceXZ(this, dComIfGp_getPlayer(0)) > 18000.0f) {
+        fopAcM_searchPlayerDistanceXZ(this) > 18000.0f) {
         mWaveCallback2.remove();
         mWaveCallback1.remove();
         mSplashCallback.remove();
-        mTrackCallback.stop();        
+        mTrackCallback.stop();
     } else {
         setWave();
     }