diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index b33b4e222..700c6f760 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -1992,7 +1992,7 @@ static void fight_run(bk_class* i_this) { fopAc_ac_c* r29 = (fopAc_ac_c*)fpcM_Search(shot_s_sub, i_this); if (r29) { if (r29->speedF > 10.0f) { - cXyz sp18 = (r29->current.pos - i_this->eyePos); + cXyz sp18 = r29->current.pos - i_this->eyePos; if (sp18.abs() < r29->speedF * 10.0f) { r27 = true; } diff --git a/src/d/actor/d_a_player_climb.inc b/src/d/actor/d_a_player_climb.inc index 618ee0ac2..0f1490d41 100644 --- a/src/d/actor/d_a_player_climb.inc +++ b/src/d/actor/d_a_player_climb.inc @@ -161,8 +161,8 @@ BOOL daPy_lk_c::checkBgClimbMove() { f32 dVar7 = cM_ssin(shape_angle.y); f32 dVar6 = cM_scos(shape_angle.y); - f32 dVar5 = (30.0f * dVar6); - f32 dVar4 = (-30.0f * dVar7); + f32 dVar5 = 30.0f * dVar6; + f32 dVar4 = -30.0f * dVar7; local_5c.set(current.pos.x + dVar5, current.pos.y, current.pos.z + dVar4); checkBgCorrectClimbMove(¤t.pos, &local_5c); @@ -436,7 +436,7 @@ BOOL daPy_lk_c::procClimbMoveSide_init(int param_0) { speedF = 0.0f; m34D0 = 1; dComIfGp_setPlayerStatus1(0, daPyStts1_UNK10000_e); - cXyz local_38 = (mRightHandPos - mLeftHandPos); + cXyz local_38 = mRightHandPos - mLeftHandPos; dVar4 = local_38.absXZ(); m35A0 = dVar4; return true; @@ -466,7 +466,7 @@ BOOL daPy_lk_c::procClimbMoveSide() { dVar5 *= -1.0f; } mFrameCtrlUnder[UNDER_MOVE0_e].setRate(dVar5); - cXyz local_28 = (mRightHandPos - mLeftHandPos); + cXyz local_28 = mRightHandPos - mLeftHandPos; dVar5 = local_28.absXZ(); f32 fVar1 = std::fabsf(dVar5 - m35A0) * daPy_HIO_ladder_c0::m.field_0x40; f32 fVar2 = fVar1 * cM_ssin(m34D4); diff --git a/src/d/actor/d_a_player_crawl.inc b/src/d/actor/d_a_player_crawl.inc index 0cee9a006..cf69b193b 100644 --- a/src/d/actor/d_a_player_crawl.inc +++ b/src/d/actor/d_a_player_crawl.inc @@ -208,11 +208,11 @@ BOOL daPy_lk_c::checkNotCrawlStand(cXyz* param_0) { /* 801396B0-80139760 .text checkNotCrawlStand__9daPy_lk_cFP4cXyzP4cXyz */ BOOL daPy_lk_c::checkNotCrawlStand(cXyz* param_0, cXyz* param_1) { - cXyz local_2c = (*param_0 + *param_1); + cXyz local_2c = *param_0 + *param_1; if (checkNotCrawlStand(&local_2c)) { return true; } - local_2c = (*param_0 - *param_1); + local_2c = *param_0 - *param_1; if (checkNotCrawlStand(&local_2c)) { return true; } diff --git a/src/d/actor/d_a_player_dproc.inc b/src/d/actor/d_a_player_dproc.inc index e8fcaf8ac..9f747b64c 100644 --- a/src/d/actor/d_a_player_dproc.inc +++ b/src/d/actor/d_a_player_dproc.inc @@ -884,7 +884,7 @@ BOOL daPy_lk_c::dProcDead() { if (frameCtrl.getRate() < 0.01f) { dGameover_c* this_01; cLib_chaseF(&m35A0, 0.0f, 0.01f); - f32 dVar3 = (1.0f - m35A0); + f32 dVar3 = 1.0f - m35A0; if ((m3628 != fpcM_ERROR_PROCESS_ID_e) && (this_01 = (dGameover_c*)fopMsgM_SearchByID(m3628), this_01)) { this_01->setBackAlpha(dVar3); } @@ -1459,7 +1459,7 @@ BOOL daPy_lk_c::dProcPresent_init() { BOOL daPy_lk_c::dProcPresent() { setShapeAngleToTalkActor(); if (m3570 != 0) { - cXyz local_28 = (m370C - current.pos); + cXyz local_28 = m370C - current.pos; if ((0x4000 < cLib_distanceAngleS(cM_atan2s(local_28.x, local_28.z), current.angle.y)) || mAcch.ChkWallHit()) { current.pos.x = m370C.x; current.pos.z = m370C.z; @@ -1541,14 +1541,14 @@ BOOL daPy_lk_c::dProcStandItemPut_init() { m3570 = 0; pdVar1 = (daPy_py_c*)fopAcM_getEventPartner(this); if (pdVar1 != NULL) { - cXyz local_20 = (pdVar1->current.pos - current.pos); + cXyz local_20 = pdVar1->current.pos - current.pos; angle = fopAcM_GetShapeAngle_p(this); angle->y = fopAcM_searchActorAngleY(this, pdVar1); dVar5 = local_20.absXZ(); if (0.0f < dVar5) { in_f4 = 0.5; } - m35C8 = (dVar5 - 47.0f); + m35C8 = dVar5 - 47.0f; angle = fopAcM_GetShapeAngle_p(pdVar1); } else { m35C8 = 15.0f; diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc index 872a56df5..a9b234503 100644 --- a/src/d/actor/d_a_player_fan.inc +++ b/src/d/actor/d_a_player_fan.inc @@ -255,7 +255,7 @@ BOOL daPy_lk_c::procFanSwing() { if (mpAttnActorLockOn == NULL) { m3538 = 0; } else { - local_54 = (mpAttnActorLockOn->eyePos - current.pos); + local_54 = mpAttnActorLockOn->eyePos - current.pos; m3538 = cM_atan2s(-local_54.y, local_54.absXZ()); } mpYuchw00Brk->setFrame(0.0f); diff --git a/src/d/actor/d_a_player_grab.inc b/src/d/actor/d_a_player_grab.inc index 8c6d69fbd..23f30bf36 100644 --- a/src/d/actor/d_a_player_grab.inc +++ b/src/d/actor/d_a_player_grab.inc @@ -142,7 +142,7 @@ void daPy_lk_c::setGrabItemPos() { (1.0f - (((uint)mFrameCtrlUnder[UNDER_MOVE0_e].getStart() - mFrameCtrlUnder[UNDER_MOVE0_e].getFrame()) / ((int)mFrameCtrlUnder[UNDER_MOVE0_e].getEnd()))); - fVar1 = (m35C8 * dVar10); + fVar1 = m35C8 * dVar10; pfVar8->current.pos.x += fVar1 * cM_ssin(shape_angle.y); pfVar8->current.pos.z += fVar1 * cM_scos(shape_angle.y); if (mCurProc == daPyProc_GRAB_PUT_e) { @@ -694,7 +694,7 @@ BOOL daPy_lk_c::procGrabPut() { f32 dVar7 = local_44.abs(); f32 dVar5 = local_44.absXZ(); if (dVar5 > 0.01f) { - float dVar6 = (dVar7 / dVar5); + float dVar6 = dVar7 / dVar5; local_44.x *= dVar6; local_44.z *= dVar6; } else { diff --git a/src/d/actor/d_a_player_hang.inc b/src/d/actor/d_a_player_hang.inc index fb7b90b16..9de3e027b 100644 --- a/src/d/actor/d_a_player_hang.inc +++ b/src/d/actor/d_a_player_hang.inc @@ -39,14 +39,12 @@ int daPy_lk_c::getHangDirectionFromAngle() { /* 80133FB4-801342D8 .text changeHangMoveProc__9daPy_lk_cFi */ BOOL daPy_lk_c::changeHangMoveProc(int i_direction) { - /* Nonmatching - floats */ s16 uVar1; - cM3dGPla* triPla; - if ((!(mAcch.ChkGroundHit())) || (!dComIfG_Bgsp()->ChkPolySafe(mAcch.m_gnd))) { + if ((!(mAcch.ChkGroundHit())) || !dComIfG_Bgsp()->ChkPolySafe(mAcch.m_gnd)) { return false; } - if (triPla = dComIfG_Bgsp()->GetTriPla(mAcch.m_gnd), triPla->GetNP()->y < 0.9986f) { + if (dComIfG_Bgsp()->GetTriPla(mAcch.m_gnd)->GetNP()->y < 0.9986f) { return false; } @@ -84,7 +82,7 @@ BOOL daPy_lk_c::changeHangMoveProc(int i_direction) { if (!dComIfG_Bgsp()->LineCross(&mLinkLinChk)) { return false; } - triPla = dComIfG_Bgsp()->GetTriPla(mLinkLinChk); + cM3dGPla* triPla = dComIfG_Bgsp()->GetTriPla(mLinkLinChk); if (cLib_distanceAngleS(cM_atan2s(triPla->GetNP()->x, triPla->GetNP()->z), shape_angle.y) < 0x549f) { return false; } @@ -97,7 +95,7 @@ BOOL daPy_lk_c::changeHangMoveProc(int i_direction) { VECSubtract(&local_34, &local_58, &local_34); mLinkLinChk.Set(&local_28, &local_34, this); if (dComIfG_Bgsp()->LineCross(&mLinkLinChk)) { - triPla = dComIfG_Bgsp()->GetTriPla(mLinkLinChk); + cM3dGPla* triPla = dComIfG_Bgsp()->GetTriPla(mLinkLinChk); if (cLib_distanceAngleS(cM_atan2s(triPla->GetNP()->x, triPla->GetNP()->z), shape_angle.y) < 0x549f) { return false; } @@ -122,18 +120,20 @@ int daPy_lk_c::changeHangEndProc(int param_0) { m3588 = dBgS_Attr_UNK1B_e; } if (m35DC > mFootData[1].field_0x018.y + current.pos.y) { - procLand_init(daPy_HIO_autoJump_c0::m.field_0x24, 0); - } else if ((param_0 != 0) && (dComIfGp_setDoStatus(6), doTrigger())) { - speed.y = 0.0f; - procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); - } else { - return false; + return procLand_init(daPy_HIO_autoJump_c0::m.field_0x24, 0); } + if (param_0 != 0) { + dComIfGp_setDoStatus(6); + if (doTrigger()) { + speed.y = 0.0f; + return procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); + } + } + return false; } /* 80134440-80134630 .text setHangShapeOffset__9daPy_lk_cFv */ void daPy_lk_c::setHangShapeOffset() { - /* Nonmatching - floats */ cXyz local_40; cXyz local_4c; cXyz local_58; @@ -171,12 +171,11 @@ void daPy_lk_c::setHangShapeOffset() { /* 80134630-80134908 .text procHangStart_init__9daPy_lk_cFv */ BOOL daPy_lk_c::procHangStart_init() { - /* Nonmatching - floats */ cXyz local_1c; cXyz local_28; cXyz local_34; - if ((mCurProc != daPyProc_ROPE_UP_HANG_e) && (mCurProc != daPyProc_ROPE_UP_e)) { + if (mCurProc != daPyProc_ROPE_UP_HANG_e && mCurProc != daPyProc_ROPE_UP_e) { local_34.set(m3724.x, 0.0f, m3724.z); local_28.set(current.pos.x, 0.0f, current.pos.z); if (local_34.abs(local_28) > (mAcchCir[0].GetWallR() + 20.0f)) { @@ -184,7 +183,7 @@ BOOL daPy_lk_c::procHangStart_init() { } } s32 sVar3 = 0; - if ((mCurProc != daPyProc_ROPE_UP_HANG_e) && (mCurProc != daPyProc_ROPE_UP_e)) { + if (mCurProc != daPyProc_ROPE_UP_HANG_e && mCurProc != daPyProc_ROPE_UP_e) { local_1c.x = m3724.x - 1.5f * cM_ssin(m352C); local_1c.y = m3724.y + 10.0f; local_1c.z = m3724.z - 1.5f * cM_scos(m352C); @@ -224,18 +223,18 @@ BOOL daPy_lk_c::procHangStart_init() { BOOL daPy_lk_c::procHangStart() { if (changeHangEndProc(1)) { return true; + } + + if (((mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) || + (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_wallCatch_c0::m.field_0x50)) && + (mStickDistance > 0.05f || m3570 != 0)) + { + if (getDirectionFromShapeAngle() == 0 || m3570 != 0) { + procHangClimb_init(daPy_HIO_wallCatch_c0::m.field_0x2C); + } } else { - if (((mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) || - (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_wallCatch_c0::m.field_0x50)) && - (mStickDistance > 0.05f || (m3570 != 0))) - { - if ((getDirectionFromShapeAngle() == 0) || (m3570 != 0)) { - procHangClimb_init(daPy_HIO_wallCatch_c0::m.field_0x2C); - } - } else { - if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { - procHangWait_init(); - } + if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { + procHangWait_init(); } } return true; @@ -243,7 +242,6 @@ BOOL daPy_lk_c::procHangStart() { /* 801349D8-80134DF8 .text procHangFallStart_init__9daPy_lk_cFP8cM3dGPla */ BOOL daPy_lk_c::procHangFallStart_init(cM3dGPla* param_0) { - /* Nonmatching - floats */ cXyz local_40; cXyz local_4c; @@ -306,7 +304,7 @@ BOOL daPy_lk_c::procHangFallStart_init(cM3dGPla* param_0) { current.pos = local_34; } setOldRootQuaternion(0, shape_angle.y - (uVar5 + 0x8000), 0); - shape_angle.y = (uVar5 + 0x8000); + shape_angle.y = uVar5 + 0x8000; current.angle.y = shape_angle.y; f32 morf; @@ -330,8 +328,8 @@ BOOL daPy_lk_c::procHangFallStart_init(cM3dGPla* param_0) { BOOL daPy_lk_c::procHangFallStart() { int iVar2; - if ((mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) || - (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_hang_c0::m.field_0xC)) + if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f || + mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_hang_c0::m.field_0xC) { iVar2 = 1; } else { @@ -339,19 +337,19 @@ BOOL daPy_lk_c::procHangFallStart() { } if (changeHangEndProc(iVar2)) { return true; - } else { - if (iVar2 != 0) { - if (checkModeFlg(ModeFlg_00000400)) { - offModeFlg(ModeFlg_00000400); - onModeFlg(ModeFlg_00000100); - } - if (checkModeFlg(ModeFlg_00000100)) { - setTextureAnime(7, 0); - } - iVar2 = getHangDirectionFromAngle(); - if ((mStickDistance > 0.05f) && (iVar2 != 1)) { - procHangUp_init(iVar2); - } + } + + if (iVar2 != 0) { + if (checkModeFlg(ModeFlg_00000400)) { + offModeFlg(ModeFlg_00000400); + onModeFlg(ModeFlg_00000100); + } + if (checkModeFlg(ModeFlg_00000100)) { + setTextureAnime(7, 0); + } + iVar2 = getHangDirectionFromAngle(); + if (mStickDistance > 0.05f && iVar2 != 1) { + procHangUp_init(iVar2); } } return true; @@ -381,19 +379,17 @@ BOOL daPy_lk_c::procHangUp() { current.pos.z = current.pos.z - 8.0f * cM_scos(shape_angle.y); } return true; - } else { - if ((mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) || - (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_hang_c0::m.field_0x1C)) - { - if (m3570 == 0) { - procHangClimb_init(daPy_HIO_wallCatch_c0::m.field_0x2C); - } else { - if (changeHangMoveProc(m3570)) { - procHangMove_init(m3570); - } else { - procHangWait_init(); - } - } + } + + if ((mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) || + (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_hang_c0::m.field_0x1C)) + { + if (m3570 == 0) { + procHangClimb_init(daPy_HIO_wallCatch_c0::m.field_0x2C); + } else if (changeHangMoveProc(m3570)) { + procHangMove_init(m3570); + } else { + procHangWait_init(); } } return true; @@ -418,11 +414,15 @@ BOOL daPy_lk_c::procHangWait() { iVar2 = changeHangEndProc(1); if (iVar2 != 0) { return true; - } else if (setHangShapeOffset(), mStickDistance > 0.05f) { + } + + setHangShapeOffset(); + + if (mStickDistance > 0.05f) { iVar2 = getHangDirectionFromAngle(); if (iVar2 == 0) { procHangClimb_init(daPy_HIO_wallCatch_c0::m.field_0x2C); - } else if ((iVar2 != 1) && (changeHangMoveProc(iVar2))) { + } else if (iVar2 != 1 && changeHangMoveProc(iVar2)) { s16 sVar1 = m34EC; procHangMove_init(iVar2); m34EC = sVar1; @@ -447,7 +447,7 @@ BOOL daPy_lk_c::procHangMove_init(int param_0) { setSingleMoveAnime(dVar1, dVar3, 0.0f, -1, daPy_HIO_hang_c0::m.field_0x2C); dComIfGp_setPlayerStatus0(0, daPyStts0_UNK100_e); mVelocity = 0.0f; - cXyz local_1c = (mLeftHandPos - mRightHandPos); + cXyz local_1c = mLeftHandPos - mRightHandPos; dVar3 = local_1c.absXZ(); m35A0 = dVar3; return true; @@ -458,21 +458,21 @@ BOOL daPy_lk_c::procHangMove() { int iVar7 = getHangDirectionFromAngle(); if (!changeHangEndProc(1)) { - if ((iVar7 == 0) && (mStickDistance > 0.05f)) { + if (iVar7 == 0 && mStickDistance > 0.05f) { procHangClimb_init(daPy_HIO_wallCatch_c0::m.field_0x2C); } else { J3DFrameCtrl& frameCtrl = mFrameCtrlUnder[UNDER_MOVE0_e]; frameCtrl.setRate(getHangMoveAnmSpeed()); if (frameCtrl.checkPass(0.0f) != 0) { s16 sVar3 = m34EC; - if (((mStickDistance > 0.05f) && (iVar7 != 1)) && (changeHangMoveProc(iVar7))) { + if (mStickDistance > 0.05f && iVar7 != 1 && changeHangMoveProc(iVar7)) { procHangMove_init(iVar7); } else { procHangWait_init(); } m34EC = sVar3; } else { - cXyz local_64 = (mRightHandPos - mLeftHandPos); + cXyz local_64 = mRightHandPos - mLeftHandPos; float dVar12 = local_64.absXZ(); if (changeHangMoveProc(4)) { mVelocity = std::fabsf(dVar12 - m35A0) * daPy_HIO_hang_c0::m.field_0x30; @@ -537,19 +537,19 @@ BOOL daPy_lk_c::procHangMove() { BOOL daPy_lk_c::procHangClimb_init(f32 param_0) { if (mAcch.ChkRoofHit()) { return false; - } else { - commonProcInit(daPyProc_HANG_CLIMB_e); - setSingleMoveAnime( - ANM_VJMPCL, - daPy_HIO_wallCatch_c0::m.field_0x24, - param_0, - daPy_HIO_wallCatch_c0::m.field_0x4, - daPy_HIO_wallCatch_c0::m.field_0x28 - ); - dComIfGp_setPlayerStatus0(0, daPyStts0_UNK200_e); - mVelocity = 0.0f; - voiceStart(32); } + + commonProcInit(daPyProc_HANG_CLIMB_e); + setSingleMoveAnime( + ANM_VJMPCL, + daPy_HIO_wallCatch_c0::m.field_0x24, + param_0, + daPy_HIO_wallCatch_c0::m.field_0x4, + daPy_HIO_wallCatch_c0::m.field_0x28 + ); + dComIfGp_setPlayerStatus0(0, daPyStts0_UNK200_e); + mVelocity = 0.0f; + voiceStart(32); return true; } @@ -557,10 +557,8 @@ BOOL daPy_lk_c::procHangClimb_init(f32 param_0) { BOOL daPy_lk_c::procHangClimb() { if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) { checkNextMode(0); - } else { - if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_wallCatch_c0::m.field_0x38) { - checkNextMode(1); - } + } else if (mFrameCtrlUnder[UNDER_MOVE0_e].getFrame() > daPy_HIO_wallCatch_c0::m.field_0x38) { + checkNextMode(1); } return true; } @@ -603,9 +601,7 @@ BOOL daPy_lk_c::procHangWallCatch_init() { /* 80135AE0-80135B50 .text procHangWallCatch__9daPy_lk_cFv */ BOOL daPy_lk_c::procHangWallCatch() { - if ((mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) && - (!procHangClimb_init(daPy_HIO_wallCatch_c0::m.field_0x30))) - { + if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f && !procHangClimb_init(daPy_HIO_wallCatch_c0::m.field_0x30)) { return procFall_init(1, daPy_HIO_wallCatch_c0::m.field_0x54); } else { return true; diff --git a/src/d/actor/d_a_player_pushpull.inc b/src/d/actor/d_a_player_pushpull.inc index 22ecb75bd..946f2d20a 100644 --- a/src/d/actor/d_a_player_pushpull.inc +++ b/src/d/actor/d_a_player_pushpull.inc @@ -29,7 +29,7 @@ int daPy_lk_c::setPushPullKeepData(dBgW::PushPullLabel param_0) { } if (param_0 != dBgW::PP_UNK0_e) { if (pp_actor->shape_angle.y != m34D4) { - cXyz local_28 = (current.pos - m370C); + cXyz local_28 = current.pos - m370C; mDoMtx_trans(mDoMtx_stack_c::now, m370C.x, m370C.y, m370C.z); mDoMtx_YrotM(mDoMtx_stack_c::now, pp_actor->shape_angle.y - m34D4); mDoMtx_multVec(mDoMtx_stack_c::now, &local_28, ¤t.pos); diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc index 464df5b31..39988acb6 100644 --- a/src/d/actor/d_a_player_sword.inc +++ b/src/d/actor/d_a_player_sword.inc @@ -1259,7 +1259,7 @@ BOOL daPy_lk_c::procCutTurnMove() { mVelocity *= 0.5f; } if (m34B8 == uVar5) { - dVar8 = (daPy_HIO_move_c0::m.field_0x14 * mStickDistance); + dVar8 = daPy_HIO_move_c0::m.field_0x14 * mStickDistance; } else { m34B8 = (u8)uVar5; } @@ -1277,7 +1277,7 @@ BOOL daPy_lk_c::procCutTurnMove() { } else { dVar8 = daPy_HIO_cutTurnR_c0::m.field_0x20; } - f32 dVar7 = (mVelocity / mMaxNormalSpeed); + f32 dVar7 = mVelocity / mMaxNormalSpeed; mFrameCtrlUnder[UNDER_MOVE0_e].setRate(dVar7 * dVar8); if (dVar8 >= 0.0f) { mFrameCtrlUnder[UNDER_MOVE0_e].setLoop(mFrameCtrlUnder[UNDER_MOVE0_e].getStart()); @@ -1439,7 +1439,7 @@ BOOL daPy_lk_c::procJumpCut() { /* 80159608-80159864 .text procJumpCutLand_init__9daPy_lk_cFv */ BOOL daPy_lk_c::procJumpCutLand_init() { - f32 dVar3 = (m35F0 - current.pos.y); + f32 dVar3 = m35F0 - current.pos.y; commonProcInit(daPyProc_JUMP_CUT_LAND_e); if (!dComIfGp_event_runCheck()) { if (dVar3 >= (100.0f * daPy_HIO_fall_c0::m.field_0x10)) { diff --git a/src/d/actor/d_a_player_weapon.inc b/src/d/actor/d_a_player_weapon.inc index 7d04ee5a6..9c53a3a8c 100644 --- a/src/d/actor/d_a_player_weapon.inc +++ b/src/d/actor/d_a_player_weapon.inc @@ -374,7 +374,7 @@ BOOL daPy_lk_c::procWeaponThrow() { daBoko_c* boko = static_cast(mActorKeepEquip.getActor()); s16 uVar2 = 0xf400; if (mpAttnActorLockOn != NULL) { - cXyz local_34 = (mpAttnActorLockOn->eyePos - boko->current.pos); + cXyz local_34 = mpAttnActorLockOn->eyePos - boko->current.pos; f32 dVar5 = local_34.abs(); if (dVar5 >= 1.0f) { dVar5 = local_34.absXZ();