From 537b6cfc3bc458154e84f77763877c31cbe545ff Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Mon, 3 Aug 2026 01:53:25 -0400 Subject: [PATCH] use 4 spaces for indentation instead of 2/8/etc --- include/d/actor/d_a_npc_p1.h | 12 +- src/d/actor/d_a_npc_p1.cpp | 1030 +++++++++++++++++----------------- 2 files changed, 507 insertions(+), 535 deletions(-) diff --git a/include/d/actor/d_a_npc_p1.h b/include/d/actor/d_a_npc_p1.h index 4620b7089..82d5e5fe1 100644 --- a/include/d/actor/d_a_npc_p1.h +++ b/include/d/actor/d_a_npc_p1.h @@ -23,15 +23,14 @@ class daNpc_P1_c : public fopAc_ac_c { enum { TYPE_P1A_e, TYPE_P1B_e, - TYPE_P1C_e + TYPE_P1C_e, }; public: - - bool checkAction(ActionFunc action) { return mActionFunc == action;} + bool checkAction(ActionFunc action) { return mActionFunc == action; } void setAction(ActionFunc action, void* i_param_2, int i_param_3) { - if(mActionFunc != action){ - if(mActionFunc != NULL){ + if (mActionFunc != action) { + if (mActionFunc != NULL) { mActionStatus = ACTION_ENDING_e; (this->*mActionFunc)(i_param_2); } @@ -75,7 +74,7 @@ public: /* 0x29C */ ActionFunc mPrevAction; /* 0x2A8 */ request_of_phase_process_class mPhs; /* 0x2B0 */ mDoExt_McaMorf* mpMorf; - /* 0x2B4 */ u8 pad2B4[0x2C0-0x2B4]; + /* 0x2B4 */ u8 pad2B4[0x2C0 - 0x2B4]; /* 0x2C0 */ J3DModel* mpHeadModel; /* 0x2C4 */ J3DModel* mpDoraModel; /* 0x2C8 */ J3DAnmTexPattern* mpTexture; @@ -108,7 +107,6 @@ public: /* 0x740 */ s8 m_handR_jnt_num; /* 0x741 */ bool mbAttentionFlag; /* 0x742 */ s16 mMaxLookVel; - }; #endif /* D_A_NPC_P1_H */ diff --git a/src/d/actor/d_a_npc_p1.cpp b/src/d/actor/d_a_npc_p1.cpp index 68b46b5ab..4627de83e 100644 --- a/src/d/actor/d_a_npc_p1.cpp +++ b/src/d/actor/d_a_npc_p1.cpp @@ -16,14 +16,12 @@ #include "d/d_snap.h" #include "res/Object/P1.h" - -class daNpc_P1_childHIO_c{ +class daNpc_P1_childHIO_c { public: daNpc_P1_childHIO_c(); - virtual ~daNpc_P1_childHIO_c(){}; + virtual ~daNpc_P1_childHIO_c() {} public: - /* 0x04 */ s8 unk4; /* 0x08 */ f32 mAttnYPosOffset; /* 0x0C */ s16 mMaxHeadX; @@ -33,28 +31,26 @@ public: /* 0x14 */ s16 mMaxHeadY; /* 0x16 */ s16 mMinHeadY; /* 0x18 */ s16 mMaxBackboneY; - /* 0x1A */ s16 mMinBackboneY; - /* 0x1C */ s16 mMaxTurnStep; - /* 0x1E */ s16 mLookBackTargetY; + /* 0x1A */ s16 mMinBackboneY; + /* 0x1C */ s16 mMaxTurnStep; + /* 0x1E */ s16 mLookBackTargetY; /* 0x20 */ s8 mUnused20; /* 0x24 */ f32 mMaxTalkDist; /* 0x28 */ f32 mMorfBackup; /* 0x2C */ f32 mUnused2C; }; - - -class daNpc_P1_HIO_c : public JORReflexible{ +class daNpc_P1_HIO_c : public JORReflexible { public: daNpc_P1_HIO_c(); - virtual ~daNpc_P1_HIO_c(){}; + virtual ~daNpc_P1_HIO_c() {} + public: s8 mNo; s32 m8; daNpc_P1_childHIO_c children[3]; }; - static dCcD_SrcCyl l_cyl_src = { // dCcD_SrcGObjInf { @@ -89,7 +85,6 @@ static daNpc_P1_HIO_c l_HIO; static fpc_ProcID l_msgId; static msg_class* l_msg; - /* 000000EC-00000264 .text __ct__14daNpc_P1_HIO_cFv */ daNpc_P1_HIO_c::daNpc_P1_HIO_c() { @@ -140,110 +135,99 @@ daNpc_P1_HIO_c::daNpc_P1_HIO_c() { children[2].mUnused2C = 16.0f; mNo = -1; m8 = -1; - } - /* 000002AC-000002BC .text __ct__19daNpc_P1_childHIO_cFv */ daNpc_P1_childHIO_c::daNpc_P1_childHIO_c() { - } /* 000002BC-0000051C .text setAnimFromMsg__10daNpc_P1_cFv */ void daNpc_P1_c::setAnimFromMsg() { - - if ((mAnmNum == 10 || mAnmNum == 11) && !mpMorf->checkFrame(mpMorf->getEndFrame() - 1.0f)){ + if ((mAnmNum == 10 || mAnmNum == 11) && !mpMorf->checkFrame(mpMorf->getEndFrame() - 1.0f)) { return; } - if (mAnmNum == 8 && mpMorf->checkFrame( - mpMorf->getEndFrame() - 1.0f - )) { + if (mAnmNum == 8 && mpMorf->checkFrame(mpMorf->getEndFrame() - 1.0f)) { if (--m66C <= 0) { setAnm(4, 15.0f); } - } else if (mAnmNum == 12 && mpMorf->checkFrame( - mpMorf->getEndFrame() - 1.0f - )) { + } else if (mAnmNum == 12 && mpMorf->checkFrame(mpMorf->getEndFrame() - 1.0f)) { if (--m66C <= 0) { setAnm(9, 8.0f); } } int iVar1; - switch(dComIfGp_getMesgAnimeAttrInfo()) { - case 0: - if (mType != TYPE_P1C_e) { - iVar1 = 0; - } - else { + switch (dComIfGp_getMesgAnimeAttrInfo()) { + case 0: + if (mType != TYPE_P1C_e) { + iVar1 = 0; + } else { + iVar1 = 4; + } + break; + case 1: + iVar1 = 1; + break; + case 2: + iVar1 = 2; + break; + case 3: + iVar1 = 3; + break; + case 4: + if (mType != TYPE_P1C_e) { + iVar1 = 9; + } else { + iVar1 = 4; + } + break; + case 5: + iVar1 = 10; + break; + case 6: + iVar1 = 0xb; + break; + case 7: + iVar1 = 0xc; + m66C = 4; + break; + case 8: + iVar1 = 0xd; + break; + case 9: + iVar1 = 0xe; + break; + case 10: + iVar1 = 0xf; + break; + case 0xb: + iVar1 = 0x10; + break; + case 0xc: iVar1 = 4; - } - break; - case 1: - iVar1 = 1; - break; - case 2: - iVar1 = 2; - break; - case 3: - iVar1 = 3; - break; - case 4: - if (mType != TYPE_P1C_e) { - iVar1 = 9; - } - else { - iVar1 = 4; - } - break; - case 5: - iVar1 = 10; - break; - case 6: - iVar1 = 0xb; - break; - case 7: - iVar1 = 0xc; - m66C = 4; - break; - case 8: - iVar1 = 0xd; - break; - case 9: - iVar1 = 0xe; - break; - case 10: - iVar1 = 0xf; - break; - case 0xb: - iVar1 = 0x10; - break; - case 0xc: - iVar1 = 4; - break; - case 0xd: - iVar1 = 5; - break; - case 0xe: - iVar1 = 6; - break; - case 0xf: - iVar1 = 7; - break; - case 0x10: - iVar1 = 8; - m66C= 6; - break; - default: - return; - } - dComIfGp_setMesgAnimeAttrInfo(0xFF); - setAnm(iVar1,-1.0); + break; + case 0xd: + iVar1 = 5; + break; + case 0xe: + iVar1 = 6; + break; + case 0xf: + iVar1 = 7; + break; + case 0x10: + iVar1 = 8; + m66C = 6; + break; + default: + return; + } + dComIfGp_setMesgAnimeAttrInfo(0xFF); + setAnm(iVar1, -1.0); } /* 0000051C-00000AD0 .text setAnm__10daNpc_P1_cFif */ BOOL daNpc_P1_c::setAnm(int i_anm, f32 i_morf) { - if (mAnmNum == i_anm) { return false; } @@ -258,119 +242,117 @@ BOOL daNpc_P1_c::setAnm(int i_anm, f32 i_morf) { int attr = J3DFrameCtrl::EMode_LOOP; switch (i_anm) { - case 0: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_WAIT_e); - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; - case 1: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_TALK_e); - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; - case 2: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_TALK02_e); - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; - case 3: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_TALK03_e); - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; - case 9: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_WAIT02_e); - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; - case 10: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_OMOKJ_e); - attr = J3DFrameCtrl::EMode_NONE; - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; - case 11: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_TORIKJ_e); - attr = J3DFrameCtrl::EMode_NONE; - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; - case 12: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_ANGRY_e); - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; - case 13: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_TALK04_e); - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; - case 14: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_CHECK01_e); - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; - case 15: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_CHECK02_e); - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; - case 16: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_LOOK_e); - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; - case 4: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_C_WAIT_e); - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; - case 5: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_C_TALK01_e); - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; - case 6: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_C_TALK02_e); - attr = J3DFrameCtrl::EMode_NONE; - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; - case 7: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_C_STOP_e); - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; - case 8: - anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_C_TALK01_e); - mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); - break; + case 0: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_WAIT_e); + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; + case 1: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_TALK_e); + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; + case 2: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_TALK02_e); + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; + case 3: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_TALK03_e); + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; + case 9: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_WAIT02_e); + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; + case 10: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_OMOKJ_e); + attr = J3DFrameCtrl::EMode_NONE; + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; + case 11: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_TORIKJ_e); + attr = J3DFrameCtrl::EMode_NONE; + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; + case 12: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_ANGRY_e); + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; + case 13: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_TALK04_e); + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; + case 14: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_CHECK01_e); + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; + case 15: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_CHECK02_e); + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; + case 16: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_LOOK_e); + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; + case 4: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_C_WAIT_e); + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; + case 5: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_C_TALK01_e); + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; + case 6: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_C_TALK02_e); + attr = J3DFrameCtrl::EMode_NONE; + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; + case 7: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_C_STOP_e); + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; + case 8: + anm = (J3DAnmTransform*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_C_TALK01_e); + mpMorf->setAnm(anm, attr, i_morf, 1.0f, 0.0f, -1.0f, NULL); + break; } return TRUE; } /* 00000AD0-00000DEC .text normalAction__10daNpc_P1_cFPv */ BOOL daNpc_P1_c::normalAction(void*) { - - cXyz posdiff =(dComIfGp_getPlayer(0)->current.pos - current.pos); + cXyz posdiff = (dComIfGp_getPlayer(0)->current.pos - current.pos); f32 fVar4 = posdiff.absXZ(); - if(mActionStatus == ACTION_STARTING_e){ - if(mType == TYPE_P1A_e){ - if(m671 == 1){ - if(mpMorf->checkFrame(mpMorf->getEndFrame()-1.0f)){ - setAnm(9,-1.0); - }else{ + if (mActionStatus == ACTION_STARTING_e) { + if (mType == TYPE_P1A_e) { + if (m671 == 1) { + if (mpMorf->checkFrame(mpMorf->getEndFrame() - 1.0f)) { + setAnm(9, -1.0); + } else { return FALSE; } - }else{ - setAnm(0,-1.0); + } else { + setAnm(0, -1.0); } - }else if(mType == TYPE_P1B_e){ - if(mParam == 2){ - setAnm(0xE,-1.0); - }else if(mParam == 3){ - setAnm(0x10,-1.0); - }else{ - setAnm(0,-1.0); + } else if (mType == TYPE_P1B_e) { + if (mParam == 2) { + setAnm(0xE, -1.0); + } else if (mParam == 3) { + setAnm(0x10, -1.0); + } else { + setAnm(0, -1.0); } - }else{ - setAnm(4,-1.0); + } else { + setAnm(4, -1.0); } mActionStatus += 1; - } - else if(mActionStatus != ACTION_ENDING_e){ - if(eventInfo.checkCommandTalk()){ - setAction(&daNpc_P1_c::talkAction,NULL,0); + } else if (mActionStatus != ACTION_ENDING_e) { + if (eventInfo.checkCommandTalk()) { + setAction(&daNpc_P1_c::talkAction, NULL, 0); } - if(fVar4 < l_HIO.children[mType].mMaxTalkDist){ + if (fVar4 < l_HIO.children[mType].mMaxTalkDist) { eventInfo.onCondition(dEvtMode_TALK_e); } - if(mType == TYPE_P1C_e){ - cLib_addCalcAngleS2(¤t.angle.y,home.angle.y,8,0x400); + if (mType == TYPE_P1C_e) { + cLib_addCalcAngleS2(¤t.angle.y, home.angle.y, 8, 0x400); } } return TRUE; @@ -378,35 +360,33 @@ BOOL daNpc_P1_c::normalAction(void*) { /* 00000DEC-00000F40 .text confuseAction__10daNpc_P1_cFPv */ BOOL daNpc_P1_c::confuseAction(void*) { - - if(mActionStatus == ACTION_STARTING_e){ - if(mType == TYPE_P1A_e){ - setAnm(1,-1.0); + if (mActionStatus == ACTION_STARTING_e) { + if (mType == TYPE_P1A_e) { + setAnm(1, -1.0); + mpMorf->setPlaySpeed(2.0f); + } else { + setAnm(2, -1.0); mpMorf->setPlaySpeed(2.0f); - }else{ - setAnm(2,-1.0); - mpMorf->setPlaySpeed(2.0f); } mActionStatus += 1; - } else if(mpMorf->checkFrame(mpMorf->getEndFrame()-2.0f)){ + } else if (mpMorf->checkFrame(mpMorf->getEndFrame() - 2.0f)) { m66C += 1; - if(m66C > 3){ - if(mAnmNum == 1){ - setAnm(2,-1.0f); + if (m66C > 3) { + if (mAnmNum == 1) { + setAnm(2, -1.0f); mpMorf->setPlaySpeed(2.0f); - }else{ - setAnm(1,-1.0f); + } else { + setAnm(1, -1.0f); mpMorf->setPlaySpeed(2.0f); } m66C = 0; - } + } } return TRUE; } /* 00000F40-000013A4 .text talkAction__10daNpc_P1_cFPv */ BOOL daNpc_P1_c::talkAction(void*) { - if (mActionStatus == ACTION_STARTING_e) { if (mAnmNum == 10 || mAnmNum == 11) { return 0; @@ -451,8 +431,7 @@ BOOL daNpc_P1_c::talkAction(void*) { } } else { if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0808)) { - mCurrMesg = 0x1017; - + mCurrMesg = 0x1017; } else { if (!dComIfGs_isEventBit(dSv_event_flag_c::UNK_0820)) { mCurrMesg = 0x1014; @@ -464,12 +443,10 @@ BOOL daNpc_P1_c::talkAction(void*) { } mActionStatus++; l_msgId = fpcM_ERROR_PROCESS_ID_e; - } - else if (mActionStatus != ACTION_ENDING_e) { + } else if (mActionStatus != ACTION_ENDING_e) { if (l_msgId == fpcM_ERROR_PROCESS_ID_e) { l_msgId = fopMsgM_messageSet(mCurrMesg, &eyePos); - } - else { + } else { if (mType == TYPE_P1B_e) { if (mParam != 2 && mParam != 3) { m_jnt.setTrn(); @@ -488,8 +465,7 @@ BOOL daNpc_P1_c::talkAction(void*) { if (l_msg != NULL) { mActionStatus++; } - } - else if (l_msg->mStatus == fopMsgStts_MSG_DISPLAYED_e) { + } else if (l_msg->mStatus == fopMsgStts_MSG_DISPLAYED_e) { if (getNextMsgNo(1) != -1) { l_msg->mStatus = fopMsgStts_MSG_CONTINUES_e; fopMsgM_messageSet(mCurrMesg); @@ -497,14 +473,13 @@ BOOL daNpc_P1_c::talkAction(void*) { } else { l_msg->mStatus = fopMsgStts_MSG_ENDS_e; } - } - else if (l_msg->mStatus == fopMsgStts_BOX_CLOSED_e) { + } else if (l_msg->mStatus == fopMsgStts_BOX_CLOSED_e) { if (mParam == 2) { m_jnt.onHeadLock(); } l_msg->mStatus = fopMsgStts_MSG_DESTROYED_e; - setAction(mPrevAction,NULL,0); + setAction(mPrevAction, NULL, 0); dComIfGp_event_reset(); } } @@ -514,11 +489,10 @@ BOOL daNpc_P1_c::talkAction(void*) { /* 000013A4-000017A0 .text p1c_speakAction__10daNpc_P1_cFPv */ BOOL daNpc_P1_c::p1c_speakAction(void*) { - - if(mActionStatus == ACTION_STARTING_e){ - if(!eventInfo.checkCommandTalk()){ + if (mActionStatus == ACTION_STARTING_e) { + if (!eventInfo.checkCommandTalk()) { cXyz temp1 = (dComIfGp_getPlayer(0)->current.pos - home.pos); - if(temp1.absXZ() < 200.0f){ + if (temp1.absXZ() < 200.0f) { fopAcM_orderSpeakEvent(this); eventInfo.onCondition(dEvtCnd_CANTALK_e); } @@ -529,31 +503,31 @@ BOOL daNpc_P1_c::p1c_speakAction(void*) { mActionStatus += 1; l_msg = NULL; l_msgId = -1; - }else if(mActionStatus != ACTION_ENDING_e){ - if(l_msgId == fpcM_ERROR_PROCESS_ID_e){ - l_msgId = fopMsgM_messageSet(mCurrMesg,&eyePos); - }else{ + } else if (mActionStatus != ACTION_ENDING_e) { + if (l_msgId == fpcM_ERROR_PROCESS_ID_e) { + l_msgId = fopMsgM_messageSet(mCurrMesg, &eyePos); + } else { setAnimFromMsg(); - if(l_msg == NULL){ + if (l_msg == NULL) { l_msg = fopMsgM_SearchByID(l_msgId); - }else if(l_msg->mStatus == fopMsgStts_MSG_DISPLAYED_e){ - if(getNextMsgNo(1) != -1){ + } else if (l_msg->mStatus == fopMsgStts_MSG_DISPLAYED_e) { + if (getNextMsgNo(1) != -1) { l_msg->mStatus = fopMsgStts_MSG_CONTINUES_e; fopMsgM_messageSet(mCurrMesg); - }else{ + } else { l_msg->mStatus = fopMsgStts_MSG_ENDS_e; } - }else if(l_msg->mStatus == fopMsgStts_BOX_CLOSED_e){ - setAnm(4,8.0f); - cLib_addCalcPos2(¤t.pos,home.pos,0.75f,5.0f); - cXyz posdiff = home.pos - current.pos; + } else if (l_msg->mStatus == fopMsgStts_BOX_CLOSED_e) { + setAnm(4, 8.0f); + cLib_addCalcPos2(¤t.pos, home.pos, 0.75f, 5.0f); + cXyz posdiff = home.pos - current.pos; f32 dist_xz = posdiff.absXZ(); - if( dist_xz < 1.0f){ + if (dist_xz < 1.0f) { dComIfGs_onEventBit(dSv_event_flag_c::UNK_0820); mCyl.SetR(100.0f); l_msg->mStatus = fopMsgStts_MSG_DESTROYED_e; - setAction(&daNpc_P1_c::normalAction,NULL,0); + setAction(&daNpc_P1_c::normalAction, NULL, 0); dComIfGp_event_reset(); } } @@ -564,62 +538,61 @@ BOOL daNpc_P1_c::p1c_speakAction(void*) { /* 000017A0-00001C60 .text speakAction__10daNpc_P1_cFPv */ BOOL daNpc_P1_c::speakAction(void*) { - - if(mActionStatus == ACTION_STARTING_e){ - if(mPrevMesg == 0xFAE){ + if (mActionStatus == ACTION_STARTING_e) { + if (mPrevMesg == 0xFAE) { dComIfGp_getCamera(0)->mCamera.SkipSmoother(); } - if(!eventInfo.checkCommandTalk()){ + if (!eventInfo.checkCommandTalk()) { cXyz temp1 = (dComIfGp_getPlayer(0)->current.pos - current.pos); - if(temp1.absXZ() < 400.0f){ + if (temp1.absXZ() < 400.0f) { fopAcM_orderSpeakEvent(this); eventInfo.onCondition(dEvtCnd_CANTALK_e); } return FALSE; } - if(mPrevMesg == 0xFAE){ + if (mPrevMesg == 0xFAE) { mPrevMesg = mCurrMesg; mCurrMesg = 0xFA5; - }else if(dComIfGp_getStartStage()->getPoint() == 2){ + } else if (dComIfGp_getStartStage()->getPoint() == 2) { mPrevMesg = mCurrMesg; - mCurrMesg = 0xFAA; - }else{ + mCurrMesg = 0xFAA; + } else { mPrevMesg = mCurrMesg; mCurrMesg = 0xFA1; } mActionStatus += 1; l_msgId = fpcM_ERROR_PROCESS_ID_e; - }else if(mActionStatus != ACTION_ENDING_e){ - if(l_msgId == fpcM_ERROR_PROCESS_ID_e){ - l_msgId = fopMsgM_messageSet(mCurrMesg,&eyePos); - }else{ + } else if (mActionStatus != ACTION_ENDING_e) { + if (l_msgId == fpcM_ERROR_PROCESS_ID_e) { + l_msgId = fopMsgM_messageSet(mCurrMesg, &eyePos); + } else { m_jnt.setTrn(); setAnimFromMsg(); - if(mActionStatus == ACTION_ONGOING_e){ - if(mCurrMesg == 0xFA5){ + if (mActionStatus == ACTION_ONGOING_e) { + if (mCurrMesg == 0xFA5) { dComIfGp_getCamera(0)->mCamera.SkipSmoother(); } l_msg = fopMsgM_SearchByID(l_msgId); - if(l_msg != NULL){ + if (l_msg != NULL) { mActionStatus += 1; } - }else if(l_msg->mStatus == fopMsgStts_MSG_DISPLAYED_e){ - if(getNextMsgNo(1) != -1){ + } else if (l_msg->mStatus == fopMsgStts_MSG_DISPLAYED_e) { + if (getNextMsgNo(1) != -1) { l_msg->mStatus = fopMsgStts_MSG_CONTINUES_e; fopMsgM_messageSet(mCurrMesg); - }else{ + } else { l_msg->mStatus = fopMsgStts_MSG_ENDS_e; } - }else if(l_msg->mStatus == fopMsgStts_BOX_CLOSED_e){ + } else if (l_msg->mStatus == fopMsgStts_BOX_CLOSED_e) { l_msg->mStatus = fopMsgStts_MSG_DESTROYED_e; - setAction(&daNpc_P1_c::normalAction,NULL,0); - if(mPrevMesg == 0xFA4){ + setAction(&daNpc_P1_c::normalAction, NULL, 0); + if (mPrevMesg == 0xFA4) { dComIfGp_event_reset(); - fopAcM_orderOtherEvent2(this,"sea_exp_cam",dEvtFlag_NOPARTNER_e); + fopAcM_orderOtherEvent2(this, "sea_exp_cam", dEvtFlag_NOPARTNER_e); eventInfo.onCondition(dEvtCnd_UNK2_e); - setAction(&daNpc_P1_c::explainAction,NULL,0); - }else{ - dComIfGp_setNextStage("Ocean",1,fopAcM_GetRoomNo(this)); + setAction(&daNpc_P1_c::explainAction, NULL, 0); + } else { + dComIfGp_setNextStage("Ocean", 1, fopAcM_GetRoomNo(this)); } } } @@ -629,10 +602,9 @@ BOOL daNpc_P1_c::speakAction(void*) { /* 00001C60-00001CD4 .text explainAction__10daNpc_P1_cFPv */ BOOL daNpc_P1_c::explainAction(void*) { - - if(mActionStatus == ACTION_STARTING_e){ + if (mActionStatus == ACTION_STARTING_e) { mActionStatus += 1; - }else if(mActionStatus == ACTION_ENDING_e && !eventInfo.checkCommandTalk()){ + } else if (mActionStatus == ACTION_ENDING_e && !eventInfo.checkCommandTalk()) { fopAcM_orderSpeakEvent(this); eventInfo.onCondition(dEvtCnd_CANTALK_e); return FALSE; @@ -642,7 +614,6 @@ BOOL daNpc_P1_c::explainAction(void*) { /* 00001CD4-00001DE8 .text getNextMsgNo__10daNpc_P1_cFi */ u32 daNpc_P1_c::getNextMsgNo(int i_param_1) { - u32 o_retval; switch (mCurrMesg) { case 0xC94: @@ -696,13 +667,12 @@ u32 daNpc_P1_c::getNextMsgNo(int i_param_1) { /* 00001DE8-00001E70 .text playTexPatternAnm__10daNpc_P1_cFv */ BOOL daNpc_P1_c::playTexPatternAnm() { - - if(!cLib_calcTimer(&mBlinkTimer)){ + if (!cLib_calcTimer(&mBlinkTimer)) { mBlinkFrame += 1; - if(mBlinkFrame >= mpTexture->getFrameMax()){ + if (mBlinkFrame >= mpTexture->getFrameMax()) { mBlinkFrame -= mpTexture->getFrameMax(); s16 rng = cM_rndF(100.0f); - mBlinkTimer = rng + 0x1E; + mBlinkTimer = rng + 0x1E; } } return TRUE; @@ -710,21 +680,20 @@ BOOL daNpc_P1_c::playTexPatternAnm() { /* 00001E70-00002098 .text demo_end_init__10daNpc_P1_cFv */ void daNpc_P1_c::demo_end_init() { - - if(mParam == 0){ + if (mParam == 0) { mAnmNum = -1; ActionFunc local_48 = &daNpc_P1_c::confuseAction; bool compare = mActionFunc == local_48; //TODO: unused comparison? - if(mActionFunc != NULL){ - mActionStatus = ACTION_ENDING_e; - (this->*mActionFunc)(0); + if (mActionFunc != NULL) { + mActionStatus = ACTION_ENDING_e; + (this->*mActionFunc)(0); } mPrevAction = mActionFunc; mActionFunc = local_48; mActionStatus = ACTION_STARTING_e; (this->*mActionFunc)(NULL); fopAc_ac_c* actor = fopAcM_SearchByName(fpcNm_Obj_Pirateship_e); - if(actor){ + if (actor) { current.pos = actor->current.pos; current.pos.y += 700.0f; current.pos.x += cM_ssin(actor->current.angle.y) * 950.0f; @@ -743,10 +712,9 @@ void daNpc_P1_c::demo_end_init() { /* 00002098-000021E0 .text demo_move__10daNpc_P1_cFv */ BOOL daNpc_P1_c::demo_move() { - dDemo_actor_c* actor = dComIfGp_demo_getActor(this->demoActorID); - if(!actor){ - if(m670 == 1){ + if (!actor) { + if (m670 == 1) { demo_end_init(); } return FALSE; @@ -755,46 +723,53 @@ BOOL daNpc_P1_c::demo_move() { m_jnt.onBackBoneLock(); m670 = 1; J3DAnmTexPattern* btp = actor->getP_BtpData("P1"); - if(btp){ - mBtp.init(mpHeadModel->getModelData(),btp,1,J3DFrameCtrl::EMode_LOOP,1.0f,0,-1,true,FALSE); + if (btp) { + mBtp.init(mpHeadModel->getModelData(), btp, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE); mBlinkFrame = 0; } - if(mBtp.getBtpAnm()){ + if (mBtp.getBtpAnm()) { u8 uVar1 = mBtp.getBtpAnm()->getFrameMax(); mBlinkFrame += 1; - if(mBlinkFrame >= uVar1){ + if (mBlinkFrame >= uVar1) { mBlinkFrame = uVar1; } } #if VERSION > VERSION_DEMO - dDemo_setDemoData(this, + dDemo_setDemoData( + this, dDemo_actor_c::ENABLE_TRANS_e | dDemo_actor_c::ENABLE_ROTATE_e | dDemo_actor_c::ENABLE_ANM_e | dDemo_actor_c::ENABLE_ANM_FRAME_e, - mpMorf,"P1",NULL,NULL,dBgS_GetGndMtrlSndId_Func(current.pos,10.0f)); + mpMorf, + "P1", + NULL, + NULL, + dBgS_GetGndMtrlSndId_Func(current.pos, 10.0f) + ); #else - dDemo_setDemoData(this, + dDemo_setDemoData( + this, dDemo_actor_c::ENABLE_TRANS_e | dDemo_actor_c::ENABLE_ROTATE_e | dDemo_actor_c::ENABLE_ANM_e | dDemo_actor_c::ENABLE_ANM_FRAME_e, - mpMorf,"P1"); + mpMorf, + "P1" + ); #endif - return TRUE; + return TRUE; } /* 000021E0-00002244 .text event_move__10daNpc_P1_cFv */ BOOL daNpc_P1_c::event_move() { - - if(mEventCut6B0.cutProc()){ + if (mEventCut6B0.cutProc()) { mbAttentionFlag = mEventCut6B0.getAttnFlag(); - if(mEventCut6B0.getAttnFlag() == 0){ + if (mEventCut6B0.getAttnFlag() == 0) { mEventCut6B0.setAttnFlag(mbAttentionFlag); } return TRUE; - }else{ + } else { return privateCut(); } } /* 00002244-000022E8 .text evn_setAnm_init__10daNpc_P1_cFi */ BOOL daNpc_P1_c::evn_setAnm_init(int i_staff_id) { - int* idx_p = dComIfGp_evmng_getMyIntegerP(i_staff_id, "idx"); if (idx_p != NULL) { setAnm(*idx_p, -1.0f); @@ -808,13 +783,12 @@ BOOL daNpc_P1_c::evn_setAnm_init(int i_staff_id) { /* 000022E8-00002364 .text evn_talk_init__10daNpc_P1_cFi */ BOOL daNpc_P1_c::evn_talk_init(int i_staff_id) { - int* mesg_no_p = dComIfGp_evmng_getMyIntegerP(i_staff_id, "MsgNo"); l_msgId = fpcM_ERROR_PROCESS_ID_e; l_msg = NULL; - if(mesg_no_p != NULL){ + if (mesg_no_p != NULL) { mCurrMesg = *mesg_no_p; - }else{ + } else { mCurrMesg = 0; } return TRUE; @@ -822,61 +796,54 @@ BOOL daNpc_P1_c::evn_talk_init(int i_staff_id) { /* 00002364-00002464 .text evn_talk__10daNpc_P1_cFv */ BOOL daNpc_P1_c::evn_talk() { - - if (l_msgId == fpcM_ERROR_PROCESS_ID_e) { - l_msgId = fopMsgM_messageSet(mCurrMesg,&eyePos); - } - else if (l_msg == NULL) { - l_msg = fopMsgM_SearchByID(l_msgId); - } - else if (l_msg->mStatus == fopMsgStts_MSG_DISPLAYED_e) { - if (getNextMsgNo(true) != -1) { - l_msg->mStatus = fopMsgStts_MSG_CONTINUES_e; - fopMsgM_messageSet(mCurrMesg); + if (l_msgId == fpcM_ERROR_PROCESS_ID_e) { + l_msgId = fopMsgM_messageSet(mCurrMesg, &eyePos); + } else if (l_msg == NULL) { + l_msg = fopMsgM_SearchByID(l_msgId); + } else if (l_msg->mStatus == fopMsgStts_MSG_DISPLAYED_e) { + if (getNextMsgNo(true) != -1) { + l_msg->mStatus = fopMsgStts_MSG_CONTINUES_e; + fopMsgM_messageSet(mCurrMesg); + } else { + l_msg->mStatus = fopMsgStts_MSG_ENDS_e; + } + } else if (l_msg->mStatus == fopMsgStts_BOX_CLOSED_e) { + l_msg->mStatus = fopMsgStts_MSG_DESTROYED_e; + l_msg = NULL; + l_msgId = fpcM_ERROR_PROCESS_ID_e; + return TRUE; } - else { - l_msg->mStatus = fopMsgStts_MSG_ENDS_e; - } - } - else if (l_msg->mStatus == fopMsgStts_BOX_CLOSED_e) { - l_msg->mStatus = fopMsgStts_MSG_DESTROYED_e; - l_msg = NULL; - l_msgId = fpcM_ERROR_PROCESS_ID_e; - return TRUE; - } - return FALSE; + return FALSE; } - /* 00002464-000027AC .text minigameExplainCut__10daNpc_P1_cFv */ BOOL daNpc_P1_c::minigameExplainCut() { - - static char* ActionNames[] = {"4013_msg","4014_msg"}; + static char* ActionNames[] = {"4013_msg", "4014_msg"}; int staffId = dComIfGp_evmng_getMyStaffId(mEventCut6B0.getActorName(), NULL); - int actIdx = dComIfGp_evmng_getMyActIdx(staffId,ActionNames,ARRAY_SSIZE(ActionNames),1,0); + int actIdx = dComIfGp_evmng_getMyActIdx(staffId, ActionNames, ARRAY_SSIZE(ActionNames), 1, 0); if (staffId == -1) { mbAttentionFlag = 0; return 0; } - if(m65A == 0){ - l_msgId = fpcM_ERROR_PROCESS_ID_e; - dComIfGp_onCameraAttentionStatus(0,4); - mPrevMesg = mCurrMesg; - mCurrMesg = 0xFAD; - m65A++; - }else if(m65A != -1){ + if (m65A == 0) { + l_msgId = fpcM_ERROR_PROCESS_ID_e; + dComIfGp_onCameraAttentionStatus(0, 4); + mPrevMesg = mCurrMesg; + mCurrMesg = 0xFAD; + m65A++; + } else if (m65A != -1) { if (l_msgId == fpcM_ERROR_PROCESS_ID_e) { l_msgId = fopMsgM_messageSet(mCurrMesg, &eyePos); - }else{ - if (m65A == 1){ + } else { + if (m65A == 1) { l_msg = fopMsgM_SearchByID(l_msgId); if (l_msg != NULL) { m65A++; - } - } else{ - if(l_msg->mStatus == fopMsgStts_MSG_DISPLAYED_e){ + } + } else { + if (l_msg->mStatus == fopMsgStts_MSG_DISPLAYED_e) { if (mCurrMesg == 0xFAD) { l_msg->mStatus = fopMsgStts_MSG_CONTINUES_e; @@ -888,21 +855,21 @@ BOOL daNpc_P1_c::minigameExplainCut() { mCurrMesg = -1; l_msg->mStatus = fopMsgStts_MSG_ENDS_e; } - }else if(l_msg->mStatus == fopMsgStts_BOX_CLOSED_e){ + } else if (l_msg->mStatus == fopMsgStts_BOX_CLOSED_e) { if (actIdx == 1) { dComIfGp_evmng_cutEnd(staffId); } l_msg->mStatus = fopMsgStts_MSG_DESTROYED_e; - dComIfGp_offCameraAttentionStatus(0,4); + dComIfGp_offCameraAttentionStatus(0, 4); - }else if (dComIfGp_checkMesgSendButton() && actIdx == 0) { + } else if (dComIfGp_checkMesgSendButton() && actIdx == 0) { dComIfGp_evmng_cutEnd(staffId); } } - if(checkAction(&daNpc_P1_c::explainAction)){ - if(dComIfGp_evmng_endCheck("sea_exp_cam")){ + if (checkAction(&daNpc_P1_c::explainAction)) { + if (dComIfGp_evmng_endCheck("sea_exp_cam")) { - setAction(&daNpc_P1_c::speakAction,NULL,0); + setAction(&daNpc_P1_c::speakAction, NULL, 0); dComIfGp_event_reset(); dComIfGp_getCamera(0)->mCamera.SkipSmoother(); fopAcM_orderSpeakEvent(this); @@ -916,31 +883,31 @@ BOOL daNpc_P1_c::minigameExplainCut() { /* 000027AC-00002920 .text privateCut__10daNpc_P1_cFv */ BOOL daNpc_P1_c::privateCut() { - - static char* cut_name_tbl[] = {"4013_msg","4014_msg","SETANM","HEADSWING","TALKMSG"}; + + static char* cut_name_tbl[] = {"4013_msg", "4014_msg", "SETANM", "HEADSWING", "TALKMSG"}; int staffIdx = dComIfGp_evmng_getMyStaffId(mEventCut6B0.getActorName()); - if(staffIdx == -1){ + if (staffIdx == -1) { return FALSE; } - int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx,cut_name_tbl,ARRAY_SSIZE(cut_name_tbl),true,0); - if(actIdx == -1){ + int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, cut_name_tbl, ARRAY_SSIZE(cut_name_tbl), true, 0); + if (actIdx == -1) { dComIfGp_evmng_cutEnd(staffIdx); - }else{ + } else { int iVar4 = 0; - if(dComIfGp_evmng_getIsAddvance(staffIdx)){ - switch(actIdx){ + if (dComIfGp_evmng_getIsAddvance(staffIdx)) { + switch (actIdx) { case 2: evn_setAnm_init(staffIdx); break; case 3: - mHeadAnm.swing_vertical_init(2,0x1000,0x800,1); + mHeadAnm.swing_vertical_init(2, 0x1000, 0x800, 1); break; case 4: evn_talk_init(staffIdx); } } - switch(actIdx){ + switch (actIdx) { case 0: case 1: minigameExplainCut(); @@ -954,7 +921,7 @@ BOOL daNpc_P1_c::privateCut() { iVar4 = 1; break; } - if(iVar4 != 0){ + if (iVar4 != 0) { dComIfGp_evmng_cutEnd(staffIdx); } } @@ -963,27 +930,26 @@ BOOL daNpc_P1_c::privateCut() { /* 00002920-00002A7C .text nodeCallBack1__FP7J3DNodei */ static BOOL nodeCallBack1(J3DNode* i_node, int i_param_2) { - - if(i_param_2 == J3DNodeCBCalcTiming_In){ + if (i_param_2 == J3DNodeCBCalcTiming_In) { J3DModel* model = j3dSys.getModel(); J3DJoint* joint = (J3DJoint*)i_node; daNpc_P1_c* i_this = (daNpc_P1_c*)model->getUserArea(); s32 jntNo = joint->getJntNo(); - if(i_this){ - MTXCopy(model->getAnmMtx(jntNo),*calc_mtx); - if(jntNo == i_this->m_jnt.getHeadJntNum()){ - cXyz local_28(REG10_F(0),REG10_F(1),REG10_F(2)); - cMtx_YrotM(*calc_mtx,-i_this->m_jnt.getHead_y() - i_this->mHeadAnm.field_0x02); - cMtx_ZrotM(*calc_mtx,-i_this->m_jnt.getHead_x() - i_this->mHeadAnm.field_0x00); - MtxPosition(&local_28,&i_this->eyePos); + if (i_this) { + MTXCopy(model->getAnmMtx(jntNo), *calc_mtx); + if (jntNo == i_this->m_jnt.getHeadJntNum()) { + cXyz local_28(REG10_F(0), REG10_F(1), REG10_F(2)); + cMtx_YrotM(*calc_mtx, -i_this->m_jnt.getHead_y() - i_this->mHeadAnm.field_0x02); + cMtx_ZrotM(*calc_mtx, -i_this->m_jnt.getHead_x() - i_this->mHeadAnm.field_0x00); + MtxPosition(&local_28, &i_this->eyePos); } - if(jntNo == i_this->m_jnt.getBackboneJntNum()){ - mDoMtx_XrotM(*calc_mtx,i_this->m_jnt.getBackbone_y()); - mDoMtx_ZrotM(*calc_mtx,i_this->m_jnt.getBackbone_x()); + if (jntNo == i_this->m_jnt.getBackboneJntNum()) { + mDoMtx_XrotM(*calc_mtx, i_this->m_jnt.getBackbone_y()); + mDoMtx_ZrotM(*calc_mtx, i_this->m_jnt.getBackbone_x()); } - model->setAnmMtx(jntNo,*calc_mtx); - cMtx_copy(*calc_mtx,J3DSys::mCurrentMtx); + model->setAnmMtx(jntNo, *calc_mtx); + cMtx_copy(*calc_mtx, J3DSys::mCurrentMtx); } } return TRUE; @@ -996,7 +962,6 @@ static BOOL daNpc_P1_Draw(daNpc_P1_c* i_this) { /* 00002A9C-00002ABC .text CheckCreateHeap__FP10fopAc_ac_c */ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { - return ((daNpc_P1_c*)i_this)->CreateHeap(); } @@ -1009,44 +974,44 @@ BOOL daNpc_P1_c::setAttentionPos(cXyz* i_param_1) { /* 00002B00-00003484 .text _create__10daNpc_P1_cFv */ cPhs_State daNpc_P1_c::_create() { - fopAcM_ct_Retail(this, daNpc_P1_c); cPhs_State state = dComIfG_resLoad(&mPhs, "P1"); if (state == cPhs_COMPLEATE_e) { - fopAcM_ct_Demo(this, daNpc_P1_c) - u32 param_bit = fopAcM_GetParamBit(fopAcM_GetParam(this),0x14,4); + fopAcM_ct_Demo(this, daNpc_P1_c); + u32 param_bit = fopAcM_GetParamBit(fopAcM_GetParam(this), 0x14, 4); mParam = fopAcM_GetParam(this); - if(param_bit == 0){ + if (param_bit == 0) { mType = TYPE_P1A_e; - if(mParam == 2){ + if (mParam == 2) { m671 = 1; m_jnt.onBackBoneLock(); mKajiId = getKajiID(); - }else{ + } else { m671 = 0; } - mEventCut6B0.setActorInfo("P1a",this); - }else if( param_bit == 1){ + mEventCut6B0.setActorInfo("P1a", this); + } else if (param_bit == 1) { mType = TYPE_P1B_e; m671 = 0; - mEventCut6B0.setActorInfo("P1b",this); - }else{ + mEventCut6B0.setActorInfo("P1b", this); + } else { mType = TYPE_P1C_e; m671 = 0; - mEventCut6B0.setActorInfo("P1c",this); + mEventCut6B0.setActorInfo("P1c", this); } mEventCut6B0.setJntCtrlPtr(&m_jnt); u32 max_heap_size; - switch(mType){ + switch (mType) { case TYPE_P1A_e: max_heap_size = 0x25C0; break; case TYPE_P1B_e: - if(strcmp(dComIfGp_getStartStageName(), "sea") == 0 && - fopAcM_GetRoomNo(this) == dIsleRoom_OutsetIsland_e && - dComIfGp_getStartStageLayer() == 0xA){ + if (strcmp(dComIfGp_getStartStageName(), "sea") == 0 && + fopAcM_GetRoomNo(this) == dIsleRoom_OutsetIsland_e && + dComIfGp_getStartStageLayer() == 0xA) + { max_heap_size = 0x25C0; - }else{ + } else { max_heap_size = 0x2120; } break; @@ -1057,17 +1022,17 @@ cPhs_State daNpc_P1_c::_create() { max_heap_size = 0x15000; break; } - if(!fopAcM_entrySolidHeap(this,CheckCreateHeap,max_heap_size)){ + if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, max_heap_size)) { return cPhs_ERROR_e; } cullMtx = mpMorf->getModel()->getBaseTRMtx(); gravity = -9.0f; attention_info.flags = fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_SPEAK_e; - if(l_HIO.m8 < 0){ - l_HIO.mNo = mDoHIO_createChild("海賊下っ端",&l_HIO); //Pirate underlings + if (l_HIO.m8 < 0) { + l_HIO.mNo = mDoHIO_createChild("海賊下っ端", &l_HIO); //Pirate underlings } l_HIO.m8 += 1; - mStts.Init(0xFF,0xFF,this); + mStts.Init(0xFF, 0xFF, this); mCyl.Set(l_cyl_src); mCyl.SetStts(&mStts); mAnmNum = -1; @@ -1075,49 +1040,49 @@ cPhs_State daNpc_P1_c::_create() { m670 = 0; mKajiTimer = 300; - if(mType == TYPE_P1B_e){ + if (mType == TYPE_P1B_e) { attention_info.distances[1] = 0xAA; attention_info.distances[3] = 0xAA; u8 type = mParam; - if(mParam == 1){ - if(dComIfGp_getStartStagePoint() == 0 || dComIfGp_getStartStagePoint() == 2){ - setAction(&daNpc_P1_c::speakAction,NULL,0); + if (mParam == 1) { + if (dComIfGp_getStartStagePoint() == 0 || dComIfGp_getStartStagePoint() == 2) { + setAction(&daNpc_P1_c::speakAction, NULL, 0); } - }else if(type == 0){ - setAction(&daNpc_P1_c::confuseAction,NULL,0); - }else { - if(type == 2){ - m_jnt.onBackBoneLock(); - m_jnt.onHeadLock(); - mCyl.SetR(90.0f); - }else if(type == 3){ - m_jnt.onBackBoneLock(); - m_jnt.onHeadLock(); - } - setAction(&daNpc_P1_c::normalAction,NULL,0); + } else if (type == 0) { + setAction(&daNpc_P1_c::confuseAction, NULL, 0); + } else { + if (type == 2) { + m_jnt.onBackBoneLock(); + m_jnt.onHeadLock(); + mCyl.SetR(90.0f); + } else if (type == 3) { + m_jnt.onBackBoneLock(); + m_jnt.onHeadLock(); + } + setAction(&daNpc_P1_c::normalAction, NULL, 0); } - }else if(mType == TYPE_P1C_e){ + } else if (mType == TYPE_P1C_e) { attention_info.distances[1] = 0xAA; - attention_info.distances[3] = 0xAA; - if(!dComIfGs_isEventBit(0x820) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0808)){ + attention_info.distances[3] = 0xAA; + if (!dComIfGs_isEventBit(0x820) && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0808)) { current.pos.x -= cM_scos(current.angle.y) * 40.0f; current.pos.z += cM_ssin(current.angle.y) * 40.0f; - setAnm(4,-1.0f); - setAction(&daNpc_P1_c::p1c_speakAction,NULL,0); - }else{ - setAction(&daNpc_P1_c::normalAction,NULL,0); + setAnm(4, -1.0f); + setAction(&daNpc_P1_c::p1c_speakAction, NULL, 0); + } else { + setAction(&daNpc_P1_c::normalAction, NULL, 0); } mCyl.SetR(100.0f); - }else{ + } else { attention_info.distances[1] = 0xAB; attention_info.distances[3] = 0xAB; - if(m671 != 0){ - setAnm(9,0.0f); + if (m671 != 0) { + setAnm(9, 0.0f); mCyl.SetR(REG10_F(5) + 90.0f); } - setAction(&daNpc_P1_c::normalAction,NULL,0); + setAction(&daNpc_P1_c::normalAction, NULL, 0); } - if(mType == TYPE_P1B_e && mParam == 1 && dComIfGp_getStartStagePoint() == 1){ + if (mType == TYPE_P1B_e && mParam == 1 && dComIfGp_getStartStagePoint() == 1) { return cPhs_ERROR_e; } } @@ -1126,9 +1091,22 @@ cPhs_State daNpc_P1_c::_create() { /* 00003834-00003D6C .text CreateHeap__10daNpc_P1_cFv */ BOOL daNpc_P1_c::CreateHeap() { - - J3DModelData* model_data_p = static_cast(dComIfG_getObjectRes("P1",dRes_INDEX_P1_BDL_P1_e)); - mpMorf = new mDoExt_McaMorf(model_data_p,NULL,NULL,static_cast(dComIfG_getObjectRes("P1",dRes_INDEX_P1_BCK_WAIT_e)),J3DFrameCtrl::EMode_LOOP,1.0f,0,-1,1,NULL,0x80000,0x11020002);; + J3DModelData* model_data_p = static_cast(dComIfG_getObjectRes("P1", dRes_INDEX_P1_BDL_P1_e)); + mpMorf = new mDoExt_McaMorf( + model_data_p, + NULL, + NULL, + static_cast(dComIfG_getObjectRes("P1", dRes_INDEX_P1_BCK_WAIT_e)), + J3DFrameCtrl::EMode_LOOP, + 1.0f, + 0, + -1, + 1, + NULL, + 0x80000, + 0x11020002 + ); + ; if (!mpMorf || !mpMorf->getModel()) { return FALSE; } @@ -1136,52 +1114,53 @@ BOOL daNpc_P1_c::CreateHeap() { mDoMtx_stack_c::YrotM(current.angle.y); mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); m_jnt.setHeadJntNum(model_data_p->getJointName()->getIndex("head")); - JUT_ASSERT(DEMO_SELECT(0x634,0x639),m_jnt.getHeadJntNum() >= 0); + JUT_ASSERT(DEMO_SELECT(0x634, 0x639), m_jnt.getHeadJntNum() >= 0); m_jnt.setBackboneJntNum(model_data_p->getJointName()->getIndex("backbone")); - JUT_ASSERT(DEMO_SELECT(0x639,0x63E),m_jnt.getBackboneJntNum() >= 0); + JUT_ASSERT(DEMO_SELECT(0x639, 0x63E), m_jnt.getBackboneJntNum() >= 0); m_handR_jnt_num = model_data_p->getJointName()->getIndex("handR"); - JUT_ASSERT(DEMO_SELECT(0x63C,0x641),m_handR_jnt_num >= 0); + JUT_ASSERT(DEMO_SELECT(0x63C, 0x641), m_handR_jnt_num >= 0); J3DModelData* head_model_data_p; - if(mType == TYPE_P1A_e){ - head_model_data_p = static_cast(dComIfG_getObjectRes("P1",dRes_INDEX_P1_BDL_P1A_HEAD_e)); - mpTexture = static_cast(dComIfG_getObjectRes("P1",dRes_INDEX_P1_BTP_MABA_A_e)); - }else if(mType == TYPE_P1B_e){ - head_model_data_p = static_cast(dComIfG_getObjectRes("P1",dRes_INDEX_P1_BDL_P1B_HEAD_e)); - mpTexture = static_cast(dComIfG_getObjectRes("P1",dRes_INDEX_P1_BTP_MABA_B_e)); - }else{ - head_model_data_p = static_cast(dComIfG_getObjectRes("P1",dRes_INDEX_P1_BDL_P1C_HEAD_e)); - mpTexture = static_cast(dComIfG_getObjectRes("P1",dRes_INDEX_P1_BTP_MABA_C_e)); + if (mType == TYPE_P1A_e) { + head_model_data_p = static_cast(dComIfG_getObjectRes("P1", dRes_INDEX_P1_BDL_P1A_HEAD_e)); + mpTexture = static_cast(dComIfG_getObjectRes("P1", dRes_INDEX_P1_BTP_MABA_A_e)); + } else if (mType == TYPE_P1B_e) { + head_model_data_p = static_cast(dComIfG_getObjectRes("P1", dRes_INDEX_P1_BDL_P1B_HEAD_e)); + mpTexture = static_cast(dComIfG_getObjectRes("P1", dRes_INDEX_P1_BTP_MABA_B_e)); + } else { + head_model_data_p = static_cast(dComIfG_getObjectRes("P1", dRes_INDEX_P1_BDL_P1C_HEAD_e)); + mpTexture = static_cast(dComIfG_getObjectRes("P1", dRes_INDEX_P1_BTP_MABA_C_e)); } - J3DAnmTexPattern* dummy_tex_all_p = static_cast(dComIfG_getObjectRes("P1",dRes_INDEX_P1_BTP_P1A_DUMMY_TEX_ALL_e)); - mpHeadModel = mDoExt_J3DModel__create(head_model_data_p,0x80000,0x11020002); - if(mpTexture == NULL){ + J3DAnmTexPattern* dummy_tex_all_p = static_cast(dComIfG_getObjectRes("P1", dRes_INDEX_P1_BTP_P1A_DUMMY_TEX_ALL_e)); + mpHeadModel = mDoExt_J3DModel__create(head_model_data_p, 0x80000, 0x11020002); + if (mpTexture == NULL) { return FALSE; } #if VERSION == VERSION_DEMO - mBtp.init(head_model_data_p,dummy_tex_all_p,TRUE,J3DFrameCtrl::EMode_LOOP); + mBtp.init(head_model_data_p, dummy_tex_all_p, TRUE, J3DFrameCtrl::EMode_LOOP); #else - if(!mBtp.init(head_model_data_p,dummy_tex_all_p,TRUE,J3DFrameCtrl::EMode_LOOP)){ + if (!mBtp.init(head_model_data_p, dummy_tex_all_p, TRUE, J3DFrameCtrl::EMode_LOOP)) { return FALSE; } #endif - mBtp.init(head_model_data_p,mpTexture,TRUE,J3DFrameCtrl::EMode_LOOP, 1.0f,0,-1,true,FALSE); - if(mType == TYPE_P1B_e && strcmp(dComIfGp_getStartStageName(), "sea") == 0 && - fopAcM_GetRoomNo(this) == dIsleRoom_OutsetIsland_e && dComIfGp_getStartStageLayer() == 0xA){ - mpDoraModel = mDoExt_J3DModel__create(static_cast(dComIfG_getObjectRes("P1",dRes_INDEX_P1_BDL_DORA_STICK_e)),0x80000,0x11000002); - if(mpDoraModel == NULL){ + mBtp.init(head_model_data_p, mpTexture, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE); + if (mType == TYPE_P1B_e && strcmp(dComIfGp_getStartStageName(), "sea") == 0 && fopAcM_GetRoomNo(this) == dIsleRoom_OutsetIsland_e && + dComIfGp_getStartStageLayer() == 0xA) + { + mpDoraModel = mDoExt_J3DModel__create(static_cast(dComIfG_getObjectRes("P1", dRes_INDEX_P1_BDL_DORA_STICK_e)), 0x80000, 0x11000002); + if (mpDoraModel == NULL) { return FALSE; } - }else{ + } else { mpDoraModel = NULL; } - J3DJointTree& tree = model_data_p->getJointTree(); + J3DJointTree& tree = model_data_p->getJointTree(); for (u16 i = 0; i < tree.getJointNum(); i += 1) { if ((i == m_jnt.getHeadJntNum()) || (i == m_jnt.getBackboneJntNum())) { model_data_p->getJointNodePointer(i)->setCallBack(nodeCallBack1); } } mpMorf->getModel()->setUserArea((u32)this); - mAcchCir.SetWall(30.0f,0.0f); + mAcchCir.SetWall(30.0f, 0.0f); mObjAcch.Set( fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), @@ -1190,26 +1169,25 @@ BOOL daNpc_P1_c::CreateHeap() { &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), - fopAcM_GetShapeAngle_p(this)); - if(mType == TYPE_P1B_e){ - if(mParam == 3){ + fopAcM_GetShapeAngle_p(this) + ); + if (mType == TYPE_P1B_e) { + if (mParam == 3) { mObjAcch.SetWallNone(); - } - } + } return TRUE; } /* 00003D6C-00003DF8 .text _delete__10daNpc_P1_cFv */ BOOL daNpc_P1_c::_delete() { - dComIfG_resDeleteDemo(&mPhs, "P1"); if (DEMO_SELECT(TRUE, heap) && mpMorf) { mpMorf->stopZelAnime(); } - if(l_HIO.m8 >= 0){ + if (l_HIO.m8 >= 0) { l_HIO.m8 -= 1; - if(l_HIO.m8 < 0){ + if (l_HIO.m8 < 0) { mDoHIO_deleteChild(l_HIO.mNo); } } @@ -1218,12 +1196,11 @@ BOOL daNpc_P1_c::_delete() { /* 00003DF8-00003E70 .text getKajiID__10daNpc_P1_cFv */ fpc_ProcID daNpc_P1_c::getKajiID() { - fpc_ProcID kaji_id = 0xFFFFFFFF; fpc_ProcID parent_id = parentActorID; - if(parent_id != fpcM_ERROR_PROCESS_ID_e){ + if (parent_id != fpcM_ERROR_PROCESS_ID_e) { daObjPirateship::Act_c* actor = (daObjPirateship::Act_c*)fopAcM_SearchByID(parent_id); - if(fopAc_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_Obj_Pirateship_e){ + if (fopAc_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_Obj_Pirateship_e) { kaji_id = actor->getKajiID(); } } @@ -1232,52 +1209,50 @@ fpc_ProcID daNpc_P1_c::getKajiID() { /* 00003E70-000043CC .text kaji_anm__10daNpc_P1_cFv */ BOOL daNpc_P1_c::kaji_anm() { - - if(m671 != 0){ - if(mAnmNum == 0xA || mAnmNum == 0xB){ - if(mpMorf->checkFrame(mpMorf->getEndFrame()-1.0f)){ - setAnm(9,-1.0f); + if (m671 != 0) { + if (mAnmNum == 0xA || mAnmNum == 0xB) { + if (mpMorf->checkFrame(mpMorf->getEndFrame() - 1.0f)) { + setAnm(9, -1.0f); mKajiTimer = 300; - }else if(mpMorf->checkFrame(30.0f)){ - fopAcM_seStart(this,JA_SE_OBJ_PIRATE_WHEEL,0); - } - }else if(mKajiTimer-- < 0){ - if(mpMorf->checkFrame(mpMorf->getEndFrame()-1.0f)){ - if(!checkAction(&daNpc_P1_c::talkAction)){ - if(cM_rndF(1.0f) > 0.5f){ - setAnm(0xA,-1.0f); + } else if (mpMorf->checkFrame(30.0f)) { + fopAcM_seStart(this, JA_SE_OBJ_PIRATE_WHEEL, 0); + } + } else if (mKajiTimer-- < 0) { + if (mpMorf->checkFrame(mpMorf->getEndFrame() - 1.0f)) { + if (!checkAction(&daNpc_P1_c::talkAction)) { + if (cM_rndF(1.0f) > 0.5f) { + setAnm(0xA, -1.0f); - }else{ - setAnm(0xB,-1.0f); + } else { + setAnm(0xB, -1.0f); } } } } - if(mKajiId != fpcM_ERROR_PROCESS_ID_e){ + if (mKajiId != fpcM_ERROR_PROCESS_ID_e) { daKaji_c* wheel = (daKaji_c*)fopAcM_SearchByID(mKajiId); - if(fopAc_IsActor(wheel) && fopAcM_GetName(wheel) == fpcNm_Kaji_e){ - wheel->setAnm(mAnmNum-9,mpMorf->getFrame()); + if (fopAc_IsActor(wheel) && fopAcM_GetName(wheel) == fpcNm_Kaji_e) { + wheel->setAnm(mAnmNum - 9, mpMorf->getFrame()); } - } + } return TRUE; } - if(mType == TYPE_P1B_e && mParam == 2){ - if(!checkAction(&daNpc_P1_c::talkAction)){ - if(mAnmNum == 0xE && mpMorf->checkFrame(mpMorf->getEndFrame()-1.0f) && --m66C <= 0){ - setAnm(0xF,-1.0f); - if(cM_rndF(1.0f) > 0.5f){ + if (mType == TYPE_P1B_e && mParam == 2) { + if (!checkAction(&daNpc_P1_c::talkAction)) { + if (mAnmNum == 0xE && mpMorf->checkFrame(mpMorf->getEndFrame() - 1.0f) && --m66C <= 0) { + setAnm(0xF, -1.0f); + if (cM_rndF(1.0f) > 0.5f) { m66C = 1; - }else{ + } else { m66C = 2; } - }else if(mAnmNum == 0xF){ - if(mpMorf->checkFrame(mpMorf->getEndFrame()-1.0f)){ - if(--m66C <= 0){ - setAnm(0xE,-1.0f); + } else if (mAnmNum == 0xF) { + if (mpMorf->checkFrame(mpMorf->getEndFrame() - 1.0f)) { + if (--m66C <= 0) { + setAnm(0xE, -1.0f); m66C = 4; } } - } } } @@ -1286,34 +1261,34 @@ BOOL daNpc_P1_c::kaji_anm() { /* 000043CC-0000458C .text _execute__10daNpc_P1_cFv */ BOOL daNpc_P1_c::_execute() { - mHeadAnm.move(); - if(!demo_move()){ + if (!demo_move()) { playTexPatternAnm(); s8 room_no = fopAcM_GetRoomNo(this); mpMorf->play( ¤t.pos, mObjAcch.ChkGroundHit() ? dComIfG_Bgsp()->GetMtrlSndId(mObjAcch.m_gnd) : 0, - (s16)dComIfGp_getReverb(room_no)); //TODO: cast to s16 needed? - - if(dComIfGp_event_getMode() == 0 || eventInfo.checkCommandTalk()){ + (s16)dComIfGp_getReverb(room_no) + ); //TODO: cast to s16 needed? + + if (dComIfGp_event_getMode() == 0 || eventInfo.checkCommandTalk()) { (this->*mActionFunc)(NULL); m65A = 0; mbAttentionFlag = 0; - }else{ + } else { event_move(); } } kaji_anm(); lookBack(); setAttentionPos(&attention_info.position); - if(m670 == 0){ - fopAcM_posMoveF(this,mStts.GetCCMoveP()); + if (m670 == 0) { + fopAcM_posMoveF(this, mStts.GetCCMoveP()); mObjAcch.CrrPos(*dComIfG_Bgsp()); } tevStr.mRoomNo = dComIfG_Bgsp()->GetRoomId(mObjAcch.m_gnd); tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mObjAcch.m_gnd); - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mpMorf->getModel(); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(current.angle.y); model->setBaseTRMtx(mDoMtx_stack_c::get()); @@ -1324,80 +1299,81 @@ BOOL daNpc_P1_c::_execute() { /* 0000458C-00004814 .text _draw__10daNpc_P1_cFv */ BOOL daNpc_P1_c::_draw() { - - static u8 l_snap_idx_tbl[] = {DSNAP_TYPE_NPC_P1A,DSNAP_TYPE_NPC_P1B,DSNAP_TYPE_NPC_P1C}; - if(mType == TYPE_P1A_e && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0310)){ + + static u8 l_snap_idx_tbl[] = {DSNAP_TYPE_NPC_P1A, DSNAP_TYPE_NPC_P1B, DSNAP_TYPE_NPC_P1C}; + if (mType == TYPE_P1A_e && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_0310)) { return TRUE; } J3DModel* pJVar7 = mpMorf->getModel(); J3DModelData* mat_table_p = mpMorf->getModel()->getModelData(); J3DModelData* head_model_data = mpHeadModel->getModelData(); - g_env_light.settingTevStruct(TEV_TYPE_ACTOR,¤t.pos,&tevStr); - g_env_light.setLightTevColorType(pJVar7,&tevStr); - g_env_light.setLightTevColorType(mpHeadModel,&tevStr); - mBtp.entry(head_model_data,mBlinkFrame); - if(mType == TYPE_P1A_e){ + g_env_light.settingTevStruct(TEV_TYPE_ACTOR, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType(pJVar7, &tevStr); + g_env_light.setLightTevColorType(mpHeadModel, &tevStr); + mBtp.entry(head_model_data, mBlinkFrame); + if (mType == TYPE_P1A_e) { mpMorf->updateDL(); mpHeadModel->setBaseTRMtx(pJVar7->getAnmMtx(m_jnt.getHeadJntNum())); mDoExt_modelUpdateDL(mpHeadModel); - }else{ + } else { J3DMaterialTable* pJVar2; J3DTexture* texture_p = mat_table_p->getTexture(); JUTNameTab* texture_name_p = mat_table_p->getTextureName(); - if(mType == TYPE_P1B_e){ - pJVar2 = (J3DMaterialTable*)dComIfG_getObjectRes("P1",dRes_INDEX_P1_BMT_P1B_BODY_e); - }else{ - pJVar2 = (J3DMaterialTable*)dComIfG_getObjectRes("P1",dRes_INDEX_P1_BMT_P1C_BODY_e); + if (mType == TYPE_P1B_e) { + pJVar2 = (J3DMaterialTable*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BMT_P1B_BODY_e); + } else { + pJVar2 = (J3DMaterialTable*)dComIfG_getObjectRes("P1", dRes_INDEX_P1_BMT_P1C_BODY_e); } - mat_table_p->setMaterialTable(pJVar2,J3DMatCopyFlag_Texture); + mat_table_p->setMaterialTable(pJVar2, J3DMatCopyFlag_Texture); mpMorf->updateDL(); mpHeadModel->setBaseTRMtx(pJVar7->getAnmMtx(m_jnt.getHeadJntNum())); mDoExt_modelUpdateDL(mpHeadModel); mat_table_p->setTexture(texture_p); mat_table_p->setTextureName(texture_name_p); - if(mpDoraModel){ - g_env_light.setLightTevColorType(mpDoraModel,&tevStr); + if (mpDoraModel) { + g_env_light.setLightTevColorType(mpDoraModel, &tevStr); mpDoraModel->setBaseTRMtx(pJVar7->getAnmMtx(m_handR_jnt_num)); mDoExt_modelUpdateDL(mpDoraModel); } } - cXyz local_28(current.pos.x,current.pos.y + 130.0f, current.pos.z); - mShadowId = dComIfGd_setShadow(mShadowId,true,mpMorf->getModel(),&local_28,800.0f,20.0f,current.pos.y,mObjAcch.GetGroundH(),mObjAcch.m_gnd,&tevStr); - dSnap_RegistFig(l_snap_idx_tbl[mType],this,current.pos,current.angle.y,1.0f,1.0f,1.0f); + cXyz local_28(current.pos.x, current.pos.y + 130.0f, current.pos.z); + mShadowId = dComIfGd_setShadow(mShadowId, true, mpMorf->getModel(), &local_28, 800.0f, 20.0f, current.pos.y, mObjAcch.GetGroundH(), mObjAcch.m_gnd, &tevStr); + dSnap_RegistFig(l_snap_idx_tbl[mType], this, current.pos, current.angle.y, 1.0f, 1.0f, 1.0f); return TRUE; } /* 00004814-00004BA0 .text lookBack__10daNpc_P1_cFv */ BOOL daNpc_P1_c::lookBack() { - u32 o_retval = false; - cXyz posdiff =(dComIfGp_getPlayer(0)->current.pos - current.pos); + cXyz posdiff = (dComIfGp_getPlayer(0)->current.pos - current.pos); cXyz dstPos; cXyz* dstPos_p; f32 fVar4 = posdiff.absXZ(); bool look_at_target = true; - if(m671 == 1){ - if(mAnmNum == 9 && checkAction(&daNpc_P1_c::talkAction)){ + if (m671 == 1) { + if (mAnmNum == 9 && checkAction(&daNpc_P1_c::talkAction)) { dstPos = dNpc_playerEyePos(0.0f); dstPos_p = &dstPos; - }else{ + } else { dstPos_p = NULL; } - }else if(mbAttentionFlag != 0){ + } else if (mbAttentionFlag != 0) { dstPos = mEventCut6B0.getAttnPos(); dstPos_p = &dstPos; - }else if(fVar4 < l_HIO.children[mType].mMaxTalkDist || - checkAction(&daNpc_P1_c::talkAction) || - checkAction(&daNpc_P1_c::explainAction) || - checkAction(&daNpc_P1_c::speakAction) || - checkAction(&daNpc_P1_c::p1c_speakAction)){ + } else if ( + fVar4 < l_HIO.children[mType].mMaxTalkDist || + checkAction(&daNpc_P1_c::talkAction) || + checkAction(&daNpc_P1_c::explainAction) || + checkAction(&daNpc_P1_c::speakAction) || + checkAction(&daNpc_P1_c::p1c_speakAction) + ) { dstPos = dNpc_playerEyePos(0.0f); - dstPos_p = &dstPos; - }else{ + dstPos_p = &dstPos; + } else { dstPos_p = NULL; } m_jnt.setParam( @@ -1411,11 +1387,11 @@ BOOL daNpc_P1_c::lookBack() { l_HIO.children[mType].mMinHeadY, l_HIO.children[mType].mMaxTurnStep ); - if(m_jnt.trnChk()){ - cLib_addCalcAngleS2(&mMaxLookVel,l_HIO.children[mType].mLookBackTargetY,4,0x800); + if (m_jnt.trnChk()) { + cLib_addCalcAngleS2(&mMaxLookVel, l_HIO.children[mType].mLookBackTargetY, 4, 0x800); look_at_target = false; o_retval = true; - }else{ + } else { mMaxLookVel = 0; } cXyz srcpos; @@ -1423,10 +1399,8 @@ BOOL daNpc_P1_c::lookBack() { srcpos.y = current.pos.y; srcpos.z = current.pos.z; srcpos.y += 190.0f; - m_jnt.lookAtTarget(¤t.angle.y,dstPos_p,srcpos,current.angle.y,mMaxLookVel,look_at_target); + m_jnt.lookAtTarget(¤t.angle.y, dstPos_p, srcpos, current.angle.y, mMaxLookVel, look_at_target); return o_retval; - - } /* 00004BA0-00004BC4 .text daNpc_P1_Execute__FP10daNpc_P1_c */