From a3c76c8a7e892b36b30fa900ecacae7dc53a7cec Mon Sep 17 00:00:00 2001 From: roeming Date: Wed, 12 Nov 2025 19:45:53 -0500 Subject: [PATCH] rename variable in accordance with assert (#2797) --- include/d/actor/d_a_npc.h | 2 +- include/d/actor/d_a_npc_moir.h | 2 +- include/d/actor/d_a_npc_theB.h | 2 +- include/d/actor/d_a_npc_zra.h | 2 +- src/d/actor/d_a_npc4.cpp | 44 ++--- src/d/actor/d_a_npc_ash.cpp | 48 +++--- src/d/actor/d_a_npc_ashB.cpp | 48 +++--- src/d/actor/d_a_npc_blue_ns.cpp | 46 ++--- src/d/actor/d_a_npc_bouS.cpp | 38 ++-- src/d/actor/d_a_npc_chat.cpp | 62 +++---- src/d/actor/d_a_npc_doorboy.cpp | 36 ++-- src/d/actor/d_a_npc_gra.cpp | 146 ++++++++-------- src/d/actor/d_a_npc_grc.cpp | 38 ++-- src/d/actor/d_a_npc_grr.cpp | 38 ++-- src/d/actor/d_a_npc_grz.cpp | 76 ++++---- src/d/actor/d_a_npc_gwolf.cpp | 70 ++++---- src/d/actor/d_a_npc_impal.cpp | 40 ++--- src/d/actor/d_a_npc_ins.cpp | 52 +++--- src/d/actor/d_a_npc_kasi_hana.cpp | 50 +++--- src/d/actor/d_a_npc_kasi_kyu.cpp | 60 +++---- src/d/actor/d_a_npc_kasi_mich.cpp | 60 +++---- src/d/actor/d_a_npc_moir.cpp | 62 +++---- src/d/actor/d_a_npc_myna2.cpp | 30 ++-- src/d/actor/d_a_npc_prayer.cpp | 38 ++-- src/d/actor/d_a_npc_rafrel.cpp | 50 +++--- src/d/actor/d_a_npc_shad.cpp | 44 ++--- src/d/actor/d_a_npc_shoe.cpp | 40 ++--- src/d/actor/d_a_npc_soldierA.cpp | 30 ++-- src/d/actor/d_a_npc_the.cpp | 44 ++--- src/d/actor/d_a_npc_tks.cpp | 82 ++++----- src/d/actor/d_a_npc_wrestler.cpp | 278 +++++++++++++++--------------- src/d/actor/d_a_npc_zra.cpp | 60 +++---- src/d/actor/d_a_npc_zra.inc | 142 +++++++-------- src/d/actor/d_a_npc_zrc.cpp | 40 ++--- src/d/actor/d_a_npc_zrz.cpp | 50 +++--- src/d/actor/d_a_obj_tks.cpp | 42 ++--- 36 files changed, 996 insertions(+), 996 deletions(-) diff --git a/include/d/actor/d_a_npc.h b/include/d/actor/d_a_npc.h index 9799bb2fee..1323f3a8b0 100644 --- a/include/d/actor/d_a_npc.h +++ b/include/d/actor/d_a_npc.h @@ -1017,7 +1017,7 @@ public: class daNpcF_c : public fopAc_ac_c { protected: - /* 0x568 */ mDoExt_McaMorfSO* mpMorf; + /* 0x568 */ mDoExt_McaMorfSO* mAnm_p; /* 0x56C */ mDoExt_bckAnm mBckAnm; /* 0x588 */ mDoExt_btpAnm mBtpAnm; /* 0x5A0 */ mDoExt_btkAnm mBtkAnm; diff --git a/include/d/actor/d_a_npc_moir.h b/include/d/actor/d_a_npc_moir.h index 171230d396..97fd762500 100644 --- a/include/d/actor/d_a_npc_moir.h +++ b/include/d/actor/d_a_npc_moir.h @@ -181,7 +181,7 @@ public: /* 80A82878 */ inline void drawOtherMdls(); /* 80A82900 */ inline BOOL drawDbgInfo(); - MtxP getHandRMtx() { return mpMorf->getModel()->getAnmMtx(17); } + MtxP getHandRMtx() { return mAnm_p->getModel()->getAnmMtx(17); } s16 getMessageNo() { return (fopAcM_GetParam(this) >> 8) & 0xFFFF; } diff --git a/include/d/actor/d_a_npc_theB.h b/include/d/actor/d_a_npc_theB.h index 47b31015f6..4b86c360ea 100644 --- a/include/d/actor/d_a_npc_theB.h +++ b/include/d/actor/d_a_npc_theB.h @@ -51,7 +51,7 @@ public: /* 80AFFFE0 */ void EvCut_TheBHint(int); /* 80B00204 */ void EvCut_CoachGuardGameOver(int); - void setTRMtx(MtxP mtx) { mpMorf->getModel()->setBaseTRMtx(mtx); } + void setTRMtx(MtxP mtx) { mAnm_p->getModel()->setBaseTRMtx(mtx); } void setGameOver() { mGameOver = 1; } static u8 mEvtSeqList[72]; diff --git a/include/d/actor/d_a_npc_zra.h b/include/d/actor/d_a_npc_zra.h index 9b93e9bbee..13418afacc 100644 --- a/include/d/actor/d_a_npc_zra.h +++ b/include/d/actor/d_a_npc_zra.h @@ -323,7 +323,7 @@ public: int getType() { return mType; } u32 getAngleNoFromParam() { return (u8)(fopAcM_GetParam(this) >> 8); } void setBlastFlag(u8 i_flag) { mBlastFlag = i_flag; } - MtxP getHeadMtx() { return mpMorf->getModel()->getAnmMtx(4); } + MtxP getHeadMtx() { return mAnm_p->getModel()->getAnmMtx(4); } /* 0x0B48 */ Z2Creature mCreatureSound; /* 0x0BD8 */ J3DModel* mpObjectModel[3]; diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp index d886c4c70f..0a3edc854e 100644 --- a/src/d/actor/d_a_npc4.cpp +++ b/src/d/actor/d_a_npc4.cpp @@ -611,7 +611,7 @@ BOOL daNpcF_c::execute() { int daNpcF_c::draw(BOOL i_isTest, BOOL param_1, f32 i_shadowDepth, _GXColorS10* i_fogColor, BOOL i_hideDamage) { f32 damage_ratio, frame; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); J3DModelData* modelData = model->getModelData(); field_0x9f3 = 1; @@ -664,10 +664,10 @@ int daNpcF_c::draw(BOOL i_isTest, BOOL param_1, f32 i_shadowDepth, _GXColorS10* if (mTwilight) { dComIfGd_setListDark(); - mpMorf->entryDL(); + mAnm_p->entryDL(); dComIfGd_setList(); } else { - mpMorf->entryDL(); + mAnm_p->entryDL(); } if (mAnmFlags & ANM_PLAY_BTP) { @@ -741,7 +741,7 @@ void* daNpcF_c::srchActor(void* i_proc, void* i_this) { /* 8015276C-801527FC 14D0AC 0090+00 2/0 0/0 40/9 .text setMtx__8daNpcF_cFv */ void daNpcF_c::setMtx() { - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(mCurAngle); mDoMtx_stack_c::scaleM(scale); @@ -750,15 +750,15 @@ void daNpcF_c::setMtx() { if (mAnmFlags & 0x100) { mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame()); - mpMorf->modelCalc(); + mAnm_p->modelCalc(); } else { - mpMorf->modelCalc(); + mAnm_p->modelCalc(); } } /* 801527FC-801528C8 14D13C 00CC+00 2/0 0/0 38/0 .text setMtx2__8daNpcF_cFv */ void daNpcF_c::setMtx2() { - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(mCurAngle); mDoMtx_stack_c::scaleM(scale); @@ -766,16 +766,16 @@ void daNpcF_c::setMtx2() { model->setUserArea((uintptr_t)this); if (cM3d_IsZero_inverted(mExpressionMorf)) { - mpMorf->onMorfNone(); + mAnm_p->onMorfNone(); } else { - mpMorf->offMorfNone(); + mAnm_p->offMorfNone(); } if (mAnmFlags & 0x100) { mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame()); - mpMorf->modelCalc(); + mAnm_p->modelCalc(); } else { - mpMorf->modelCalc(); + mAnm_p->modelCalc(); } } @@ -895,7 +895,7 @@ J3DAnmTevRegKey* daNpcF_c::getTevRegKeyAnmP(char* i_arcName, int i_resIdx) { * setMcaMorfAnm__8daNpcF_cFP18J3DAnmTransformKeyffiii */ BOOL daNpcF_c::setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_speed, f32 i_morf, int i_mode, int i_start, int i_end) { - mpMorf->setAnm(i_anm, i_mode, i_morf, i_speed, (f32)i_start, (f32)i_end); + mAnm_p->setAnm(i_anm, i_mode, i_morf, i_speed, (f32)i_start, (f32)i_end); return true; } @@ -942,12 +942,12 @@ void daNpcF_c::setRoomNo() { /* 80152E24-80152EC4 14D764 00A0+00 1/1 0/0 0/0 .text chkEndAnm__8daNpcF_cFf */ BOOL daNpcF_c::chkEndAnm(f32 param_0) { - switch ((u8)mpMorf->getPlayMode()) { + switch ((u8)mAnm_p->getPlayMode()) { case J3DFrameCtrl::EMode_LOOP: - return mpMorf->isLoop(); + return mAnm_p->isLoop(); case J3DFrameCtrl::EMode_NONE: case J3DFrameCtrl::EMode_RESET: - return mpMorf->isStop() && mpMorf->getPlaySpeed() == 0.0f && param_0 != 0.0f; + return mAnm_p->isStop() && mAnm_p->getPlaySpeed() == 0.0f && param_0 != 0.0f; case J3DFrameCtrl::EMode_REVERSE: default: return false; @@ -1019,13 +1019,13 @@ BOOL daNpcF_c::playAllAnm() { } if (mAnmFlags & ANM_PLAY_MORF) { - rate = mpMorf->getPlaySpeed(); + rate = mAnm_p->getPlaySpeed(); if (mAnmFlags & ANM_PAUSE_MORF) { - mpMorf->setPlaySpeed(0.0f); - mpMorf->play(mPolySound, mReverb); - mpMorf->setPlaySpeed(rate); + mAnm_p->setPlaySpeed(0.0f); + mAnm_p->play(mPolySound, mReverb); + mAnm_p->setPlaySpeed(rate); } else { - mpMorf->play(mPolySound, mReverb); + mAnm_p->play(mPolySound, mReverb); if (chkEndAnm(rate)) { mMotionLoops++; } @@ -1088,7 +1088,7 @@ void daNpcF_c::playExpressionAnm(daNpcF_c::daNpcF_anmPlayData*** anm) { morf = mExpressionMorfOverride; } mExpressionMorf = morf; - mpMorf->setMorf(morf); + mAnm_p->setMorf(morf); } } @@ -1127,7 +1127,7 @@ void daNpcF_c::playMotionAnm(daNpcF_c::daNpcF_anmPlayData*** anm) { morf = mMotionMorfOverride; } mExpressionMorf = 0.0f; - mpMorf->setMorf(morf); + mAnm_p->setMorf(morf); } } diff --git a/src/d/actor/d_a_npc_ash.cpp b/src/d/actor/d_a_npc_ash.cpp index a0a99d7281..f31b978894 100644 --- a/src/d/actor/d_a_npc_ash.cpp +++ b/src/d/actor/d_a_npc_ash.cpp @@ -226,7 +226,7 @@ daNpcAsh_c::~daNpcAsh_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -284,7 +284,7 @@ cPhs__Step daNpcAsh_c::Create() { return cPhs_ERROR_e; } - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -100.0f, -50.0f, -100.0f, 100.0f, 220.0f, 100.0f); mCreatureSound.init(¤t.pos, &eyePos, 3, 1); mAcchCir.SetWall(mpHIO->m.common.width, mpHIO->m.common.knee_length); @@ -309,7 +309,7 @@ cPhs__Step daNpcAsh_c::Create() { mGroundH = mAcch.GetGroundH(); setEnvTevColor(); setRoomNo(); - mpMorf->modelCalc(); + mAnm_p->modelCalc(); reset(); Execute(); } @@ -320,17 +320,17 @@ cPhs__Step daNpcAsh_c::Create() { /* 80958B68-80958F08 000968 03A0+00 1/1 0/0 0/0 .text CreateHeap__10daNpcAsh_cFv */ BOOL daNpcAsh_c::CreateHeap() { J3DModelData* modelData = static_cast(dComIfG_getObjectRes(l_arcNames[0], 11)); - mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, + mAnm_p = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, 0x80000, 0x11020284); - if (mpMorf != NULL && mpMorf->mpModel == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + if (mAnm_p != NULL && mAnm_p->mpModel == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return false; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 jointNo = 0; jointNo < modelData->getJointNum(); jointNo++) { modelData->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack); } @@ -391,17 +391,17 @@ int daNpcAsh_c::Execute() { /* 8095911C-80959238 000F1C 011C+00 1/1 0/0 0/0 .text Draw__10daNpcAsh_cFv */ int daNpcAsh_c::Draw() { - mpMorf->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); + mAnm_p->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); draw(false, false, mpHIO->m.common.real_shadow_size, NULL, false); if (mType == TYPE_CASTLE) { g_env_light.setLightTevColorType_MAJI(mModelBow, &tevStr); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(16)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(16)); mModelBow->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(mModelBow); g_env_light.setLightTevColorType_MAJI(mModelQuiver, &tevStr); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(2)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(2)); mModelQuiver->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(mModelQuiver); } @@ -416,11 +416,11 @@ bool daNpcAsh_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int lookatJoints[3] = {1, 3, 4}; if (jointNo == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -437,15 +437,15 @@ bool daNpcAsh_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jointNo == 4 || jointNo == 12) && (mAnmFlags & ANM_PLAY_BCK)) { J3DAnmTransform* bckAnm = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(bckAnm); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(bckAnm); } if (cM3d_IsZero_inverted(mExpressionMorf)) { if (jointNo == 12) { - mpMorf->onMorfNone(); + mAnm_p->onMorfNone(); } else if (jointNo == 4) { - mpMorf->offMorfNone(); + mAnm_p->offMorfNone(); } } @@ -545,7 +545,7 @@ bool daNpcAsh_c::setExpressionBtp(int i_idx) { if (btpAnm == NULL) { return true; } - if (setBtpAnm(btpAnm, mpMorf->getModel()->getModelData(), 1.0f, attr)) { + if (setBtpAnm(btpAnm, mAnm_p->getModel()->getModelData(), 1.0f, attr)) { mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP; if (i_idx == 0) { mAnmFlags |= ANM_FLAG_800; @@ -577,7 +577,7 @@ void daNpcAsh_c::setMotionAnm(int i_idx, f32 i_morf) { } if (btkAnm != NULL) { - if (setBtkAnm(btkAnm, mpMorf->getModel()->getModelData(), 1.0f, btkAttr)) { + if (setBtkAnm(btkAnm, mAnm_p->getModel()->getModelData(), 1.0f, btkAttr)) { mAnmFlags |= ANM_PAUSE_BTK | ANM_PLAY_BTK; } } @@ -717,7 +717,7 @@ void daNpcAsh_c::playMotion() { /* 8095C9BC-8095CC8C 0047BC 02D0+00 1/1 0/0 0/0 .text lookat__10daNpcAsh_cFv */ void daNpcAsh_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL snap = false; f32 body_angleX_min = mpHIO->m.common.body_angleX_min; @@ -1328,7 +1328,7 @@ void daNpcAsh_c::setAttnPos() { lookat(); cXyz vec(10.0f, 10.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&vec, &eyePos); vec.x = 0.0f; @@ -1352,7 +1352,7 @@ void daNpcAsh_c::setAttnPos() { mHeadPos.z); cXyz center; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(2)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(2)); mDoMtx_stack_c::multVecZero(¢er); center.y = current.pos.y; mCcCyl[0].SetC(center); diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index 827a199e4a..81ba8ac402 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -112,7 +112,7 @@ daNpcAshB_c::~daNpcAshB_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -144,8 +144,8 @@ cPhs__Step daNpcAshB_c::Create() { if (!fopAcM_entrySolidHeap(this, createHeapCallBack, 0x58b0)) { return cPhs_ERROR_e; } else { - J3DModelData* model_data = mpMorf->getModel()->getModelData(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + J3DModelData* model_data = mAnm_p->getModel()->getModelData(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -100.0f, -50.0f, -100.0f, 100.0f, 220.0f, 100.0f); mCreatureSound.init(¤t.pos, &eyePos, 3, 1); mAcchCir.SetWall(mpHIO->m.common.width, mpHIO->m.common.knee_length); @@ -164,7 +164,7 @@ cPhs__Step daNpcAshB_c::Create() { mGroundH = mAcch.GetGroundH(); setEnvTevColor(); setRoomNo(); - mpMorf->modelCalc(); + mAnm_p->modelCalc(); reset(); Execute(); } @@ -177,17 +177,17 @@ cPhs__Step daNpcAshB_c::Create() { /* 8095E4A0-8095E758 000740 02B8+00 1/1 0/0 0/0 .text CreateHeap__11daNpcAshB_cFv */ BOOL daNpcAshB_c::CreateHeap() { J3DModelData* modelData = static_cast(dComIfG_getObjectRes(l_arcNames[0], 28)); - mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, + mAnm_p = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, 0x80000, 0x11020284); - if (mpMorf != NULL && mpMorf->mpModel == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + if (mAnm_p != NULL && mAnm_p->mpModel == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return false; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 jointNo = 0; jointNo < modelData->getJointNum(); jointNo++) { modelData->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack); } @@ -227,7 +227,7 @@ int daNpcAshB_c::Execute() { /* 8095E96C-8095E9C8 000C0C 005C+00 1/1 0/0 0/0 .text Draw__11daNpcAshB_cFv */ int daNpcAshB_c::Draw() { - mpMorf->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); + mAnm_p->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); draw(false, false, mpHIO->m.common.real_shadow_size, NULL, false); return 1; } @@ -239,11 +239,11 @@ bool daNpcAshB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int lookatJoints[3] = {1, 9, 10}; if (jointNo == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(9)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(9)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(10)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(10)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -261,8 +261,8 @@ bool daNpcAshB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jointNo == 10 || jointNo == 19) && (mAnmFlags & ANM_PLAY_BCK)) { J3DAnmTransform* bckAnm = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(bckAnm); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(bckAnm); } return true; @@ -393,7 +393,7 @@ void daNpcAshB_c::playMotion() { /* 80961574-80961770 003814 01FC+00 1/1 0/0 0/0 .text lookat__11daNpcAshB_cFv */ void daNpcAshB_c::lookat() { fopAc_ac_c* actor = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL snap = false; f32 body_angleX_min = mpHIO->m.common.body_angleX_min; @@ -520,7 +520,7 @@ bool daNpcAshB_c::setExpressionBtp(int i_idx) { if (btpAnm == NULL) { return true; } - if (setBtpAnm(btpAnm, mpMorf->getModel()->getModelData(), 1.0f, attr)) { + if (setBtpAnm(btpAnm, mAnm_p->getModel()->getModelData(), 1.0f, attr)) { mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP; if (i_idx == 0) { mAnmFlags |= ANM_FLAG_800; @@ -568,7 +568,7 @@ void daNpcAshB_c::setMotionAnm(int i_idx, f32 i_morf) { mMotionLoops = 0; } - if (btkAnm && setBtkAnm(btkAnm, mpMorf->getModel()->getModelData(), 1.0, iVar4)) { + if (btkAnm && setBtkAnm(btkAnm, mAnm_p->getModel()->getModelData(), 1.0, iVar4)) { mAnmFlags |= 0x12; } } @@ -1010,14 +1010,14 @@ BOOL daNpcAshB_c::EvCut_Appear(int i_staffID) { break; case '0005': if (mMotionPhase > 1) { - mpMorf->getModel()->getModelData()->getMaterialNodePointer(4)->getShape()->hide(); + mAnm_p->getModel()->getModelData()->getMaterialNodePointer(4)->getShape()->hide(); return TRUE; } if (mMotionPhase == 1) { setExpression(6, 0.0f); - f32 subtract = mpMorf->getEndFrame() - 1.0f; - if (mpMorf->getFrame() > subtract) { + f32 subtract = mAnm_p->getEndFrame() - 1.0f; + if (mAnm_p->getFrame() > subtract) { field_0xded = 1; } } @@ -1129,7 +1129,7 @@ void daNpcAshB_c::setAttnPos() { lookat(); cXyz vec(10.0f, 10.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(10)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(10)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&vec, &eyePos); vec.x = 0.0f; @@ -1162,7 +1162,7 @@ void daNpcAshB_c::setAttnPos() { /* 80961770-809617F8 003A10 0088+00 1/0 0/0 0/0 .text drawOtherMdls__11daNpcAshB_cFv */ void daNpcAshB_c::drawOtherMdls() { if (field_0xded != 0) { - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); MtxP src = model->getAnmMtx(24); mDoMtx_stack_c::copy(src); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); diff --git a/src/d/actor/d_a_npc_blue_ns.cpp b/src/d/actor/d_a_npc_blue_ns.cpp index faa035601a..005b947e17 100644 --- a/src/d/actor/d_a_npc_blue_ns.cpp +++ b/src/d/actor/d_a_npc_blue_ns.cpp @@ -65,7 +65,7 @@ daNpcBlueNS_c::~daNpcBlueNS_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -148,8 +148,8 @@ int daNpcBlueNS_c::Create() { mTwilight = dKy_darkworld_check(); - mpMorf->getModel()->getModelData(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + mAnm_p->getModel()->getModelData(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeFar(this, 3.0f); fopAcM_setCullSizeBox(this, -120.0f, -10.0f, -120.0f, 120.0f, 220.0f, 120.0f); @@ -188,17 +188,17 @@ int daNpcBlueNS_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], 0x10); JUT_ASSERT(406, NULL != mdlData_p); - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - J3DModel* mdl_p = mpMorf->getModel(); + J3DModel* mdl_p = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -383,7 +383,7 @@ int daNpcBlueNS_c::Draw() { return 1; } - J3DModel* mdl_p = mpMorf->getModel(); + J3DModel* mdl_p = mAnm_p->getModel(); mdl_p->getModelData(); tevStr.TevColor.r = 0; @@ -395,12 +395,12 @@ int daNpcBlueNS_c::Draw() { g_env_light.settingTevStruct(2, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(mdl_p, &tevStr); dComIfGd_setListDark(); - mpMorf->entryDL(); + mAnm_p->entryDL(); dComIfGd_setList(); } else { g_env_light.settingTevStruct(2, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(mdl_p, &tevStr); - mpMorf->entryDL(); + mAnm_p->entryDL(); } mShadowKey = dComIfGd_setShadow(mShadowKey, 1, mdl_p, ¤t.pos, daNpcBlueNS_Param_c::m.common.real_shadow_size, 20.0f + tREG_F(3), current.pos.y, mGroundH, mGndChk, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); @@ -414,13 +414,13 @@ int daNpcBlueNS_c::ctrlJoint(J3DJoint* param_0, J3DModel* i_model) { int spC[] = {1, 3, 4}; if (jnt_no == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -616,7 +616,7 @@ void daNpcBlueNS_c::setAttnPos() { cXyz sp20(10.0f, 15.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&sp20, &eyePos); sp20.x = 0.0f; @@ -628,7 +628,7 @@ void daNpcBlueNS_c::setAttnPos() { attention_info.position.set(mHeadPos.x, mHeadPos.y + daNpcBlueNS_Param_c::m.common.attention_offset, mHeadPos.z); cXyz cyl_center; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&cyl_center); cyl_center.y = current.pos.y; @@ -782,7 +782,7 @@ void daNpcBlueNS_c::setLookMode(int i_lookMode) { /* 8096A81C-8096A9FC 001F9C 01E0+00 1/1 0/0 0/0 .text lookat__13daNpcBlueNS_cFv */ void daNpcBlueNS_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model_p = mpMorf->getModel(); + J3DModel* model_p = mAnm_p->getModel(); int var_r28 = 0; f32 body_angleX_min = daNpcBlueNS_Param_c::m.common.body_angleX_min; @@ -925,7 +925,7 @@ int daNpcBlueNS_c::down(int param_0) { field_0xdc0 = 2; break; case 2: - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { setAction(&daNpcBlueNS_c::wait); } break; @@ -1184,7 +1184,7 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_Chibi_CutMain(const int& i_cutId) { } break; case 20: - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { ChgPtclDisp(); rt = 1; } @@ -1266,7 +1266,7 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_Debu_CutMain(const int& i_cutId) { } break; case 20: - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { ChgPtclDisp(); rt = 1; } @@ -1348,7 +1348,7 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_Noppo_CutMain(const int& i_cutId) { } break; case 20: - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { ChgPtclDisp(); rt = 1; } @@ -1430,7 +1430,7 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_STNoppo_CutMain(const int& i_cutId) { } break; case 20: - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { ChgPtclDisp(); rt = 1; } diff --git a/src/d/actor/d_a_npc_bouS.cpp b/src/d/actor/d_a_npc_bouS.cpp index d39729e792..fcbb0a12f7 100644 --- a/src/d/actor/d_a_npc_bouS.cpp +++ b/src/d/actor/d_a_npc_bouS.cpp @@ -286,7 +286,7 @@ daNpcBouS_c::~daNpcBouS_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } #if DEBUG @@ -362,8 +362,8 @@ cPhs__Step daNpcBouS_c::Create() { return cPhs_ERROR_e; } - J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -160.0f, -50.0f, -160.0f, 160.0f, 220.0f, 160.0f); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -400,17 +400,17 @@ int daNpcBouS_c::CreateHeap() { JUT_ASSERT(393, NULL != mdlData_p); u32 i_differedDlistFlag = 0x11020284; - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, i_differedDlistFlag); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, i_differedDlistFlag); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - mdl_p = mpMorf->getModel(); + mdl_p = mAnm_p->getModel(); for (u16 i = 0; i getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -448,7 +448,7 @@ int daNpcBouS_c::Draw() { return 1; } - J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); + J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData(); mdlData_p->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); draw(FALSE, FALSE, mHIO->m.common.real_shadow_size, NULL, FALSE); return 1; @@ -460,11 +460,11 @@ int daNpcBouS_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int lookatJoints[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD}; if (jntNo == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -496,8 +496,8 @@ int daNpcBouS_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK)) { J3DAnmTransform* anm = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(anm); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(anm); } return 1; @@ -600,7 +600,7 @@ bool daNpcBouS_c::setExpressionBtp(int i_idx) { return true; } - if (setBtpAnm(btp, mpMorf->getModel()->getModelData(), 1.0f, i_attr)) { + if (setBtpAnm(btp, mAnm_p->getModel()->getModelData(), 1.0f, i_attr)) { mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP; if (i_idx == EXPR_BTP_BOU) { @@ -635,7 +635,7 @@ void daNpcBouS_c::setMotionAnm(int i_idx, f32 i_morf) { mMotionLoops = 0; } - if (btk != NULL && setBtkAnm(btk, mpMorf->getModel()->getModelData(), 1.0f, btkAttr)) { + if (btk != NULL && setBtkAnm(btk, mAnm_p->getModel()->getModelData(), 1.0f, btkAttr)) { mAnmFlags |= ANM_PAUSE_BTK | ANM_PLAY_BTK; } } @@ -895,7 +895,7 @@ void daNpcBouS_c::setAttnPos() { setMtx(); lookat(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); eyeOffset.y = 0.0f; @@ -933,7 +933,7 @@ void daNpcBouS_c::setAttnPos() { /* 809778D8-80977AB8 004478 01E0+00 1/1 0/0 0/0 .text lookat__11daNpcBouS_cFv */ void daNpcBouS_c::lookat() { daPy_py_c* player = NULL; - J3DModel* mdl_p = mpMorf->getModel(); + J3DModel* mdl_p = mAnm_p->getModel(); BOOL i_snap = FALSE; f32 body_angleX_min = mHIO->m.common.body_angleX_min; f32 body_angleX_max = mHIO->m.common.body_angleX_max; diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp index 2e258c1ce2..6f43f38a2d 100644 --- a/src/d/actor/d_a_npc_chat.cpp +++ b/src/d/actor/d_a_npc_chat.cpp @@ -2239,7 +2239,7 @@ daNpcChat_c::~daNpcChat_c() { removeResrc(mType, mObjNum); if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -2323,13 +2323,13 @@ BOOL daNpcChat_c::NpcCreate(int type) { J3DAnmTexPattern* texAnmP = getTexAnmP(type); u32 uVar1 = texAnmP != NULL ? 0x11020084 : 0x11000084; - mpMorf = new mDoExt_McaMorfSO(a_mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(a_mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return FALSE; } @@ -2367,14 +2367,14 @@ BOOL daNpcChat_c::NpcCreate(int type) { }; cXyz i_scale(a_transScaleTbl[type]); - mpMorf->offTranslate(); - mpMorf->setTranslateScale(i_scale); + mAnm_p->offTranslate(); + mAnm_p->setTranslateScale(i_scale); J3DJointCallBack jointCallBack = a_mdlData_p->getJointNodePointer(0)->getCallBack(); - uintptr_t userArea = mpMorf->getModel()->getUserArea(); + uintptr_t userArea = mAnm_p->getModel()->getUserArea(); for (u16 i = 0; i < a_mdlData_p->getJointNum(); i++) { a_mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } - mpMorf->getModel()->setUserArea((uintptr_t)this); + mAnm_p->getModel()->setUserArea((uintptr_t)this); if (!setExpressionBtp(type)) { return FALSE; @@ -2385,7 +2385,7 @@ BOOL daNpcChat_c::NpcCreate(int type) { for (u16 i = 0; i < a_mdlData_p->getJointNum(); i++) { a_mdlData_p->getJointNodePointer(i)->setCallBack(jointCallBack); } - mpMorf->getModel()->setUserArea(userArea); + mAnm_p->getModel()->setUserArea(userArea); return TRUE; } @@ -2524,11 +2524,11 @@ J3DModel* daNpcChat_c::ChairCreate(f32 i_scale) { /* 80981108-80981140 0009A8 0038+00 5/5 0/0 0/0 .text isM___11daNpcChat_cFv */ bool daNpcChat_c::isM_() { - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return mType < 16; } - u16 a_jntNum = mpMorf->getModel()->getModelData()->getJointNum(); + u16 a_jntNum = mAnm_p->getModel()->getModelData()->getJointNum(); JUT_ASSERT(738, (a_jntNum == JntM_NUM_e) || (a_jntNum == JntW_NUM_e)); return a_jntNum == JntM_NUM_e; } @@ -2674,7 +2674,7 @@ BOOL daNpcChat_c::setAttention(int param_1) { }; int jointNo = isM_() ? JNTM_HEAD : JNTW_HEAD; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVec(&a_eyeOfsTbl[param_1], &eyePos); mBaseAttnPos.set(current.pos.x, current.pos.y + AtnOfs(param_1), current.pos.z); @@ -2756,8 +2756,8 @@ cPhs__Step daNpcChat_c::Create() { return cPhs_ERROR_e; } - J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -40.0f, -10.0f, -30.0f, 30.0f, 190.0f, 40.0f); mSound.init(¤t.pos, &eyePos, 3, 1); mSound.setMdlType(mType, false, mTwilight & 0xFF); @@ -2807,14 +2807,14 @@ BOOL daNpcChat_c::CreateHeap() { mObjModel = model; rv = model != NULL; if (!rv) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } else if (field_0xe51 == 1) { model = ChairCreate(ObjScale(mType)); mObjModel = model; rv = model != NULL; if (!rv) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } else { mObjModel = NULL; @@ -2839,19 +2839,19 @@ int daNpcChat_c::Execute() { return 1; } - J3DModelData* a_mdlData_p = mpMorf->getModel()->getModelData(); + J3DModelData* a_mdlData_p = mAnm_p->getModel()->getModelData(); J3DJointCallBack callBack = a_mdlData_p->getJointNodePointer(0)->getCallBack(); - u32 userArea = mpMorf->getModel()->getUserArea(); + u32 userArea = mAnm_p->getModel()->getUserArea(); for (u16 i = 0; i < a_mdlData_p->getJointNum(); i++) { a_mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } - mpMorf->getModel()->setUserArea((uintptr_t)this); + mAnm_p->getModel()->setUserArea((uintptr_t)this); execute(); for (u16 i = 0; i < a_mdlData_p->getJointNum(); i++) { a_mdlData_p->getJointNodePointer(i)->setCallBack(callBack); } - mpMorf->getModel()->setUserArea(userArea); + mAnm_p->getModel()->setUserArea(userArea); return 1; } @@ -2864,7 +2864,7 @@ int daNpcChat_c::Draw() { /* 8098250C-80982780 001DAC 0274+00 1/1 0/0 0/0 .text draw__11daNpcChat_cFiifP11_GXColorS10i */ int daNpcChat_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_color, int param_5) { - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); J3DModelData* a_mdlData_p = model->getModelData(); if (i_color != NULL) { @@ -2904,10 +2904,10 @@ int daNpcChat_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_colo if (mTwilight) { dComIfGd_setListDark(); - mpMorf->entryDL(); + mAnm_p->entryDL(); dComIfGd_setList(); } else { - mpMorf->entryDL(); + mAnm_p->entryDL(); } if ((mAnmFlags & ANM_PLAY_BTP) != 0) { @@ -3168,7 +3168,7 @@ void daNpcChat_c::setAttnPos() { daNpcF_c::setMtx(); cXyz sp28(10.0f, 15.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&sp28, &eyePos); sp28.x = 0.0f; @@ -3187,7 +3187,7 @@ bool daNpcChat_c::setExpressionBtp(int i_index) { return true; } - J3DModelData* a_mdlData_p = mpMorf->getModel()->getModelData(); + J3DModelData* a_mdlData_p = mAnm_p->getModel()->getModelData(); if (setBtpAnm(i_btp, a_mdlData_p, 1.0f, J3DFrameCtrl::EMode_LOOP)) { mAnmFlags |= ANM_FLAG_800 | ANM_PLAY_BTP | ANM_PAUSE_BTP; return true; @@ -3578,7 +3578,7 @@ void daNpcChat_c::drawOtherMdls() { if (mObjModel != NULL && jntNo >= 0) { if (!chkAction(&daNpcChat_c::fear)) { g_env_light.setLightTevColorType_MAJI(mObjModel, &tevStr); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jntNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jntNo)); mDoMtx_stack_c::scaleM(objScale, objScale, objScale); mObjModel->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(mObjModel); @@ -3862,7 +3862,7 @@ void daNpcChat_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** i_data) { } mExpressionMorf = 0.0f; - mpMorf->setMorf(i_morf); + mAnm_p->setMorf(i_morf); } } @@ -4033,7 +4033,7 @@ bool daNpcChat_c::fear(void* param_1) { case 2: if (mMotionAnm == ANM_SURPRISE) { - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { setMotion(MOT_TO_WOLF, -1.0f, 0); mPlayerAngleY = fopAcM_searchPlayerAngleY(this) + 0x8000; } @@ -4043,7 +4043,7 @@ bool daNpcChat_c::fear(void* param_1) { setAngle(shape_angle.y); } - if (mpMorf->getFrame() >= 1.0f && mpMorf->getFrame() < 2.0f) { + if (mAnm_p->getFrame() >= 1.0f && mAnm_p->getFrame() < 2.0f) { mSound.playVoice(2); } } diff --git a/src/d/actor/d_a_npc_doorboy.cpp b/src/d/actor/d_a_npc_doorboy.cpp index df0acf27de..fd01921664 100644 --- a/src/d/actor/d_a_npc_doorboy.cpp +++ b/src/d/actor/d_a_npc_doorboy.cpp @@ -137,7 +137,7 @@ daNpcDoorBoy_c::~daNpcDoorBoy_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -198,7 +198,7 @@ cPhs__Step daNpcDoorBoy_c::Create() { return cPhs_ERROR_e; } - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -50.0f, -10.0f, -50.0f, 50.0f, 210.0f, 50.0f); mSound.init(¤t.pos, &eyePos, 3, 1); mSound.setMdlType(5, false, dKy_darkworld_check()); @@ -233,24 +233,24 @@ int daNpcDoorBoy_c::CreateHeap() { JUT_ASSERT(292, NULL != mdlData_p); - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } cXyz translateScale(1.0f, 1.0820773f, 1.0f); - mpMorf->offTranslate(); - mpMorf->setTranslateScale(translateScale); + mAnm_p->offTranslate(); + mAnm_p->setTranslateScale(translateScale); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } - mpMorf->getModel()->setUserArea((uintptr_t)this); + mAnm_p->getModel()->setUserArea((uintptr_t)this); setMotion(MOT_WAIT_A, -1.0f, 0); @@ -282,11 +282,11 @@ int daNpcDoorBoy_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int i_jointList[3] = {JNT_BACKBONE, JNT_NECK, JNT_HEAD}; if (jointNo == JNT_CENTER) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -367,7 +367,7 @@ void daNpcDoorBoy_c::reset() { J3DAnmTexPattern* i_btp = getTexPtrnAnmP(l_arcNames[0], 7); mAnmFlags &= 0xFFFFF57F; - if (setBtpAnm(i_btp, mpMorf->getModel()->getModelData(), 1.0f, 2)) { + if (setBtpAnm(i_btp, mAnm_p->getModel()->getModelData(), 1.0f, 2)) { mAnmFlags |= 0xA80; } @@ -430,7 +430,7 @@ inline void daNpcDoorBoy_c::playMotion() { /* 809ACE18-809ACFF8 002278 01E0+00 1/1 0/0 0/0 .text lookat__14daNpcDoorBoy_cFv */ inline void daNpcDoorBoy_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model_p = mpMorf->getModel(); + J3DModel* model_p = mAnm_p->getModel(); int iVar1 = 0; f32 body_angleX_min = daNpcDoorBoy_Param_c::m.common.body_angleX_min; @@ -639,7 +639,7 @@ bool daNpcDoorBoy_c::fear(void* param_1) { break; case 2: - if (mpMorf->checkFrame(1.0f)) { + if (mAnm_p->checkFrame(1.0f)) { mSound.playVoice(2); } break; @@ -851,7 +851,7 @@ void daNpcDoorBoy_c::setAttnPos() { setMtx(); lookat(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mHeadPos); cXyz sp1c(23.0f, 15.0f, 0.0f); mDoMtx_stack_c::multVec(&sp1c, &eyePos); @@ -863,7 +863,7 @@ void daNpcDoorBoy_c::setAttnPos() { mDoMtx_stack_c::multVec(&attention_info.position, &attention_info.position); cXyz sp28; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE)); mDoMtx_stack_c::multVecZero(&sp28); sp28.y = current.pos.y; diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index 62108da632..9706a38ede 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -367,7 +367,7 @@ daNpc_grA_c::~daNpc_grA_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } #if DEBUG @@ -410,9 +410,9 @@ BOOL daNpc_grA_c::create() { if (!fopAcM_entrySolidHeap(this, &daNpc_grA_c::createHeapCallBack, 0x800045d0)) { return cPhs_ERROR_e; } - unused = mpMorf->getModel()->getModelData(); + unused = mAnm_p->getModel()->getModelData(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); mCreature.init(¤t.pos, &eyePos, 3, 1); @@ -462,15 +462,15 @@ BOOL daNpc_grA_c::CreateHeap() { } JUT_ASSERT(774, NULL != mdlData_p); int v = 0x11020284; - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, v); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, v); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return FALSE; } - mdlData2_p = mpMorf->getModel(); + mdlData2_p = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -553,11 +553,11 @@ BOOL daNpc_grA_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int jntNo = joint->getJntNo(); int arr[] = {1, 3, 4}; if (jntNo == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -584,8 +584,8 @@ BOOL daNpc_grA_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if (jntNo == 4 || jntNo == 7) { if ((mAnmFlags & 0x100) != 0) { J3DAnmTransform* a = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(a); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(a); } } return TRUE; @@ -824,7 +824,7 @@ void daNpc_grA_c::setParam() { /* 809C0038-809C0298 0017D8 0260+00 1/0 0/0 0/0 .text main__11daNpc_grA_cFv */ BOOL daNpc_grA_c::main() { int a = 0xffff; - JUT_ASSERT(1367, mpMorf != NULL); // TODO: update "mpMorf" to "mAnm_p" + JUT_ASSERT(1367, mAnm_p != NULL); // TODO: update "mAnm_p" to "mAnm_p" if (doEvent() == 0) { if (hitChk2(&field_0xC98, TRUE, FALSE)) { setDamage(GET_HIO(mNpcFParams.damage_time), 0x17, 0); @@ -868,7 +868,7 @@ BOOL daNpc_grA_c::main() { } playExpression(); playMotion(); - JUT_ASSERT(1487, mpMorf != NULL); // TODO: update "mpMorf" to "mAnm_p" + JUT_ASSERT(1487, mAnm_p != NULL); return TRUE; } @@ -902,14 +902,14 @@ void daNpc_grA_c::setAttnPos() { mLookatAngle[i].setall(0); } } - J3DModelData* modelData = mpMorf->getModel()->getModelData(); + J3DModelData* modelData = mAnm_p->getModel()->getModelData(); for (u16 i = 0; i < modelData->getJointNum(); i++) { modelData->getJointNodePointer(i)->setCallBack(&daNpc_grA_c::ctrlJointCallBack); } setMtx(); setOtherObjMtx(); lookat(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); mDoMtx_stack_c::multVec(&eyeOffset, &offset); @@ -1133,7 +1133,7 @@ bool daNpc_grA_c::setExpressionBtp(int i_expression) { if (bck == NULL) { return true; } - if (setBtpAnm(bck, mpMorf->getModel()->getModelData(), 1.0f, attr)) { + if (setBtpAnm(bck, mAnm_p->getModel()->getModelData(), 1.0f, attr)) { mAnmFlags |= 0x280; if (i_expression == 0) { mAnmFlags |= 0x800; @@ -1228,7 +1228,7 @@ void daNpc_grA_c::setMotionAnm(int i_motion, f32 i_morf) { if (l_btkGetParamList[btkIndex][0] >= 0) { btk = getTexSRTKeyAnmP(l_resNames[l_btkGetParamList[btkIndex][1]], l_btkGetParamList[btkIndex][0]); } - if (btk != NULL && setBtkAnm(btk, mpMorf->getModel()->getModelData(), 1.0f, attr)) { + if (btk != NULL && setBtkAnm(btk, mAnm_p->getModel()->getModelData(), 1.0f, attr)) { mAnmFlags |= 0x12; } if (bck != NULL && setMcaMorfAnm(bck, 1.0f, i_morf, attr2, 0, -1)) { @@ -1312,7 +1312,7 @@ void daNpc_grA_c::drawOtherMdls() { case 8: case 9: case 10: - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(17)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(17)); mDoMtx_stack_c::scaleM(scale); mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); J3DModelData* data = mpModel->getModelData(); @@ -1995,7 +1995,7 @@ void daNpc_grA_c::setLookMode(int i_lookMode) { /* 809C3094-809C3424 004834 0390+00 1/1 0/0 0/0 .text lookat__11daNpc_grA_cFv */ void daNpc_grA_c::lookat() { fopAc_ac_c* player = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL r27 = FALSE; f32 bodyAngleXMin = GET_HIO(mNpcFParams.body_angleX_min); f32 bodyAngleXMax = GET_HIO(mNpcFParams.body_angleX_max); @@ -2050,12 +2050,12 @@ void daNpc_grA_c::lookat() { mNpcfLookAt.setAttnPos(&mLookPos); } else if (mLookMode == 7) { cXyz f(0.0f, 0.0f, 300.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVec(&f, &mLookPos); mNpcfLookAt.setAttnPos(&mLookPos); } else if (mLookMode == 8) { cXyz f(0.0f, 0.0f, -300.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVec(&f, &mLookPos); mNpcfLookAt.setAttnPos(&mLookPos); } else { @@ -2221,7 +2221,7 @@ void daNpc_grA_c::setOtherObjMtx() { switch (mType) { case 7: cXyz pos = current.pos; - pos.y += l_offsetHeight[(u32)mpMorf->getFrame() % 0x1f]; // maybe meant to be & 0x1f + pos.y += l_offsetHeight[(u32)mAnm_p->getFrame() % 0x1f]; // maybe meant to be & 0x1f mDoMtx_stack_c::transS(pos); mDoMtx_stack_c::ZXYrotM(mCurAngle); mDoMtx_stack_c::scaleM(scale); @@ -2353,9 +2353,9 @@ BOOL daNpc_grA_c::ECut_grDSRoll(int i_staffID) { } break; case 0x1e: if (field_0x14D8 == 0x1b) { - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { r28 = 1; - } else if (mpMorf->checkFrame(14.0f)) { + } else if (mAnm_p->checkFrame(14.0f)) { cXyz c(0.0f, 0.0f, 20.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(mCurAngle.y); @@ -2367,22 +2367,22 @@ BOOL daNpc_grA_c::ECut_grDSRoll(int i_staffID) { break; case 0x28: if (field_0x14D8 == 0x1a) { - mpMorf->setEndFrame(29.0f); + mAnm_p->setEndFrame(29.0f); if (field_0x14D4 < 3.0f) { field_0x14D4 += 0.2f; } - mpMorf->setPlaySpeed(field_0x14D4); + mAnm_p->setPlaySpeed(field_0x14D4); speedF = 0.0f; } r28 = 1; break; case 0x2d: if (field_0x14D8 == 0x1a) { - mpMorf->setEndFrame(29.0f); + mAnm_p->setEndFrame(29.0f); if (field_0x14D4 < 3.0f) { field_0x14D4 += 0.2f; } - mpMorf->setPlaySpeed(field_0x14D4); + mAnm_p->setPlaySpeed(field_0x14D4); speedF = field_0x14D4 * GET_HIO(mRotationalSpeed); } r28 = 1; @@ -2391,23 +2391,23 @@ BOOL daNpc_grA_c::ECut_grDSRoll(int i_staffID) { if (field_0x14D8 == 0x1a) { if (field_0x14D4 > 1.0f) { field_0x14D4 -= 0.25f; - mpMorf->setPlaySpeed(field_0x14D4); + mAnm_p->setPlaySpeed(field_0x14D4); speedF = field_0x14D4 * GET_HIO(mRotationalSpeed); } else { - if (mpMorf->getFrame() >= 0.0f && mpMorf->getFrame() <= 5.0f) { + if (mAnm_p->getFrame() >= 0.0f && mAnm_p->getFrame() <= 5.0f) { setMotion(0x14, -1.0f, 0); field_0x14D4 = 0.0f; } speedF = 0.0f; } } else if (field_0x14D8 == 0x19) { - if (mpMorf->checkFrame(12.0f)) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0x1a)); + if (mAnm_p->checkFrame(12.0f)) { + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(0x1a)); mDoMtx_stack_c::multVecZero(&mParticleManager[1].mPos); mParticleManager[1].mPos.y = current.pos.y; mParticleManager[1].mAngle = mCurAngle; mParticleManager[1].field_0x0 = 1; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0x17)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(0x17)); mDoMtx_stack_c::multVecZero(&mParticleManager[2].mPos); mParticleManager[2].mPos.y = current.pos.y; mParticleManager[2].mAngle = mCurAngle; @@ -2441,8 +2441,8 @@ BOOL daNpc_grA_c::ECut_grDSRoll(int i_staffID) { if (field_0x14D8 == 0x16 && fopAcM_searchPlayerAngleY(this) == mCurAngle.y) { r28 = 1; } - if (field_0x14D8 == 0x1f && mpMorf->getFrame() >= 10.0f && - mpMorf->getFrame() < 11.0f) + if (field_0x14D8 == 0x1f && mAnm_p->getFrame() >= 10.0f && + mAnm_p->getFrame() < 11.0f) { mCreature.startCreatureVoice(Z2SE_GORON_V_SMR_REPLY, -1); } @@ -2507,7 +2507,7 @@ BOOL daNpc_grA_c::ECut_grDSGate(int i_staffID) { if (mMotion != 5) { if (field_0x14D8 != 0x17) { cLib_chasePosXZ(¤t.pos, field_0x148C, 30.f / 11.f); - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { setMotion(5, -1.0f, 0); home.pos = field_0x148C; home.angle = field_0x1498; @@ -2606,7 +2606,7 @@ BOOL daNpc_grA_c::ECut_teachElevator(int i_staffID) { if (mMotion != 5) { if (field_0x14D8 != 0x17) { cLib_chasePosXZ(¤t.pos, field_0x148C, 30.0f / 11.0f); - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { setMotion(5, -1.0f, 0); home.pos = field_0x148C; home.angle = field_0x1498; @@ -2656,7 +2656,7 @@ BOOL daNpc_grA_c::ECut_kickOut(int i_staffID) { setExpression(0x17, -1.0f); setMotion(1, -1.0f, 0); speedF = GET_HIO(mWalkingSpeed); - mpMorf->setPlaySpeed(GET_HIO(mWalkingSpeed) * GET_HIO(mWalkingAnimationSpeed)); + mAnm_p->setPlaySpeed(GET_HIO(mWalkingSpeed) * GET_HIO(mWalkingAnimationSpeed)); break; case 0x1e: Z2GetAudioMgr()->seStart(0x600b2, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -2680,7 +2680,7 @@ BOOL daNpc_grA_c::ECut_kickOut(int i_staffID) { break; case 0x14: speedF = GET_HIO(mWalkingSpeed); - mpMorf->setPlaySpeed(GET_HIO(mWalkingSpeed) * GET_HIO(mWalkingAnimationSpeed)); + mAnm_p->setPlaySpeed(GET_HIO(mWalkingSpeed) * GET_HIO(mWalkingAnimationSpeed)); r28 = 1; break; case 0x1e: @@ -2799,13 +2799,13 @@ BOOL daNpc_grA_c::ECut_rescueRock(int i_staffID) { } } else { cLib_chaseF(&field_0x14D4, 1.0f, 0.03f); - mpMorf->setPlaySpeed(field_0x14D4); - mpMorf->setEndFrame(27.0f); + mAnm_p->setPlaySpeed(field_0x14D4); + mAnm_p->setEndFrame(27.0f); } break; case 0xa: if (field_0x14D8 == 0x19) { - if (mpMorf->getFrame() >= 8.0f) { + if (mAnm_p->getFrame() >= 8.0f) { setExpression(0x17, -1.0f); setMotion(0x1c, -1.0f, 0); } @@ -2818,13 +2818,13 @@ BOOL daNpc_grA_c::ECut_rescueRock(int i_staffID) { r28 = 1; } if (mAcch.ChkGroundLanding()) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0x1a)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(0x1a)); mDoMtx_stack_c::multVecZero(&mParticleManager[1].mPos); mParticleManager[1].mPos.y = current.pos.y; mParticleManager[1].mAngle = mCurAngle; mParticleManager[1].field_0x0 = 1; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0x17)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(0x17)); mDoMtx_stack_c::multVecZero(&mParticleManager[2].mPos); mParticleManager[2].mPos.y = current.pos.y; mParticleManager[2].mAngle = mCurAngle; @@ -2867,7 +2867,7 @@ BOOL daNpc_grA_c::ECut_carrySpaWater(int i_staffID) { setMotion(0x19, -1.0f, 0); setLookMode(0); cXyz c; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&c); } break; case 0xa: @@ -2901,7 +2901,7 @@ BOOL daNpc_grA_c::ECut_carrySpaWater(int i_staffID) { break; case 0x3c: field_0x14D4 = 0.0f; - mpMorf->setPlaySpeed(field_0x14D4); + mAnm_p->setPlaySpeed(field_0x14D4); mEventTimer = 0x12c; break; case 0x41: @@ -2930,12 +2930,12 @@ BOOL daNpc_grA_c::ECut_carrySpaWater(int i_staffID) { switch (sp30) { case 0: - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { r28 = 1; } else { JPABaseEmitter* sp28 = 0; cXyz c; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&c); field_0x151C = dComIfGp_particle_set(field_0x151C, 0x2a3, &c, &tevStr, ¤t.angle, NULL, 0xff, NULL, -1, NULL, NULL, NULL); @@ -2984,11 +2984,11 @@ BOOL daNpc_grA_c::ECut_carrySpaWater(int i_staffID) { break; case 0x32: if (field_0x14D8 == 0x1b) { - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { r28 = 1; setMotion(0x13, -1.0f, 0); mCreature.startCreatureVoice(Z2SE_GRA_V_ROLLING, -1); - } else if (mpMorf->checkFrame(14.0f)) { + } else if (mAnm_p->checkFrame(14.0f)) { cXyz c(0.0f, 0.0f, 20.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(mCurAngle.y); @@ -2997,8 +2997,8 @@ BOOL daNpc_grA_c::ECut_carrySpaWater(int i_staffID) { mParticleManager[0].field_0x0 = 1; } } else if (field_0x14D8 == 0x1a) { - mpMorf->setPlaySpeed(0.0f); - mpMorf->setEndFrame(29.0f); + mAnm_p->setPlaySpeed(0.0f); + mAnm_p->setEndFrame(29.0f); r28 = 1; } break; @@ -3012,7 +3012,7 @@ BOOL daNpc_grA_c::ECut_carrySpaWater(int i_staffID) { setAngle(mCurAngle.y); } cLib_addCalc2(&field_0x14D4, 5.0f, 0.1f, 0.1f); - mpMorf->setPlaySpeed(field_0x14D4); + mAnm_p->setPlaySpeed(field_0x14D4); speedF = field_0x14D4 * 10.0f; } if (!cLib_calcTimer(&mEventTimer)) { @@ -3031,7 +3031,7 @@ BOOL daNpc_grA_c::ECut_carrySpaWater(int i_staffID) { } if ((field_0x14D8 == 0x1a && field_0x14D4 >= 1.0f) || - field_0x14D8 == 0x28 && mpMorf->getFrame() >= 18.0f && mpMorf->getFrame() <= 20.0f) + field_0x14D8 == 0x28 && mAnm_p->getFrame() >= 18.0f && mAnm_p->getFrame() <= 20.0f) { setRollPrtcl(current.pos, 1.0f); if (field_0x14D8 == 0x1a) { @@ -3085,7 +3085,7 @@ BOOL daNpc_grA_c::ECut_carrySpaWaterFailure(int i_staffID) { if (mMotion == 8) { if (mMotionPhase > 0) { r28 = 1; - } else if (mpMorf->checkFrame(21.0f)) { + } else if (mAnm_p->checkFrame(21.0f)) { cXyz c(0.0f, 0.0f, -150.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(mCurAngle.y); @@ -3171,14 +3171,14 @@ BOOL daNpc_grA_c::ECut_rollRockCrash(int i_staffID) { if (field_0x14D8 == 0x29) { r28 = 1; } else { - if (mpMorf->getFrame() >= 79.0f) { + if (mAnm_p->getFrame() >= 79.0f) { field_0x150C = 0; - } else if (mpMorf->getFrame() >= 7.0f) { + } else if (mAnm_p->getFrame() >= 7.0f) { field_0x150C = 1; } else { field_0x150C = 0; } - if (mpMorf->getFrame() >= 93.0f && mpMorf->getFrame() < 94.0f) { + if (mAnm_p->getFrame() >= 93.0f && mAnm_p->getFrame() < 94.0f) { mCreature.startCreatureVoice(Z2SE_GRA_V_SPAWATER_SHOUT, -1); } } @@ -3200,9 +3200,9 @@ BOOL daNpc_grA_c::ECut_rollRockCrash(int i_staffID) { break; case 0x28: if (field_0x14D8 == 0x1b) { - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { setMotion(0x13, -1.0f, 0); - } else if (mpMorf->checkFrame(14.0f)) { + } else if (mAnm_p->checkFrame(14.0f)) { cXyz c(0.0f, 0.0f, 20.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(mCurAngle.y); @@ -3211,15 +3211,15 @@ BOOL daNpc_grA_c::ECut_rollRockCrash(int i_staffID) { mParticleManager[0].field_0x0 = 1; } } else if (field_0x14D8 == 0x1a) { - mpMorf->setPlaySpeed(0.0f); - mpMorf->setEndFrame(29.0f); + mAnm_p->setPlaySpeed(0.0f); + mAnm_p->setEndFrame(29.0f); r28 = 1; field_0x14D4 = 0.0f; } break; case 0x32: cLib_addCalc2(&field_0x14D4, 5.0f, 0.1f, 0.1f); - mpMorf->setPlaySpeed(field_0x14D4); + mAnm_p->setPlaySpeed(field_0x14D4); speedF = field_0x14D4 * 10.0f; if (mAcch.ChkWallHit()) { r28 = 1; @@ -3227,7 +3227,7 @@ BOOL daNpc_grA_c::ECut_rollRockCrash(int i_staffID) { break; case 0x3c: cLib_addCalc2(&field_0x14D4, 5.0f, 0.1f, 0.1f); - mpMorf->setPlaySpeed(field_0x14D4); + mAnm_p->setPlaySpeed(field_0x14D4); if (!cLib_calcTimer(&mEventTimer)) { r28 = 1; } @@ -3511,7 +3511,7 @@ BOOL daNpc_grA_c::waitGate(void*) { cLib_chaseAngleS(¤t.angle.y, home.angle.y, 0x400); setAngle(current.angle.y); cLib_chasePosXZ(¤t.pos, field_0x148C, 30.f / 11.f); - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { field_0x14D1 = 1; setMotion(5, -1.0f, 0); home.pos = field_0x148C; @@ -3592,7 +3592,7 @@ BOOL daNpc_grA_c::waitKickOut(void*) { } else { s16 r27 = cLib_targetAngleY(¤t.pos, &c); speedF = 5.0f; - mpMorf->setPlaySpeed(speedF * GET_HIO(mWalkingAnimationSpeed)); + mAnm_p->setPlaySpeed(speedF * GET_HIO(mWalkingAnimationSpeed)); cLib_addCalcAngleS2(¤t.angle.y, r27, GET_HIO(mWalkingRotationDivisions), GET_HIO(mWalkingRotationSpeed)); setAngle(current.angle.y); @@ -3951,8 +3951,8 @@ BOOL daNpc_grA_c::crashRoll(void*) { field_0x1486 = 2; } field_0x14D4 = 5.0f; - mpMorf->setPlaySpeed(field_0x14D4); - mpMorf->setEndFrame(29.0f); + mAnm_p->setPlaySpeed(field_0x14D4); + mAnm_p->setEndFrame(29.0f); if (field_0x14D8 == 0x1a) { if (field_0x14D4 >= 1.0f) { setRollPrtcl(current.pos, 1.0f); @@ -3981,8 +3981,8 @@ BOOL daNpc_grA_c::crashRollWait(void*) { // fallthrough case 2: field_0x14D4 = 5.0f; - mpMorf->setPlaySpeed(field_0x14D4); - mpMorf->setEndFrame(29.0f); + mAnm_p->setPlaySpeed(field_0x14D4); + mAnm_p->setEndFrame(29.0f); if (field_0x14D8 == 0x1a) { if (field_0x14D4 >= 1.0f) { cXyz c(0.0f, 0.0f, 0.0f); diff --git a/src/d/actor/d_a_npc_grc.cpp b/src/d/actor/d_a_npc_grc.cpp index 4edf2e0428..a1e9655fc7 100644 --- a/src/d/actor/d_a_npc_grc.cpp +++ b/src/d/actor/d_a_npc_grc.cpp @@ -257,7 +257,7 @@ daNpc_grC_c::~daNpc_grC_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -334,7 +334,7 @@ cPhs__Step daNpc_grC_c::create() { return cPhs_ERROR_e; } - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -377,17 +377,17 @@ int daNpc_grC_c::CreateHeap() { JUT_ASSERT(452, NULL != mdlData_p); - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -426,11 +426,11 @@ int daNpc_grC_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int i_jointList[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD}; if (jntNo == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -457,8 +457,8 @@ int daNpc_grC_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK) != 0) { J3DAnmTransform* anm = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(anm); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(anm); } return 1; @@ -578,7 +578,7 @@ void daNpc_grC_c::setAttnPos() { } } - J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); + J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -587,7 +587,7 @@ void daNpc_grC_c::setAttnPos() { lookat(); setPrtcl(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); mDoMtx_stack_c::multVec(&eyeOffset, &sp94); @@ -623,7 +623,7 @@ void daNpc_grC_c::setAttnPos() { } mCyl.SetCoSPrm(0x79); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&sp7c); sp7c.y = current.pos.y; mCyl.SetC(sp7c); @@ -756,7 +756,7 @@ bool daNpc_grC_c::setExpressionBtp(int i_idx) { return true; } - if (setBtpAnm(anm, mpMorf->getModel()->getModelData(), 1.0f, i_attr)) { + if (setBtpAnm(anm, mAnm_p->getModel()->getModelData(), 1.0f, i_attr)) { mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP; if (i_idx == EXPR_BTP_GRC_A) { @@ -828,7 +828,7 @@ void daNpc_grC_c::setMotionAnm(int i_idx, f32 i_morf) { i_btk = getTexSRTKeyAnmP(l_resNames[l_btkGetParamList[0].arcIdx], l_btkGetParamList[0].fileIdx); } - if (i_btk != NULL && setBtkAnm(i_btk, mpMorf->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { + if (i_btk != NULL && setBtkAnm(i_btk, mAnm_p->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { mAnmFlags |= ANM_PAUSE_BTK | ANM_PLAY_BTK; } @@ -1190,7 +1190,7 @@ void daNpc_grC_c::setLookMode(int i_lookMode) { /* 809CDD74-809CDFFC 002994 0288+00 1/1 0/0 0/0 .text lookat__11daNpc_grC_cFv */ void daNpc_grC_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL i_snap = FALSE; f32 body_angleX_min = daNpc_grC_Param_c::m.common.body_angleX_min; f32 body_angleX_max = daNpc_grC_Param_c::m.common.body_angleX_max; diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index 70caf529e5..ab675d2022 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -229,7 +229,7 @@ daNpc_grR_c::~daNpc_grR_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } #ifdef DEBUG @@ -314,8 +314,8 @@ cPhs__Step daNpc_grR_c::create() { return cPhs_ERROR_e; } - J3DModel* model = mpMorf->getModel(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + J3DModel* model = mAnm_p->getModel(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -351,17 +351,17 @@ int daNpc_grR_c::CreateHeap() { JUT_ASSERT(458, NULL != mdlData_p); - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -394,7 +394,7 @@ int daNpc_grR_c::Execute() { /* 809E0450-809E04E0 000C70 0090+00 1/1 0/0 0/0 .text Draw__11daNpc_grR_cFv */ int daNpc_grR_c::Draw() { - mpMorf->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); + mAnm_p->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); return draw(chkAction(&daNpc_grR_c::test), FALSE, daNpc_grR_Param_c::m.common.real_shadow_size, NULL, FALSE); } @@ -404,11 +404,11 @@ int daNpc_grR_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int i_jointList[3] = {1, 3, 4}; if (jntNo == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -435,8 +435,8 @@ int daNpc_grR_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jntNo == 4 || jntNo == 7) && (mAnmFlags & ANM_PLAY_BCK) != 0) { J3DAnmTransform* anm = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(anm); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(anm); } return 1; @@ -589,7 +589,7 @@ void daNpc_grR_c::setAttnPos() { setMtx(); lookat(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); eyeOffset.x = 0.0f; @@ -748,7 +748,7 @@ bool daNpc_grR_c::setExpressionBtp(int i_idx) { return true; } - if (setBtpAnm(anm, mpMorf->getModel()->getModelData(), 1.0f, i_attr)) { + if (setBtpAnm(anm, mAnm_p->getModel()->getModelData(), 1.0f, i_attr)) { mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP; if (i_idx == 0) { @@ -814,7 +814,7 @@ void daNpc_grR_c::setMotionAnm(int i_idx, f32 i_morf) { i_btk = getTexSRTKeyAnmP(l_resNames[l_btkGetParamList[0].arcIdx], l_btkGetParamList[0].fileIdx); } - if (i_btk != NULL && setBtkAnm(i_btk, mpMorf->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { + if (i_btk != NULL && setBtkAnm(i_btk, mAnm_p->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { mAnmFlags |= ANM_PAUSE_BTK | ANM_PLAY_BTK; } @@ -1171,7 +1171,7 @@ void daNpc_grR_c::setLookMode(int i_lookMode) { /* 809E24A4-809E272C 002CC4 0288+00 1/1 0/0 0/0 .text lookat__11daNpc_grR_cFv */ void daNpc_grR_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL i_snap = FALSE; f32 body_angleX_min = daNpc_grR_Param_c::m.common.body_angleX_min; f32 body_angleX_max = daNpc_grR_Param_c::m.common.body_angleX_max; diff --git a/src/d/actor/d_a_npc_grz.cpp b/src/d/actor/d_a_npc_grz.cpp index 2bb920dc20..2e6816e5c1 100644 --- a/src/d/actor/d_a_npc_grz.cpp +++ b/src/d/actor/d_a_npc_grz.cpp @@ -399,7 +399,7 @@ daNpc_Grz_c::~daNpc_Grz_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -486,7 +486,7 @@ cPhs__Step daNpc_Grz_c::create() { return cPhs_ERROR_e; } - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -521,17 +521,17 @@ int daNpc_Grz_c::CreateHeap() { JUT_ASSERT(556, NULL != mdlData_p); - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -565,8 +565,8 @@ int daNpc_Grz_c::Execute() { /* 809E9324-809E9568 001004 0244+00 1/1 0/0 0/0 .text Draw__11daNpc_Grz_cFv */ int daNpc_Grz_c::Draw() { - J3DModel* model = mpMorf->getModel(); - J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); + J3DModel* model = mAnm_p->getModel(); + J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData(); if (checkHide()) { return 1; @@ -601,7 +601,7 @@ int daNpc_Grz_c::Draw() { mBrkAnm.entry(mdlData_p); } - mpMorf->entryDL(); + mAnm_p->entryDL(); if ((mAnmFlags & ANM_PLAY_BTP) != 0) { mBtpAnm.remove(mdlData_p); @@ -630,11 +630,11 @@ int daNpc_Grz_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int i_jointList[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD}; if (jntNo == JNT_CENTER) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -661,8 +661,8 @@ int daNpc_Grz_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK) != 0) { J3DAnmTransform* anm = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(anm); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(anm); } return 1; @@ -813,7 +813,7 @@ void daNpc_Grz_c::setAttnPos() { setMtx(); lookat(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); eyeOffset.x = 0.0f; @@ -884,7 +884,7 @@ void daNpc_Grz_c::setAttnPos() { /* 809EA1DC-809EA734 001EBC 0558+00 1/1 0/0 0/0 .text setCollisionPunch__11daNpc_Grz_cFv */ void daNpc_Grz_c::setCollisionPunch() { if (mType == TYPE_SMASH) { - f32 frame = mpMorf->getFrame(); + f32 frame = mAnm_p->getFrame(); if (mAnm == ANM_PUNCHING && ((frame >= 15.0f && frame < 16.0f) || (frame >= 35.0f && frame < 36.0f))) { daPy_py_c* player = daPy_getPlayerActorClass(); @@ -910,7 +910,7 @@ void daNpc_Grz_c::setCollisionPunch() { if (mAnm == ANM_PUNCHING && ((frame >= 10.0f && frame < 18.0f && i >= 2) || ((frame < 2.0f || frame >= 29.0f) && i < 2))) { cXyz sp60; mSphs[i].OnAtSetBit(); - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); static int l_attack_jnt[4] = { JNT_ARML2, JNT_HANDL, JNT_ARMR2, JNT_HANDR, @@ -1089,7 +1089,7 @@ bool daNpc_Grz_c::setExpressionBtp(int i_index) { return true; } - if (setBtpAnm(btp, mpMorf->getModel()->getModelData(), 1.0f, i_attr)) { + if (setBtpAnm(btp, mAnm_p->getModel()->getModelData(), 1.0f, i_attr)) { mAnmFlags |= ANM_PLAY_BTP | ANM_PAUSE_BTP; if (i_index == 0) { @@ -1196,7 +1196,7 @@ void daNpc_Grz_c::setMotionAnm(int i_index, f32 i_morf) { } if (btk != NULL) { - if (setBtkAnm(btk, mpMorf->getModel()->getModelData(), 1.0f, i_attr2)) { + if (setBtkAnm(btk, mAnm_p->getModel()->getModelData(), 1.0f, i_attr2)) { mAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK; } } @@ -1670,7 +1670,7 @@ void daNpc_Grz_c::setLookMode(int i_lookMode) { /* 809EC188-809EC424 003E68 029C+00 1/1 0/0 0/0 .text lookat__11daNpc_Grz_cFv */ void daNpc_Grz_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL bVar1 = FALSE; f32 body_angleX_min = daNpc_Grz_Param_c::m.common.body_angleX_min; f32 body_angleX_max = daNpc_Grz_Param_c::m.common.body_angleX_max; @@ -1865,7 +1865,7 @@ int daNpc_Grz_c::waitSmash(void* param_1) { fopAcM_delete(this); } else { if (mAnm == ANM_PUNCHING) { - f32 frame = mpMorf->getFrame(); + f32 frame = mAnm_p->getFrame(); if ((frame >= 10.0f && frame < 11.0f) || (frame >= 28.0f && frame < 29.0f)) { mSound.startCreatureVoice(Z2SE_GRZ_V_BREAK, -1); } @@ -2132,7 +2132,7 @@ int daNpc_Grz_c::doTalkStandCut(int i_staffId) { switch (prm) { case 0: if (mAnm == ANM_GETUP_2) { - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { rv = 1; } } @@ -2210,7 +2210,7 @@ int daNpc_Grz_c::doGoOutCut(int i_staffId) { break; case 21: - mpMorf->setPlaySpeed(0.0f); + mAnm_p->setPlaySpeed(0.0f); break; case 99: @@ -2346,8 +2346,8 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) { break; case 75: - mpMorf->setPlaySpeed(0.0f); - mpMorf->setEndFrame(10.0f); + mAnm_p->setPlaySpeed(0.0f); + mAnm_p->setEndFrame(10.0f); break; case 80: @@ -2358,12 +2358,12 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) { switch (prm) { case 0: - if (mpMorf->getFrame() == mpMorf->getStartFrame()) { + if (mAnm_p->getFrame() == mAnm_p->getStartFrame()) { field_0x1a9c++; } if (field_0x1a9c >= 2) { - if (mpMorf->getFrame() >= 20.0f) { + if (mAnm_p->getFrame() >= 20.0f) { rv = 1; } } else { @@ -2375,7 +2375,7 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) { } if (mAnm == ANM_PUNCHING) { - f32 frame = mpMorf->getFrame(); + f32 frame = mAnm_p->getFrame(); if ((frame >= 10.0f && frame < 11.0f) || (frame >= 28.0f && frame < 29.0f)) { mSound.startCreatureVoice(Z2SE_GRZ_V_BREAK, -1); } @@ -2383,12 +2383,12 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) { break; case 10: - if (mpMorf->getFrame() == mpMorf->getStartFrame()) { + if (mAnm_p->getFrame() == mAnm_p->getStartFrame()) { rv = 1; } if (mAnm == ANM_PUNCHING) { - f32 frame = mpMorf->getFrame(); + f32 frame = mAnm_p->getFrame(); if ((frame >= 10.0f && frame < 11.0f) || (frame >= 28.0f && frame < 29.0f)) { mSound.startCreatureVoice(Z2SE_GRZ_V_BREAK, -1); } @@ -2396,7 +2396,7 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) { break; case 20: - if (mpMorf->getFrame() >= 17.0f) { + if (mAnm_p->getFrame() >= 17.0f) { dComIfGp_getVibration().StopQuake(31); rv = 1; } @@ -2405,7 +2405,7 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) { case 30: if (mMotionPhase > 0) { rv = 1; - } else if (mpMorf->getFrame() == 35.0f) { + } else if (mAnm_p->getFrame() == 35.0f) { dComIfGp_getVibration().StartShock(8, 15, cXyz(0.0f, 1.0f, 0.0f)); daObjGrzRock_c* rock_p = (daObjGrzRock_c*)mActorMngrs[3].getActorP(); if (rock_p != NULL) { @@ -2448,7 +2448,7 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) { if (mMotion == MOT_TO_STONE_NORMAL) { if (mMotionPhase > 0) { rv = 1; - } else if (mpMorf->checkFrame(14.0f)) { + } else if (mAnm_p->checkFrame(14.0f)) { cXyz sp70(0.0f, 0.0f, 20.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(mCurAngle.y); @@ -2466,9 +2466,9 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) { mPath.getDstPos(current.pos, sp7c); cLib_addCalcAngleS2(&mCurAngle.y, cLib_targetAngleY(¤t.pos, &sp7c), 6, 0x400); setAngle(mCurAngle.y); - f32 playSpeed = mpMorf->getPlaySpeed(); + f32 playSpeed = mAnm_p->getPlaySpeed(); cLib_addCalc2(&playSpeed, 1.0f, 0.1f, 0.1f); - mpMorf->setPlaySpeed(playSpeed); + mAnm_p->setPlaySpeed(playSpeed); speedF = daNpc_Grz_Param_c::m.rotation_movement_speed * playSpeed; } @@ -2480,7 +2480,7 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) { break; } - if (mMotion == MOT_TO_STONE_NORMAL && mMotionPhase > 0 && mpMorf->getPlaySpeed() >= 0.5f) { + if (mMotion == MOT_TO_STONE_NORMAL && mMotionPhase > 0 && mAnm_p->getPlaySpeed() >= 0.5f) { JPABaseEmitter* emitter = NULL; cXyz pos(current.pos); cXyz scale(1.2f, 1.2f, 1.2f); diff --git a/src/d/actor/d_a_npc_gwolf.cpp b/src/d/actor/d_a_npc_gwolf.cpp index 615fb06200..8a017a13ef 100644 --- a/src/d/actor/d_a_npc_gwolf.cpp +++ b/src/d/actor/d_a_npc_gwolf.cpp @@ -232,7 +232,7 @@ daNpc_GWolf_c::~daNpc_GWolf_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -322,8 +322,8 @@ cPhs__Step daNpc_GWolf_c::create() { return cPhs_ERROR_e; } - mpMorf->getModel()->getModelData(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + mAnm_p->getModel()->getModelData(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -360,17 +360,17 @@ int daNpc_GWolf_c::CreateHeap() { JUT_ASSERT(538, NULL != mdlData_p); - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -399,7 +399,7 @@ int daNpc_GWolf_c::Execute() { /* 809F3C2C-809F3CBC 000C6C 0090+00 1/1 0/0 0/0 .text Draw__13daNpc_GWolf_cFv */ int daNpc_GWolf_c::Draw() { - J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); + J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData(); mdlData_p->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); return draw( @@ -409,7 +409,7 @@ int daNpc_GWolf_c::Draw() { /* 809F3CBC-809F3FB8 000CFC 02FC+00 1/1 0/0 0/0 .text draw__13daNpc_GWolf_cFiifP11_GXColorS10i */ int daNpc_GWolf_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_color, int param_5) { - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); J3DModelData* mdlData_p = model->getModelData(); field_0x9f3 = 1; @@ -457,7 +457,7 @@ int daNpc_GWolf_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_co fopAcM_setEffectMtx(this, mdlData_p); } - mpMorf->entryDL(); + mAnm_p->entryDL(); if ((mAnmFlags & ANM_PLAY_BTP) != 0) { mBtpAnm.remove(mdlData_p); @@ -487,11 +487,11 @@ int daNpc_GWolf_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int i_jointList[3] = {1, 3, 4}; if (jntNo == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -518,8 +518,8 @@ int daNpc_GWolf_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jntNo == 4 || jntNo == 0xE) && (mAnmFlags & ANM_PLAY_BCK) != 0) { J3DAnmTransform* anm = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(anm); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(anm); } return 1; @@ -682,7 +682,7 @@ void daNpc_GWolf_c::setAttnPos() { setMtx(); lookat(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); eyeOffset.y = 0.0f; @@ -795,7 +795,7 @@ void daNpc_GWolf_c::setMotionAnm(int i_index, f32 i_morf) { } if (i_btk != NULL) { - if (setBtkAnm(i_btk, mpMorf->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { + if (setBtkAnm(i_btk, mAnm_p->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { mAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK; } } @@ -807,7 +807,7 @@ void daNpc_GWolf_c::setMotionAnm(int i_index, f32 i_morf) { if (i_brk != NULL) { if (mBrkAnm.getBrkAnm() == i_brk) { mAnmFlags |= ANM_PLAY_BRK; - } else if (setBrkAnm(i_brk, mpMorf->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { + } else if (setBrkAnm(i_brk, mAnm_p->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { mAnmFlags |= ANM_PLAY_BRK | ANM_PAUSE_BRK; } } @@ -1006,19 +1006,19 @@ void daNpc_GWolf_c::playMotion() { if (mHide != true) { switch (mAnm) { case ANM_WAITSIT: - if (mpMorf->getFrame() >= 1.0f && mpMorf->getFrame() < 2.0f) { + if (mAnm_p->getFrame() >= 1.0f && mAnm_p->getFrame() < 2.0f) { mSound.startCreatureVoice(Z2SE_G_WLF_BREATH, -1); } break; case ANM_JUMPAST: - if (mpMorf->getFrame() >= 1.0f && mpMorf->getFrame() < 2.0f) { + if (mAnm_p->getFrame() >= 1.0f && mAnm_p->getFrame() < 2.0f) { mSound.startCreatureVoice(Z2SE_G_WLF_JUMP, -1); } break; case ANM_HOWLB: - if (mpMorf->getFrame() >= 1.0f && mpMorf->getFrame() < 2.0f) { + if (mAnm_p->getFrame() >= 1.0f && mAnm_p->getFrame() < 2.0f) { mSound.startCreatureVoice(Z2SE_G_WLF_TRANSFORM, -1); } break; @@ -1199,7 +1199,7 @@ void daNpc_GWolf_c::setLookMode(int i_lookMode) { /* 809F5B84-809F5E0C 002BC4 0288+00 1/1 0/0 0/0 .text lookat__13daNpc_GWolf_cFv */ void daNpc_GWolf_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL i_snap = FALSE; f32 body_angleX_min = daNpc_GWolf_Param_c::m.common.body_angleX_min; f32 body_angleX_max = daNpc_GWolf_Param_c::m.common.body_angleX_max; @@ -1356,11 +1356,11 @@ BOOL daNpc_GWolf_c::ECut_attackWarp(int i_staffId) { case 30: if (mMotion == MOT_ATTACKAST && mMotionPhase > 0) { - if (mpMorf->getFrame() >= 3.0f) { + if (mAnm_p->getFrame() >= 3.0f) { if (speed.y > 5.0f) { - mpMorf->setPlaySpeed(0.0f); + mAnm_p->setPlaySpeed(0.0f); } else { - mpMorf->setPlaySpeed(1.0f); + mAnm_p->setPlaySpeed(1.0f); } } @@ -1373,7 +1373,7 @@ BOOL daNpc_GWolf_c::ECut_attackWarp(int i_staffId) { dStage_changeScene(mExitId, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); Z2GetAudioMgr()->seStart(Z2SE_SY_WARP_FADE_GW, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - mpMorf->setPlaySpeed(0.5f); + mAnm_p->setPlaySpeed(0.5f); rv = TRUE; } } @@ -1487,11 +1487,11 @@ BOOL daNpc_GWolf_c::ECut_attackWarpHorse(int i_staffId) { case 30: if (mMotion == MOT_ATTACKAST && mMotionPhase > 0) { - if (mpMorf->getFrame() >= 3.0f && speed.y > 5.0f) { + if (mAnm_p->getFrame() >= 3.0f && speed.y > 5.0f) { if (speed.y > 5.0f) { - mpMorf->setPlaySpeed(0.0f); + mAnm_p->setPlaySpeed(0.0f); } else { - mpMorf->setPlaySpeed(1.0f); + mAnm_p->setPlaySpeed(1.0f); } } @@ -1503,7 +1503,7 @@ BOOL daNpc_GWolf_c::ECut_attackWarpHorse(int i_staffId) { } dStage_changeScene(mExitId, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); - mpMorf->setPlaySpeed(1.0f); + mAnm_p->setPlaySpeed(1.0f); Z2GetAudioMgr()->seStart(Z2SE_SY_WARP_FADE_GW, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); rv = TRUE; } @@ -1585,8 +1585,8 @@ BOOL daNpc_GWolf_c::ECut_howlingSessionA(int i_staffId) { switch (prm) { case 0: if (mAnm == ANM_HOWLC) { - if (mpMorf->getFrame() >= 28.0f) { - mpMorf->setLoopFrame(28.0f); + if (mAnm_p->getFrame() >= 28.0f) { + mAnm_p->setLoopFrame(28.0f); mBtpAnm.setLoopFrame(28.0f); rv = TRUE; } @@ -1622,7 +1622,7 @@ BOOL daNpc_GWolf_c::ECut_howlingSessionA(int i_staffId) { case 40: if (mAnm == ANM_JUMPAST) { - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { speedF = 20.0f; if (speed.y <= 4.0f) { diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp index 7191112f13..87c2de0838 100644 --- a/src/d/actor/d_a_npc_impal.cpp +++ b/src/d/actor/d_a_npc_impal.cpp @@ -115,7 +115,7 @@ daNpcImpal_c::~daNpcImpal_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } #if DEBUG @@ -152,8 +152,8 @@ int daNpcImpal_c::Create() { mFlowID = getMessageNo(); field_de2 = mFlowID; - J3DModelData* model_data = mpMorf->getModel()->getModelData(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + J3DModelData* model_data = mAnm_p->getModel()->getModelData(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -160.0f, -50.0f, -160.0f, 160.0f, 220.0f, 160.0f); mCreatureSound.init(¤t.pos, &eyePos, 3, 1); #if DEBUG @@ -176,7 +176,7 @@ int daNpcImpal_c::Create() { mGroundH = mAcch.GetGroundH(); setEnvTevColor(); setRoomNo(); - mpMorf->modelCalc(); + mAnm_p->modelCalc(); reset(); Execute(); @@ -200,17 +200,17 @@ BOOL daNpcImpal_c::CreateHeap() { mdlData_p = static_cast(dComIfG_getObjectRes(l_arcNames[0], 26)); JUT_ASSERT(349, 0 != mdlData_p); u32 reg_r23 = 0x11020284; - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, 0x80000, reg_r23); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return FALSE; } - model = mpMorf->getModel(); + model = mAnm_p->getModel(); for (u16 jointNo = 0; jointNo < mdlData_p->getJointNum(); jointNo++) { mdlData_p->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack); } @@ -249,7 +249,7 @@ int daNpcImpal_c::Draw() { return 1; } - J3DModelData* model_data = mpMorf->getModel()->getModelData(); + J3DModelData* model_data = mAnm_p->getModel()->getModelData(); model_data->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); draw(false, false, mpHIO->m.common.real_shadow_size, NULL, false); @@ -264,11 +264,11 @@ bool daNpcImpal_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int lookatJoints[3] = {1, 3, 4}; if (jointNo == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -286,8 +286,8 @@ bool daNpcImpal_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jointNo == 4 || jointNo == 8) && (mAnmFlags & ANM_PLAY_BCK)) { J3DAnmTransform* bckAnm = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(bckAnm); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(bckAnm); } return true; @@ -502,7 +502,7 @@ bool daNpcImpal_c::setExpressionBtp(int i_idx) { return true; } - if (setBtpAnm(btpAnm, mpMorf->getModel()->getModelData(), 1.0f, attr)) { + if (setBtpAnm(btpAnm, mAnm_p->getModel()->getModelData(), 1.0f, attr)) { mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP; if (i_idx == 0) { mAnmFlags |= ANM_FLAG_800; @@ -554,7 +554,7 @@ void daNpcImpal_c::setMotionAnm(int i_idx, f32 i_morf) { mMotionLoops = 0; } - if (btkAnm && setBtkAnm(btkAnm, mpMorf->getModel()->getModelData(), 1.0f, iVar4)) { + if (btkAnm && setBtkAnm(btkAnm, mAnm_p->getModel()->getModelData(), 1.0f, iVar4)) { mAnmFlags |= 0x12; } } @@ -616,7 +616,7 @@ bool daNpcImpal_c::setAction(daNpcImpal_c::actionFunc i_actionFn) { /* 80A0B76C-80A0B94C 003E6C 01E0+00 1/1 0/0 0/0 .text lookat__12daNpcImpal_cFv */ void daNpcImpal_c::lookat() { fopAc_ac_c* actor = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL snap = false; f32 body_angleX_min = mpHIO->m.common.body_angleX_min; @@ -1243,7 +1243,7 @@ void daNpcImpal_c::setAttnPos() { lookat(); cXyz local_1c(10.0f, 10.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&local_1c, &eyePos); local_1c.x = 0.0f; diff --git a/src/d/actor/d_a_npc_ins.cpp b/src/d/actor/d_a_npc_ins.cpp index 150ad9251d..d547cd9bfe 100644 --- a/src/d/actor/d_a_npc_ins.cpp +++ b/src/d/actor/d_a_npc_ins.cpp @@ -312,7 +312,7 @@ daNpcIns_c::~daNpcIns_c() { } if (heap != 0) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -428,8 +428,8 @@ cPhs__Step daNpcIns_c::Create() { mInsectMsgNo = getMessageNo(); field_0xe16 = mInsectMsgNo; - mpMorf->getModel()->getModelData(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + mAnm_p->getModel()->getModelData(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -160.0f, -50.0f, -160.0f, 160.0f, 220.0f, 160.0f); mSound.init(¤t.pos, &eyePos, 3, 1); mAcchCir.SetWall(daNpcIns_Param_c::m.common.width, daNpcIns_Param_c::m.common.knee_length); @@ -449,7 +449,7 @@ cPhs__Step daNpcIns_c::Create() { mGroundH = mAcch.GetGroundH(); setEnvTevColor(); setRoomNo(); - mpMorf->modelCalc(); + mAnm_p->modelCalc(); reset(); Execute(); } @@ -463,17 +463,17 @@ int daNpcIns_c::CreateHeap() { JUT_ASSERT(424, NULL != mdlData_p); - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -541,19 +541,19 @@ int daNpcIns_c::Execute() { /* 80A0EF94-80A0F0BC 000E34 0128+00 1/1 0/0 0/0 .text Draw__10daNpcIns_cFv */ int daNpcIns_c::Draw() { - mpMorf->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); + mAnm_p->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); draw(FALSE, FALSE, daNpcIns_Param_c::m.common.real_shadow_size, NULL, FALSE); if (mpUmbrellaModel != NULL) { g_env_light.setLightTevColorType_MAJI(mpUmbrellaModel, &tevStr); - mpUmbrellaModel->setBaseTRMtx(mpMorf->getModel()->getAnmMtx(JNT_FINGERL)); + mpUmbrellaModel->setBaseTRMtx(mAnm_p->getModel()->getAnmMtx(JNT_FINGERL)); mDoExt_modelUpdateDL(mpUmbrellaModel); dComIfGd_addRealShadow(mShadowKey, mpUmbrellaModel); } if (mpKagoModel != NULL) { g_env_light.setLightTevColorType_MAJI(mpKagoModel, &tevStr); - mpKagoModel->setBaseTRMtx(mpMorf->getModel()->getAnmMtx(JNT_ARML2)); + mpKagoModel->setBaseTRMtx(mAnm_p->getModel()->getAnmMtx(JNT_ARML2)); mDoExt_modelUpdateDL(mpKagoModel); dComIfGd_addRealShadow(mShadowKey, mpKagoModel); } @@ -567,11 +567,11 @@ int daNpcIns_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int lookatJoints[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD}; if (jntNo == JNT_CENTER) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -590,8 +590,8 @@ int daNpcIns_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK) != 0) { J3DAnmTransform* anmTransform = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(anmTransform); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(anmTransform); } return 1; @@ -837,7 +837,7 @@ bool daNpcIns_c::setExpressionBtp(int i_index) { return true; } - if (setBtpAnm(i_btp, mpMorf->getModel()->getModelData(), 1.0f, i_attr)) { + if (setBtpAnm(i_btp, mAnm_p->getModel()->getModelData(), 1.0f, i_attr)) { mAnmFlags |= ANM_PLAY_BTP | ANM_PAUSE_BTP; if (i_index == EXPR_BTP_INS) { @@ -876,7 +876,7 @@ void daNpcIns_c::setMotionAnm(int i_index, f32 i_morf) { mMotionLoops = 0; } - if (i_btk != NULL && setBtkAnm(i_btk, mpMorf->getModel()->getModelData(), 1.0f, btk_attr)) { + if (i_btk != NULL && setBtkAnm(i_btk, mAnm_p->getModel()->getModelData(), 1.0f, btk_attr)) { mAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK; } } @@ -961,7 +961,7 @@ void daNpcIns_c::setAttnPos() { setMtx(); lookat(); cXyz sp2c(10.0f, 10.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&sp2c, &eyePos); sp2c.x = 0.0f; @@ -990,7 +990,7 @@ void daNpcIns_c::setAttnPos() { /* 80A131AC-80A1339C 00504C 01F0+00 1/1 0/0 0/0 .text lookat__10daNpcIns_cFv */ void daNpcIns_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL i_snap = FALSE; f32 body_angleX_min = daNpcIns_Param_c::m.common.body_angleX_min; f32 body_angleX_max = daNpcIns_Param_c::m.common.body_angleX_max; @@ -1049,7 +1049,7 @@ void daNpcIns_c::lookat() { /* 80A1339C-80A13460 00523C 00C4+00 1/0 0/0 0/0 .text setMtx__10daNpcIns_cFv */ void daNpcIns_c::setMtx() { - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); mDoMtx_stack_c::transS(current.pos.x, mCurrentPosY, current.pos.z); mDoMtx_stack_c::ZXYrotM(mCurAngle); @@ -1057,16 +1057,16 @@ void daNpcIns_c::setMtx() { model->setUserArea((uintptr_t)this); if (!cM3d_IsZero(mExpressionMorf)) { - mpMorf->onMorfNone(); + mAnm_p->onMorfNone(); } else { - mpMorf->offMorfNone(); + mAnm_p->offMorfNone(); } if ((mAnmFlags & ANM_PLAY_BCK) != 0) { mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame()); } - mpMorf->modelCalc(); + mAnm_p->modelCalc(); } BOOL daNpcIns_c::setAction(actionFunc action) { diff --git a/src/d/actor/d_a_npc_kasi_hana.cpp b/src/d/actor/d_a_npc_kasi_hana.cpp index 4fd4b23f37..b21a9bd8ba 100644 --- a/src/d/actor/d_a_npc_kasi_hana.cpp +++ b/src/d/actor/d_a_npc_kasi_hana.cpp @@ -606,7 +606,7 @@ daNpcKasiHana_c::~daNpcKasiHana_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -672,8 +672,8 @@ cPhs__Step daNpcKasiHana_c::Create() { return cPhs_ERROR_e; } - J3DModel* model = mpMorf->getModel(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + J3DModel* model = mAnm_p->getModel(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -60.0f, -10.0f, -60.0f, 60.0f, 160.0f, 60.0f); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -706,21 +706,21 @@ int daNpcKasiHana_c::CreateHeap() { JUT_ASSERT(950, NULL != mdlData_p); - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } cXyz i_scale(1.0f, 0.8630768f, 1.0f); - mpMorf->offTranslate(); - mpMorf->setTranslateScale(i_scale); + mAnm_p->offTranslate(); + mAnm_p->setTranslateScale(i_scale); - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -758,11 +758,11 @@ int daNpcKasiHana_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int i_jointList[3] = {JNT_BACKBONE, JNT_NECK, JNT_HEAD}; if (jntNo == JNT_CENTER) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -885,7 +885,7 @@ void daNpcKasiHana_c::setAttnPos() { cXyz sp1c(10.0f, 15.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&sp1c, &eyePos); sp1c.x = 0.0f; @@ -897,7 +897,7 @@ void daNpcKasiHana_c::setAttnPos() { cXyz sp28; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&sp28); sp28.y = current.pos.y; mCyl.SetC(sp28); @@ -977,7 +977,7 @@ void daNpcKasiHana_c::reset() { J3DAnmTexPattern* i_btp = getTexPtrnAnmP(l_arcNames[0], 8); mAnmFlags &= 0xFFFFF57F; - if (setBtpAnm(i_btp, mpMorf->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { + if (setBtpAnm(i_btp, mAnm_p->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { mAnmFlags |= ANM_FLAG_800 | ANM_PLAY_BTP | ANM_PAUSE_BTP; } @@ -1078,7 +1078,7 @@ void daNpcKasiHana_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** i_data) } mExpressionMorf = 0.0f; - mpMorf->setMorf(i_morf); + mAnm_p->setMorf(i_morf); } } @@ -1113,7 +1113,7 @@ void daNpcKasiHana_c::setLookMode(int i_lookMode) { /* 80A1D848-80A1DA28 002988 01E0+00 1/1 0/0 0/0 .text lookat__15daNpcKasiHana_cFv */ void daNpcKasiHana_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL i_snap = FALSE; f32 body_angleX_min = daNpcKasiHana_Param_c::m.common.body_angleX_min; f32 body_angleX_max = daNpcKasiHana_Param_c::m.common.body_angleX_max; @@ -1466,7 +1466,7 @@ int daNpcKasiHana_c::fear(int param_1) { break; case 3: - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { setMotion(MOT_W_RUN_A, -1.0f, 0); fopAcM_SetSpeedF(this, 15.0f); mSound.startCreatureVoice(Z2SE_HANA_V_FEAR, -1); @@ -1476,7 +1476,7 @@ int daNpcKasiHana_c::fear(int param_1) { case 4: { cXyz sp28; - mpMorf->setPlaySpeed(1.5f); + mAnm_p->setPlaySpeed(1.5f); if (mPath.getDstPos(current.pos, sp28)) { mEscape = true; @@ -1717,7 +1717,7 @@ int daNpcKasiHana_c::escape(int param_1) { } else { _turn_pos(sp28, 0x600); mKasiMng.calcEscapeForm(); - mpMorf->setPlaySpeed(1.75f); + mAnm_p->setPlaySpeed(1.75f); } break; } @@ -1883,7 +1883,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Appear_CutMain(int const& i_cutIndex) { break; case 21: - if (mMotion == MOT_MICH_KYA_TALK && (mpMorf->getFrame() == 19.0f || mpMorf->getFrame() == 1.0f)) { + if (mMotion == MOT_MICH_KYA_TALK && (mAnm_p->getFrame() == 19.0f || mAnm_p->getFrame() == 1.0f)) { setMotion(MOT_W_WAIT_A, -1.0f, 0); } @@ -1976,7 +1976,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Talk_CutMain(int const& i_cutIndex, int param_2) break; case 20: - if (mMotion == MOT_MICH_KYA_TALK && (mpMorf->getFrame() == 19.0f || mpMorf->getFrame() == 1.0f)) { + if (mMotion == MOT_MICH_KYA_TALK && (mAnm_p->getFrame() == 19.0f || mAnm_p->getFrame() == 1.0f)) { setMotion(MOT_W_WAIT_A, -1.0f, 0); } @@ -2076,7 +2076,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_CutMain(int const& i_cutIndex) { break; case 21: - if (mMotion == MOT_MICH_KYA_TALK && (mpMorf->getFrame() == 19.0f || mpMorf->getFrame() == 1.0f)) { + if (mMotion == MOT_MICH_KYA_TALK && (mAnm_p->getFrame() == 19.0f || mAnm_p->getFrame() == 1.0f)) { setMotion(MOT_W_WAIT_A, -1.0f, 0); } diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp index 4c4d1a2406..3e72347b05 100644 --- a/src/d/actor/d_a_npc_kasi_kyu.cpp +++ b/src/d/actor/d_a_npc_kasi_kyu.cpp @@ -160,7 +160,7 @@ daNpcKasiKyu_c::~daNpcKasiKyu_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -224,8 +224,8 @@ cPhs__Step daNpcKasiKyu_c::Create() { return cPhs_ERROR_e; } - J3DModel* model = mpMorf->getModel(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + J3DModel* model = mAnm_p->getModel(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -60.0f, -10.0f, -60.0f, 60.0f, 220.0f, 60.0f); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -258,21 +258,21 @@ int daNpcKasiKyu_c::CreateHeap() { JUT_ASSERT(322, NULL != mdlData_p); - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } cXyz i_scale(1.0f, 0.8630768f, 1.0f); - mpMorf->offTranslate(); - mpMorf->setTranslateScale(i_scale); + mAnm_p->offTranslate(); + mAnm_p->setTranslateScale(i_scale); - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -311,11 +311,11 @@ int daNpcKasiKyu_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int i_jointList[3] = {1, 2, 3}; if (jntNo == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(2)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(2)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -424,7 +424,7 @@ void daNpcKasiKyu_c::setAttnPos() { cXyz sp1c(10.0f, 15.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&sp1c, &eyePos); sp1c.x = 0.0f; @@ -436,7 +436,7 @@ void daNpcKasiKyu_c::setAttnPos() { cXyz sp28; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&sp28); sp28.y = current.pos.y; mCyl.SetC(sp28); @@ -514,7 +514,7 @@ void daNpcKasiKyu_c::reset() { J3DAnmTexPattern* i_btp = getTexPtrnAnmP(l_arcNames[0], 7); mAnmFlags &= 0xFFFFF57F; - if (setBtpAnm(i_btp, mpMorf->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { + if (setBtpAnm(i_btp, mAnm_p->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { mAnmFlags |= ANM_FLAG_800 | ANM_PLAY_BTP | ANM_PAUSE_BTP; } @@ -620,7 +620,7 @@ void daNpcKasiKyu_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** i_data) { } mExpressionMorf = 0.0f; - mpMorf->setMorf(i_morf); + mAnm_p->setMorf(i_morf); } } @@ -655,7 +655,7 @@ void daNpcKasiKyu_c::setLookMode(int i_lookMode) { /* 80A23350-80A23530 001A70 01E0+00 1/1 0/0 0/0 .text lookat__14daNpcKasiKyu_cFv */ void daNpcKasiKyu_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL i_snap = FALSE; f32 body_angleX_min = daNpcKasiKyu_Param_c::m.common.body_angleX_min; f32 body_angleX_max = daNpcKasiKyu_Param_c::m.common.body_angleX_max; @@ -869,7 +869,7 @@ int daNpcKasiKyu_c::fear(int param_1) { break; case 3: - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { setMotion(MOT_W_RUN_A, -1.0f, 0); mSound.startCreatureVoice(Z2SE_KIU_V_FEAR, -1); fopAcM_SetSpeedF(this, 15.0f); @@ -879,7 +879,7 @@ int daNpcKasiKyu_c::fear(int param_1) { case 4: { cXyz sp28; - mpMorf->setPlaySpeed(1.5f); + mAnm_p->setPlaySpeed(1.5f); if (mPath.getDstPos(current.pos, sp28)) { mEscape = true; @@ -1142,7 +1142,7 @@ int daNpcKasiKyu_c::kya(int param_1) { case 0: setMotion(MOT_MICH_KYA_TALK, -1.0f, 0); speedF = 0.0f; - mpMorf->setPlaySpeed(0.0f); + mAnm_p->setPlaySpeed(0.0f); field_0x1460 = 8; mMode = 1; break; @@ -1152,9 +1152,9 @@ int daNpcKasiKyu_c::kya(int param_1) { field_0x1460--; if (field_0x1460 == 0) { - mpMorf->setPlaySpeed(1.0f); + mAnm_p->setPlaySpeed(1.0f); } else { - mpMorf->setPlaySpeed(0.0f); + mAnm_p->setPlaySpeed(0.0f); } } break; @@ -1173,7 +1173,7 @@ int daNpcKasiKyu_c::kya2(int param_1) { setMotion(MOT_MICH_KYA_TALK, -1.0f, 0); setLookMode(LOOK_NONE); speedF = 0.0f; - mpMorf->setPlaySpeed(1.0f); + mAnm_p->setPlaySpeed(1.0f); mMode = 1; break; @@ -1200,7 +1200,7 @@ int daNpcKasiKyu_c::kya_stop(int param_1) { break; case 1: - if (mpMorf->getFrame() == 19.0f || mpMorf->getFrame() == 1.0f) { + if (mAnm_p->getFrame() == 19.0f || mAnm_p->getFrame() == 1.0f) { setAction(&daNpcKasiKyu_c::wait_dummy); } break; @@ -1307,7 +1307,7 @@ int daNpcKasiKyu_c::escape(int param_1) { case 2: _turn_pos(mChacePos, 0x1000); - mpMorf->setPlaySpeed(1.75f); + mAnm_p->setPlaySpeed(1.75f); break; } @@ -1352,7 +1352,7 @@ int daNpcKasiKyu_c::cheer(int param_1) { setLookMode(LOOK_PLAYER); fopAcM_SetSpeed(this, 0.0f, 0.0f, 0.0f); fopAcM_SetSpeedF(this, 0.0f); - mpMorf->setPlaySpeed(0.0f); + mAnm_p->setPlaySpeed(0.0f); mTalked = false; field_0x1460 = 12; mMode = 1; @@ -1363,9 +1363,9 @@ int daNpcKasiKyu_c::cheer(int param_1) { field_0x1460--; if (field_0x1460 == 0) { - mpMorf->setPlaySpeed(1.0f); + mAnm_p->setPlaySpeed(1.0f); } else { - mpMorf->setPlaySpeed(0.0f); + mAnm_p->setPlaySpeed(0.0f); } } diff --git a/src/d/actor/d_a_npc_kasi_mich.cpp b/src/d/actor/d_a_npc_kasi_mich.cpp index f930f49df1..5dfe234cdb 100644 --- a/src/d/actor/d_a_npc_kasi_mich.cpp +++ b/src/d/actor/d_a_npc_kasi_mich.cpp @@ -160,7 +160,7 @@ daNpcKasiMich_c::~daNpcKasiMich_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -224,8 +224,8 @@ cPhs__Step daNpcKasiMich_c::Create() { return cPhs_ERROR_e; } - J3DModel* model = mpMorf->getModel(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + J3DModel* model = mAnm_p->getModel(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -60.0f, -10.0f, -60.0f, 60.0f, 220.0f, 60.0f); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -258,21 +258,21 @@ int daNpcKasiMich_c::CreateHeap() { JUT_ASSERT(314, NULL != mdlData_p); - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } cXyz i_scale(1.0f, 0.8630768f, 1.0f); - mpMorf->offTranslate(); - mpMorf->setTranslateScale(i_scale); + mAnm_p->offTranslate(); + mAnm_p->setTranslateScale(i_scale); - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -311,11 +311,11 @@ int daNpcKasiMich_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int i_jointList[3] = {1, 2, 3}; if (jntNo == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(2)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(2)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -424,7 +424,7 @@ void daNpcKasiMich_c::setAttnPos() { cXyz sp1c(10.0f, 15.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&sp1c, &eyePos); sp1c.x = 0.0f; @@ -436,7 +436,7 @@ void daNpcKasiMich_c::setAttnPos() { cXyz sp28; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&sp28); sp28.y = current.pos.y; mCyl.SetC(sp28); @@ -514,7 +514,7 @@ void daNpcKasiMich_c::reset() { J3DAnmTexPattern* i_btp = getTexPtrnAnmP(l_arcNames[0], 7); mAnmFlags &= 0xFFFFF57F; - if (setBtpAnm(i_btp, mpMorf->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { + if (setBtpAnm(i_btp, mAnm_p->getModel()->getModelData(), 1.0f, J3DFrameCtrl::EMode_LOOP)) { mAnmFlags |= ANM_FLAG_800 | ANM_PLAY_BTP | ANM_PAUSE_BTP; } @@ -620,7 +620,7 @@ void daNpcKasiMich_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** i_data) } mExpressionMorf = 0.0f; - mpMorf->setMorf(i_morf); + mAnm_p->setMorf(i_morf); } } @@ -655,7 +655,7 @@ void daNpcKasiMich_c::setLookMode(int i_lookMode) { /* 80A27B50-80A27D30 001A70 01E0+00 1/1 0/0 0/0 .text lookat__15daNpcKasiMich_cFv */ void daNpcKasiMich_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL i_snap = FALSE; f32 body_angleX_min = daNpcKasiMich_Param_c::m.common.body_angleX_min; f32 body_angleX_max = daNpcKasiMich_Param_c::m.common.body_angleX_max; @@ -869,7 +869,7 @@ int daNpcKasiMich_c::fear(int param_1) { break; case 3: - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { setMotion(MOT_W_RUN_A, -1.0f, 0); fopAcM_SetSpeedF(this, 15.0f); mSound.startCreatureVoice(Z2SE_MICH_V_FEAR, -1); @@ -879,7 +879,7 @@ int daNpcKasiMich_c::fear(int param_1) { case 4: { cXyz sp28; - mpMorf->setPlaySpeed(1.5f); + mAnm_p->setPlaySpeed(1.5f); if (mPath.getDstPos(current.pos, sp28)) { mEscape = true; @@ -1142,7 +1142,7 @@ int daNpcKasiMich_c::kya(int param_1) { case 0: setMotion(MOT_MICH_KYA_TALK, -1.0f, 0); speedF = 0.0f; - mpMorf->setPlaySpeed(0.0f); + mAnm_p->setPlaySpeed(0.0f); field_0x1440 = 16; mMode = 1; break; @@ -1152,9 +1152,9 @@ int daNpcKasiMich_c::kya(int param_1) { field_0x1440--; if (field_0x1440 == 0) { - mpMorf->setPlaySpeed(1.0f); + mAnm_p->setPlaySpeed(1.0f); } else { - mpMorf->setPlaySpeed(0.0f); + mAnm_p->setPlaySpeed(0.0f); } } break; @@ -1173,7 +1173,7 @@ int daNpcKasiMich_c::kya2(int param_1) { setMotion(MOT_MICH_KYA_TALK, -1.0f, 0); setLookMode(LOOK_NONE); speedF = 0.0f; - mpMorf->setPlaySpeed(1.0f); + mAnm_p->setPlaySpeed(1.0f); mMode = 1; break; @@ -1200,7 +1200,7 @@ int daNpcKasiMich_c::kya_stop(int param_1) { break; case 1: - if (mpMorf->getFrame() == 19.0f || mpMorf->getFrame() == 1.0f) { + if (mAnm_p->getFrame() == 19.0f || mAnm_p->getFrame() == 1.0f) { setAction(&daNpcKasiMich_c::wait); } break; @@ -1252,7 +1252,7 @@ int daNpcKasiMich_c::escape(int param_1) { case 2: _turn_pos(mChacePos, 0x1000); - mpMorf->setPlaySpeed(1.75f); + mAnm_p->setPlaySpeed(1.75f); break; } @@ -1350,7 +1350,7 @@ int daNpcKasiMich_c::cheer(int param_1) { setLookMode(LOOK_PLAYER); fopAcM_SetSpeed(this, 0.0f, 0.0f, 0.0f); fopAcM_SetSpeedF(this, 0.0f); - mpMorf->setPlaySpeed(0.0f); + mAnm_p->setPlaySpeed(0.0f); mTalked = false; field_0x1440 = 20; mMode = 1; @@ -1361,9 +1361,9 @@ int daNpcKasiMich_c::cheer(int param_1) { field_0x1440--; if (field_0x1440 == 0) { - mpMorf->setPlaySpeed(1.0f); + mAnm_p->setPlaySpeed(1.0f); } else { - mpMorf->setPlaySpeed(0.0f); + mAnm_p->setPlaySpeed(0.0f); } } diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index b7dad09050..a478ce9843 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -290,7 +290,7 @@ daNpcMoiR_c::~daNpcMoiR_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } #if DEBUG if (mpHIO) { @@ -363,8 +363,8 @@ cPhs__Step daNpcMoiR_c::Create() { return cPhs_ERROR_e; } - J3DModelData* model_data = mpMorf->getModel()->getModelData(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + J3DModelData* model_data = mAnm_p->getModel()->getModelData(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -100.0f, -50.0f, -100.0f, 100.0f, 220.0f, 100.0f); mSound.init(¤t.pos, &eyePos, 3, 1); #if DEBUG @@ -391,7 +391,7 @@ cPhs__Step daNpcMoiR_c::Create() { setEnvTevColor(); setRoomNo(); - mpMorf->modelCalc(); + mAnm_p->modelCalc(); reset(); Execute(); } @@ -408,17 +408,17 @@ int daNpcMoiR_c::CreateHeap() { JUT_ASSERT(403, NULL != mdlData_p); u32 sp_0x18 = 0x11020284; - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x18); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x18); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - mdl_p = mpMorf->getModel(); + mdl_p = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -475,7 +475,7 @@ int daNpcMoiR_c::Execute() { /* 80A7CEA0-80A7CEFC 000E20 005C+00 1/1 0/0 0/0 .text Draw__11daNpcMoiR_cFv */ int daNpcMoiR_c::Draw() { - J3DModelData* model_data = mpMorf->getModel()->getModelData(); + J3DModelData* model_data = mAnm_p->getModel()->getModelData(); model_data->getMaterialNodePointer(MAT_MOIR_EYEBALL_M)->setMaterialAnm(mpMatAnm); draw(FALSE, FALSE, mpHIO->m.common.real_shadow_size, NULL, FALSE); return 1; @@ -488,13 +488,13 @@ int daNpcMoiR_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int i_jointList[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD}; if (jntNo == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -514,8 +514,8 @@ int daNpcMoiR_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK) != 0) { J3DAnmTransform* anm = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(anm); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(anm); } return 1; @@ -681,7 +681,7 @@ bool daNpcMoiR_c::setExpressionBtp(int i_index) { return true; } - if (setBtpAnm(anmTexPattern, mpMorf->getModel()->getModelData(), 1.0f, i_attr)) { + if (setBtpAnm(anmTexPattern, mAnm_p->getModel()->getModelData(), 1.0f, i_attr)) { mAnmFlags |= ANM_PLAY_BTP | ANM_PAUSE_BTP; if (i_index == EXPR_BTP_MOIR) { @@ -715,7 +715,7 @@ void daNpcMoiR_c::setMotionAnm(int i_index, f32 i_morf) { } if (btkAnm != NULL) { - if (setBtkAnm(btkAnm, mpMorf->getModel()->getModelData(), 1.0f, i_btkAttr)) { + if (setBtkAnm(btkAnm, mAnm_p->getModel()->getModelData(), 1.0f, i_btkAttr)) { mAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK; } } @@ -954,7 +954,7 @@ void daNpcMoiR_c::playMotion() { /* 80A825A0-80A82878 006520 02D8+00 1/1 0/0 0/0 .text lookat__11daNpcMoiR_cFv */ void daNpcMoiR_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL bVar1 = FALSE; f32 body_angleX_min = mpHIO->m.common.body_angleX_min; f32 body_angleX_max = mpHIO->m.common.body_angleX_max; @@ -989,7 +989,7 @@ void daNpcMoiR_c::lookat() { } if (mMode == MODE_SIT) { - J3DAnmTransform* anm = mpMorf->getAnm(); + J3DAnmTransform* anm = mAnm_p->getAnm(); if (anm == getTrnsfrmKeyAnmP(l_arcNames[1], l_bckGetParamList[30].fileIdx) || anm == getTrnsfrmKeyAnmP(l_arcNames[1], l_bckGetParamList[33].fileIdx)) { player = NULL; @@ -1522,7 +1522,7 @@ bool daNpcMoiR_c::fight(void* param_1) { field_0xe00 = cLib_getRndValue(1, 2); } - if (mMotion == MOT_DRIVEAWAY && mMotionPhase == 0 && (mpMorf->checkFrame(11.0f) || mpMorf->checkFrame(36.0f))) { + if (mMotion == MOT_DRIVEAWAY && mMotionPhase == 0 && (mAnm_p->checkFrame(11.0f) || mAnm_p->checkFrame(36.0f))) { mSound.startCreatureVoice(Z2SE_MOIR_V_SHIT_H, -1); } @@ -1819,7 +1819,7 @@ BOOL daNpcMoiR_c::EvCut_Appear2(int i_cutIndex) { break; } - if (mMotionPhase == 0 && mpMorf->checkFrame(25.0f)) { + if (mMotionPhase == 0 && mAnm_p->checkFrame(25.0f)) { mDoAud_seStart(Z2SE_PLAY_REED_TOBIKUSA, NULL, 0, 0); break; } @@ -1931,12 +1931,12 @@ BOOL daNpcMoiR_c::main() { /* 80A815D4-80A818B4 005554 02E0+00 1/1 0/0 0/0 .text checkHeadGear__11daNpcMoiR_cFv */ void daNpcMoiR_c::checkHeadGear() { - J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); - J3DAnmTransform* anm = mpMorf->getAnm(); + J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData(); + J3DAnmTransform* anm = mAnm_p->getAnm(); if (mMode == MODE_SIT) { if (anm == getTrnsfrmKeyAnmP(l_arcNames[1], l_bckGetParamList[30].fileIdx)) { - if (mpMorf->checkFrame(14.0f)) { + if (mAnm_p->checkFrame(14.0f)) { mWearHelmet = false; mdlData_p->getMaterialNodePointer(MAT_MOIR_HEADGEAR_M)->getShape()->hide(); } @@ -1946,13 +1946,13 @@ void daNpcMoiR_c::checkHeadGear() { } else if (anm == getTrnsfrmKeyAnmP(l_arcNames[1], l_bckGetParamList[32].fileIdx)) { mWearHelmet = false; mdlData_p->getMaterialNodePointer(MAT_MOIR_HEADGEAR_M)->getShape()->hide(); - } else if (anm == getTrnsfrmKeyAnmP(l_arcNames[1], l_bckGetParamList[33].fileIdx) && mpMorf->checkFrame(24.0f)) { + } else if (anm == getTrnsfrmKeyAnmP(l_arcNames[1], l_bckGetParamList[33].fileIdx) && mAnm_p->checkFrame(24.0f)) { mWearHelmet = true; mdlData_p->getMaterialNodePointer(MAT_MOIR_HEADGEAR_M)->getShape()->show(); } } else if (mMode == MODE_STAND) { if (anm == getTrnsfrmKeyAnmP(l_arcNames[2], l_bckGetParamList[24].fileIdx)) { - if (mpMorf->checkFrame(15.0f)) { + if (mAnm_p->checkFrame(15.0f)) { mWearHelmet = false; mdlData_p->getMaterialNodePointer(MAT_MOIR_HEADGEAR_M)->getShape()->hide(); } @@ -1962,7 +1962,7 @@ void daNpcMoiR_c::checkHeadGear() { } else if (anm == getTrnsfrmKeyAnmP(l_arcNames[2], l_bckGetParamList[26].fileIdx)) { mWearHelmet = false; mdlData_p->getMaterialNodePointer(MAT_MOIR_HEADGEAR_M)->getShape()->hide(); - } else if (anm == getTrnsfrmKeyAnmP(l_arcNames[2], l_bckGetParamList[27].fileIdx) && mpMorf->checkFrame(33.0f)) { + } else if (anm == getTrnsfrmKeyAnmP(l_arcNames[2], l_bckGetParamList[27].fileIdx) && mAnm_p->checkFrame(33.0f)) { mWearHelmet = true; mdlData_p->getMaterialNodePointer(MAT_MOIR_HEADGEAR_M)->getShape()->show(); } @@ -2007,7 +2007,7 @@ void daNpcMoiR_c::setAttnPos() { sp40.set(-15.0f, 10.0f, 2.0f); } - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&sp40, &eyePos); sp40.x = 0.0f; @@ -2034,7 +2034,7 @@ void daNpcMoiR_c::setAttnPos() { attention_info.position.set(mHeadPos.x, mHeadPos.y + mpHIO->m.common.attention_offset, mHeadPos.z); cXyz sp58; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE2)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE2)); mDoMtx_stack_c::multVecZero(&sp58); sp58.y = current.pos.y; field_0xca0.SetC(sp58); @@ -2055,7 +2055,7 @@ void daNpcMoiR_c::setAttnPos() { void daNpcMoiR_c::drawOtherMdls() { if (!mWearHelmet) { g_env_light.setLightTevColorType_MAJI(mpHeadgearModel, &tevStr); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HANDR)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HANDR)); mpHeadgearModel->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(mpHeadgearModel); } diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp index 9361c1bd5d..ad0bf59bec 100644 --- a/src/d/actor/d_a_npc_myna2.cpp +++ b/src/d/actor/d_a_npc_myna2.cpp @@ -136,7 +136,7 @@ daNpc_myna2_c::~daNpc_myna2_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -218,8 +218,8 @@ int daNpc_myna2_c::create() { return cPhs_ERROR_e; } - J3DModelData* model_data = mpMorf->getModel()->getModelData(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + J3DModelData* model_data = mAnm_p->getModel()->getModelData(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -258,17 +258,17 @@ int daNpc_myna2_c::CreateHeap() { JUT_ASSERT(476, NULL != mdlData_p); - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - mpMorf->getModel()->setUserArea((uintptr_t)this); + mAnm_p->getModel()->setUserArea((uintptr_t)this); setMotionAnm(0, 0.0f); return 1; @@ -386,7 +386,7 @@ void daNpc_myna2_c::setAttnPos() { setMtx(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(15)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(15)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); eyeOffset.y = 0.0f; @@ -447,7 +447,7 @@ bool daNpc_myna2_c::setExpressionBtp(int i_index) { return 1; } - if (setBtpAnm(btp_p, mpMorf->getModel()->getModelData(), 1.0f, mode)) { + if (setBtpAnm(btp_p, mAnm_p->getModel()->getModelData(), 1.0f, mode)) { mAnmFlags |= 0x280; if (i_index == 0) { mAnmFlags |= 0x800; @@ -957,7 +957,7 @@ int daNpc_myna2_c::talk(void* param_0) { if (!mIsDamaged) { initTalk(field_0xe04, NULL); mTurnMode = 0; - mpMorf->setPlaySpeed(1.0f); + mAnm_p->setPlaySpeed(1.0f); mMode = 2; case 2: mSound.playSumomoBgm(0); @@ -1280,10 +1280,10 @@ void daNpc_myna2_c::calcHovering(int param_0, int param_1) { if (param_0 != 0) { field_0xe1c.set(0.0f, 5.0f, 0.0f); cLib_addCalcPos2(&field_0xe10, field_0xe1c, 0.1f, 0.1f); - mpMorf->setPlaySpeed(1.5f); + mAnm_p->setPlaySpeed(1.5f); } else if (current.pos.y > 500.0f + home.pos.y) { field_0xe10.y = -25.0f; - mpMorf->setPlaySpeed(0.5f); + mAnm_p->setPlaySpeed(0.5f); } else { cXyz sp78(home.pos); sp78.y += 120.0f; @@ -1347,7 +1347,7 @@ void daNpc_myna2_c::calcHovering(int param_0, int param_1) { cLib_addCalcPos2(&field_0xe10, field_0xe1c, 0.1f, 0.1f); } - mpMorf->setPlaySpeed(0.5f + ((3.0f + field_0xe1c.y) / 6.0f)); + mAnm_p->setPlaySpeed(0.5f + ((3.0f + field_0xe1c.y) / 6.0f)); } current.pos += field_0xe10; diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp index 728fa4a714..f26bf2ce04 100644 --- a/src/d/actor/d_a_npc_prayer.cpp +++ b/src/d/actor/d_a_npc_prayer.cpp @@ -69,7 +69,7 @@ daNpcPray_c::~daNpcPray_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -129,8 +129,8 @@ int daNpcPray_c::Create() { return cPhs_ERROR_e; } - J3DModelData* modelData = mpMorf->getModel()->getModelData(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + J3DModelData* modelData = mAnm_p->getModel()->getModelData(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -60.0f, -10.0f, -60.0f, 60.0f, 220.0f, 60.0f); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -165,21 +165,21 @@ int daNpcPray_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], 9); JUT_ASSERT(313, NULL != mdlData_p); - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } cXyz scale(1.0f, 1.0999999f, 1.0f); - mpMorf->offTranslate(); - mpMorf->setTranslateScale(scale); + mAnm_p->offTranslate(); + mAnm_p->setTranslateScale(scale); - J3DModel* model_p = mpMorf->getModel(); + J3DModel* model_p = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -215,13 +215,13 @@ int daNpcPray_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int spC[] = {1, 2, 3}; if (jnt_no == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(2)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(2)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -298,7 +298,7 @@ void daNpcPray_c::setAttnPos() { cXyz sp14(10.0f, 15.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&sp14, &eyePos); sp14.x = 0.0f; @@ -309,7 +309,7 @@ void daNpcPray_c::setAttnPos() { attention_info.position.set(mHeadPos.x, mHeadPos.y + daNpcPray_Param_c::m.common.attention_offset, mHeadPos.z); cXyz cyl_center; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&cyl_center); cyl_center.y = current.pos.y; @@ -435,7 +435,7 @@ void daNpcPray_c::setLookMode(int i_mode) { /* 80AB4020-80AB4200 001320 01E0+00 1/1 0/0 0/0 .text lookat__11daNpcPray_cFv */ void daNpcPray_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model_p = mpMorf->getModel(); + J3DModel* model_p = mAnm_p->getModel(); int var_r28 = 0; f32 body_angleX_min = daNpcPray_Param_c::m.common.body_angleX_min; @@ -600,8 +600,8 @@ bool daNpcPray_c::fear(void*) { mActionMode = 2; break; case 2: - OS_REPORT("-------------prayer frame=%f\n", mpMorf->getFrame()); - if (1.0f == mpMorf->getFrame()) { + OS_REPORT("-------------prayer frame=%f\n", mAnm_p->getFrame()); + if (1.0f == mAnm_p->getFrame()) { OS_REPORT("-------------prayer fear se start!!\n"); mSound.playVoice(2); } diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index ddd32e31c0..4187445261 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -131,7 +131,7 @@ daNpcRafrel_c::~daNpcRafrel_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -234,8 +234,8 @@ int daNpcRafrel_c::Create() { return cPhs_ERROR_e; } - J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -160.0f, -50.0f, -160.0f, 160.0f, 220.0f, 160.0f); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -257,7 +257,7 @@ int daNpcRafrel_c::Create() { setEnvTevColor(); setRoomNo(); - mpMorf->modelCalc(); + mAnm_p->modelCalc(); reset(); Execute(); @@ -275,17 +275,17 @@ int daNpcRafrel_c::CreateHeap() { JUT_ASSERT(403, NULL != mdlData_p); u32 mdl_diff_flags = 0x11020284; - mpMorf = new mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, mdl_diff_flags); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, mdl_diff_flags); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - mdl_p = mpMorf->getModel(); + mdl_p = mAnm_p->getModel(); for (u16 i = 0; i < ((J3DModelData*)mdlData_p)->getJointNum(); i++) { ((J3DModelData*)mdlData_p)->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); @@ -355,7 +355,7 @@ int daNpcRafrel_c::Execute() { /* 80ABA3D8-80ABA4A8 000E98 00D0+00 1/1 0/0 0/0 .text Draw__13daNpcRafrel_cFv */ int daNpcRafrel_c::Draw() { - mpMorf->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); + mAnm_p->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); draw(FALSE, FALSE, daNpcRafrel_Param_c::m.common.real_shadow_size, NULL, FALSE); if (mpItemModel != NULL) { @@ -363,7 +363,7 @@ int daNpcRafrel_c::Draw() { int item_jnt_no = mType == 1 ? JNT_20 : JNT_19; g_env_light.setLightTevColorType_MAJI(mpItemModel, &tevStr); - mpItemModel->setBaseTRMtx(mpMorf->getModel()->getAnmMtx(item_jnt_no)); + mpItemModel->setBaseTRMtx(mAnm_p->getModel()->getAnmMtx(item_jnt_no)); mDoExt_modelUpdateDL(mpItemModel); } @@ -377,13 +377,13 @@ int daNpcRafrel_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int spC[] = {1, 3, 4}; if (jnt_no == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -401,8 +401,8 @@ int daNpcRafrel_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jnt_no == 4 || jnt_no == 9) && (mAnmFlags & 0x100)) { J3DAnmTransform* temp_r27 = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(temp_r27); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(temp_r27); } } @@ -503,7 +503,7 @@ bool daNpcRafrel_c::setExpressionBtp(int i_idx) { return true; } - if (setBtpAnm(btpAnm, mpMorf->getModel()->getModelData(), 1.0f, attr)) { + if (setBtpAnm(btpAnm, mAnm_p->getModel()->getModelData(), 1.0f, attr)) { mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP; if (i_idx == 0) { mAnmFlags |= ANM_FLAG_800; @@ -553,7 +553,7 @@ void daNpcRafrel_c::setMotionAnm(int i_idx, f32 i_morf) { } if (btkAnm != NULL) { - if (setBtkAnm(btkAnm, mpMorf->getModel()->getModelData(), 1.0f, btkAttr)) { + if (setBtkAnm(btkAnm, mAnm_p->getModel()->getModelData(), 1.0f, btkAttr)) { mAnmFlags |= ANM_PAUSE_BTK | ANM_PLAY_BTK; } } @@ -595,7 +595,7 @@ void daNpcRafrel_c::reset() { field_0xe15 = daNpcF_chkEvtBit(0x130) != 0; field_0xe14 = 0; - J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); + J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData(); if (mType == 1) { mdlData_p->getMaterialNodePointer(5)->getShape()->show(); mdlData_p->getMaterialNodePointer(4)->getShape()->hide(); @@ -779,7 +779,7 @@ void daNpcRafrel_c::setAttnPos() { sp20.set(-15.0f, 10.0f, 2.0f); } - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&sp20, &eyePos); sp20.x = 0.0f; @@ -806,7 +806,7 @@ void daNpcRafrel_c::setAttnPos() { } cXyz cyl_center; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(2)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(2)); mDoMtx_stack_c::multVecZero(&cyl_center); cyl_center.y = current.pos.y; @@ -827,7 +827,7 @@ void daNpcRafrel_c::setAttnPos() { /* 80ABEE98-80ABF074 005958 01DC+00 1/1 0/0 0/0 .text lookat__13daNpcRafrel_cFv */ void daNpcRafrel_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model_p = mpMorf->getModel(); + J3DModel* model_p = mAnm_p->getModel(); int var_r28 = 0; f32 body_angleX_min = daNpcRafrel_Param_c::m.common.body_angleX_min; @@ -1179,7 +1179,7 @@ bool daNpcRafrel_c::wait_type2(void* param_0) { break; case 1: if (field_0xdfc != NULL) { - field_0xdfc->setGlobalRTMatrix(mpMorf->getModel()->getAnmMtx(0x13)); + field_0xdfc->setGlobalRTMatrix(mAnm_p->getModel()->getAnmMtx(0x13)); if (daNpcF_chkTmpBit(0x75)) { field_0xdfc->becomeInvalidEmitter(); } @@ -1479,7 +1479,7 @@ int daNpcRafrel_c::EvCut_Appear(int i_staffId) { mTurnMode = 0; break; case '0004': { - J3DModelData* temp_r3_2 = mpMorf->getModel()->getModelData(); + J3DModelData* temp_r3_2 = mAnm_p->getModel()->getModelData(); temp_r3_2->getMaterialNodePointer(5)->getShape()->hide(); temp_r3_2->getMaterialNodePointer(4)->getShape()->show(); setMotion(12, -1.0f, 0); diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp index 560306d994..94400a1462 100644 --- a/src/d/actor/d_a_npc_shad.cpp +++ b/src/d/actor/d_a_npc_shad.cpp @@ -351,7 +351,7 @@ daNpcShad_c::~daNpcShad_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -454,7 +454,7 @@ cPhs__Step daNpcShad_c::Create() { return cPhs_ERROR_e; } - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -100.0f, -50.0f, -100.0f, 100.0f, 220.0f, 100.0f); mSound.init(¤t.pos, &eyePos, 3, 1); mAcchCir.SetWall(mpHIO->m.common.width, mpHIO->m.common.knee_length); @@ -474,7 +474,7 @@ cPhs__Step daNpcShad_c::Create() { mGroundH = mAcch.GetGroundH(); setEnvTevColor(); setRoomNo(); - mpMorf->modelCalc(); + mAnm_p->modelCalc(); reset(); Execute(); } @@ -486,18 +486,18 @@ cPhs__Step daNpcShad_c::Create() { int daNpcShad_c::CreateHeap() { J3DModelData* mdlData_p = static_cast(dComIfG_getObjectRes(l_arcNames[0], BMDR_SHAD)); JUT_ASSERT(483, NULL != mdlData_p); - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -576,19 +576,19 @@ int daNpcShad_c::Draw() { return 1; } - mpMorf->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); + mAnm_p->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); draw(FALSE, FALSE, mpHIO->m.common.real_shadow_size, NULL, FALSE); if (mBookKnifeModel != NULL) { g_env_light.setLightTevColorType_MAJI(mBookKnifeModel, &tevStr); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_FINGERL)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_FINGERL)); mBookKnifeModel->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(mBookKnifeModel); } if (mKomonshoModel != NULL && (mMotion == MOT_TAKE_KOMON || mMotion == MOT_READ_KOMON)) { g_env_light.setLightTevColorType_MAJI(mKomonshoModel, &tevStr); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_FINGERR)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_FINGERR)); mKomonshoModel->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(mKomonshoModel); } @@ -602,11 +602,11 @@ int daNpcShad_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int lookatJoints[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD}; if (jntNo == JNT_CENTER) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -625,8 +625,8 @@ int daNpcShad_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK) != 0) { J3DAnmTransform* anmTransform = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(anmTransform); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(anmTransform); } return 1; @@ -752,7 +752,7 @@ bool daNpcShad_c::setExpressionBtp(int i_idx) { return true; } - if (setBtpAnm(anmTexPattern, mpMorf->getModel()->getModelData(), 1.0f, i_attr)) { + if (setBtpAnm(anmTexPattern, mAnm_p->getModel()->getModelData(), 1.0f, i_attr)) { mAnmFlags |= ANM_PLAY_BTP | ANM_PAUSE_BTP; if (i_idx == 0) { @@ -801,7 +801,7 @@ void daNpcShad_c::setMotionAnm(int i_idx, f32 i_morf) { i_attr = l_btkGetParamList[i_index].attr; if (anmTextureSRTKey != NULL) { - if (setBtkAnm(anmTextureSRTKey, mpMorf->getModel()->getModelData(), 1.0f, i_attr)) { + if (setBtkAnm(anmTextureSRTKey, mAnm_p->getModel()->getModelData(), 1.0f, i_attr)) { mAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK; } } @@ -1021,7 +1021,7 @@ inline void daNpcShad_c::playMotion() { /* 80AE1320-80AE153C 009200 021C+00 1/1 0/0 0/0 .text lookat__11daNpcShad_cFv */ inline void daNpcShad_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); int iVar1 = 0; f32 body_angleX_min = mpHIO->m.common.body_angleX_min; f32 body_angleX_max = mpHIO->m.common.body_angleX_max; @@ -2649,7 +2649,7 @@ inline void daNpcShad_c::setAttnPos() { lookat(); cXyz sp40(10.0f, 10.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&sp40, &eyePos); sp40.x = 0.0f; @@ -2670,7 +2670,7 @@ inline void daNpcShad_c::setAttnPos() { attention_info.position.set(mHeadPos.x, mHeadPos.y + mpHIO->m.common.attention_offset, mHeadPos.z); cXyz sp58; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE2)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE2)); mDoMtx_stack_c::multVecZero(&sp58); sp58.y = current.pos.y; diff --git a/src/d/actor/d_a_npc_shoe.cpp b/src/d/actor/d_a_npc_shoe.cpp index 46fec85fb4..55d5f0e0ca 100644 --- a/src/d/actor/d_a_npc_shoe.cpp +++ b/src/d/actor/d_a_npc_shoe.cpp @@ -121,7 +121,7 @@ daNpcShoe_c::~daNpcShoe_c() { dComIfG_resDelete(&mPhases[i], l_arcNames[i]); } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -146,7 +146,7 @@ cPhs__Step daNpcShoe_c::Create() { return cPhs_ERROR_e; } - fopAcM_SetMtx(this, mpMorf->mpModel->getBaseTRMtx()); + fopAcM_SetMtx(this, mAnm_p->mpModel->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -50.0f, -10.0f, -50.0f, 50.0f, 160.0f, 50.0f); @@ -185,23 +185,23 @@ BOOL daNpcShoe_c::CreateHeap() { JUT_ASSERT(292, NULL != mdlData_p) - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, 0x11020084); - if (mpMorf != NULL && mpMorf->mpModel == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + if (mAnm_p != NULL && mAnm_p->mpModel == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return false; } cXyz cstack_30(1.0f, 0.5581154f, 1.0f); - mpMorf->offTranslate(); - mpMorf->setTranslateScale(cstack_30); + mAnm_p->offTranslate(); + mAnm_p->setTranslateScale(cstack_30); - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 jointNo = 0; jointNo < mdlData_p->getJointNum(); jointNo++) { mdlData_p->getJointNodePointer(jointNo)->setCallBack(ctrlJointCallBack); } @@ -268,7 +268,7 @@ int daNpcShoe_c::Draw() { draw(false, false, mpHIO->m.common.real_shadow_size, NULL, false); g_env_light.setLightTevColorType_MAJI(mpModel1->mModelData, &tevStr); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(11)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(11)); mpModel1->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(mpModel1); g_env_light.setLightTevColorType_MAJI(mpModel2->mModelData, &tevStr); @@ -286,11 +286,11 @@ bool daNpcShoe_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int lookat_joints[3] = {1, 2, 3}; if (joint_no == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(2)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(2)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -394,7 +394,7 @@ void daNpcShoe_c::reset() { J3DAnmTexPattern* btpAnm = getTexPtrnAnmP(l_arcNames[0], 12); mAnmFlags &= ~(ANM_PAUSE_BTP | ANM_PLAY_BTP | ANM_FLAG_800); - if (setBtpAnm(btpAnm, mpMorf->getModel()->getModelData(), 1.0f, 2)) { + if (setBtpAnm(btpAnm, mAnm_p->getModel()->getModelData(), 1.0f, 2)) { mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP | ANM_FLAG_800; } @@ -436,7 +436,7 @@ void daNpcShoe_c::playMotion() { /* 80AE9820-80AE9A00 001FC0 01E0+00 1/1 0/0 0/0 .text lookat__11daNpcShoe_cFv */ void daNpcShoe_c::lookat() { fopAc_ac_c* actor = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL snap = false; f32 body_angleX_min = mpHIO->m.common.body_angleX_min; @@ -568,7 +568,7 @@ bool daNpcShoe_c::fear(void* param_0) { case 1: break; case 2: - if (mpMorf->checkFrame(1.0f)) { + if (mAnm_p->checkFrame(1.0f)) { mCreature.playVoice(2); } break; @@ -729,7 +729,7 @@ void daNpcShoe_c::setAttnPos() { lookat(); cXyz vec(10.0f, 15.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&vec, &eyePos); vec.x = 0.0f; @@ -738,12 +738,12 @@ void daNpcShoe_c::setAttnPos() { mHeadAngle.x = cLib_targetAngleX(&mHeadPos, &vec); mHeadAngle.y = cLib_targetAngleY(&mHeadPos, &vec); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&attention_info.position); attention_info.position.y += mpHIO->m.common.attention_offset; cXyz cStack28; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&cStack28); cStack28.y = current.pos.y; mCcCyl.SetC(cStack28); diff --git a/src/d/actor/d_a_npc_soldierA.cpp b/src/d/actor/d_a_npc_soldierA.cpp index a691778aaa..0d37ba60ea 100644 --- a/src/d/actor/d_a_npc_soldierA.cpp +++ b/src/d/actor/d_a_npc_soldierA.cpp @@ -166,7 +166,7 @@ daNpc_SoldierA_c::~daNpc_SoldierA_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } #if DEBUG @@ -249,8 +249,8 @@ cPhs__Step daNpc_SoldierA_c::create() { return cPhs_ERROR_e; } - J3DModelData* modelData = mpMorf->getModel()->getModelData(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + J3DModelData* modelData = mAnm_p->getModel()->getModelData(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -293,17 +293,17 @@ int daNpc_SoldierA_c::CreateHeap() { JUT_ASSERT(413, NULL != mdlData_p); u32 uVar1 = 0x11020284; - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, uVar1); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, uVar1); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - model = mpMorf->getModel(); + model = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -349,11 +349,11 @@ int daNpc_SoldierA_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int i_jointList[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD}; if (jntNo == JNT_CENTER) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_BACKBONE1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -504,7 +504,7 @@ void daNpc_SoldierA_c::setAttnPos() { setMtx(); lookat(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); mDoMtx_stack_c::multVec(&eyeOffset, &sp8c); @@ -646,7 +646,7 @@ int daNpc_SoldierA_c::drawDbgInfo() { /* 80AF0A84-80AF0B30 0015E4 00AC+00 1/0 0/0 0/0 .text drawOtherMdls__16daNpc_SoldierA_cFv */ void daNpc_SoldierA_c::drawOtherMdls() { g_env_light.setLightTevColorType_MAJI(mSpearModel, &tevStr); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HANDR)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HANDR)); mDoMtx_stack_c::scaleM(scale); mSpearModel->setBaseTRMtx(mDoMtx_stack_c::get()); J3DModelData* mdlData_p = mSpearModel->getModelData(); @@ -881,7 +881,7 @@ void daNpc_SoldierA_c::setLookMode(int i_lookMode) { /* 80AF14AC-80AF1734 00200C 0288+00 1/1 0/0 0/0 .text lookat__16daNpc_SoldierA_cFv */ void daNpc_SoldierA_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL i_snap = FALSE; f32 body_angleX_min = mHIO->m.common.body_angleX_min; f32 body_angleX_max = mHIO->m.common.body_angleX_max; diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index 854f9570b2..705a307c74 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -183,7 +183,7 @@ daNpcThe_c::EventFn daNpcThe_c::mEvtCutList[4] = { }; int daNpcThe_c::Draw() { - mpMorf->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); + mAnm_p->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); ActionFn action_test = &daNpcThe_c::test; int is_test = mpActionFn == action_test; return draw(is_test, false, mpHIO->m.common.real_shadow_size, NULL, false); @@ -198,7 +198,7 @@ daNpcThe_c::~daNpcThe_c() { dComIfG_resDelete(&mPhase[i], l_resNames[l_loadRes_list[mType][i]]); } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -211,18 +211,18 @@ int daNpcThe_c::CreateHeap() { dComIfG_getObjectRes(l_resNames[l_bmdGetParamList[bmd_get_idx].arcIdx], l_bmdGetParamList[bmd_get_idx].fileIdx)); } - mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mAnm_p = new mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 i = 0; i < model_data->getJointTree().getJointNum(); i++) { model_data->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -247,11 +247,11 @@ int daNpcThe_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int lookat_joints[3] = {1, 3, 4}; if (joint_no == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -270,8 +270,8 @@ int daNpcThe_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((joint_no == 4 || joint_no == 11) && (mAnmFlags & 0x100)) { J3DAnmTransform* anm = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(anm); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(anm); } return 1; @@ -435,7 +435,7 @@ bool daNpcThe_c::setExpressionBtp(int i_idx) { return true; } - if (setBtpAnm(anm, mpMorf->getModel()->getModelData(), 1.0f, attr)) { + if (setBtpAnm(anm, mAnm_p->getModel()->getModelData(), 1.0f, attr)) { mAnmFlags |= ANM_PAUSE_BTP | ANM_PLAY_BTP; if (i_idx == 0) { mAnmFlags |= ANM_FLAG_800; @@ -509,7 +509,7 @@ void daNpcThe_c::setMotionAnm(int i_idx, f32 i_morf) { } if (anm_tex != NULL) { - if (setBtkAnm(anm_tex, mpMorf->getModel()->getModelData(), 1.0f, 2)) { + if (setBtkAnm(anm_tex, mAnm_p->getModel()->getModelData(), 1.0f, 2)) { mAnmFlags |= ANM_PAUSE_BTK | ANM_PLAY_BTK; } } @@ -602,7 +602,7 @@ void daNpcThe_c::playMotion() { /* 80AFB1C4-80AFB488 003BE4 02C4+00 1/1 0/0 0/0 .text lookat__10daNpcThe_cFv */ void daNpcThe_c::lookat() { fopAc_ac_c* actor = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL snap = false; f32 body_angleX_min = mpHIO->m.common.body_angleX_min; @@ -819,11 +819,11 @@ BOOL daNpcThe_c::talk(void* param_0) { bvar1 = true; } else { if (mType == TYPE_KAKARIKO && - (mpMorf->getAnm() == getTrnsfrmKeyAnmP(l_resNames[l_bckGetParamList[24].arcIdx], + (mAnm_p->getAnm() == getTrnsfrmKeyAnmP(l_resNames[l_bckGetParamList[24].arcIdx], l_bckGetParamList[24].fileIdx) || - mpMorf->getAnm() == getTrnsfrmKeyAnmP(l_resNames[l_bckGetParamList[25].arcIdx], + mAnm_p->getAnm() == getTrnsfrmKeyAnmP(l_resNames[l_bckGetParamList[25].arcIdx], l_bckGetParamList[25].fileIdx) || - mpMorf->getAnm() == getTrnsfrmKeyAnmP(l_resNames[l_bckGetParamList[26].arcIdx], + mAnm_p->getAnm() == getTrnsfrmKeyAnmP(l_resNames[l_bckGetParamList[26].arcIdx], l_bckGetParamList[26].fileIdx))) { setLookMode(LOOK_NONE); @@ -1024,8 +1024,8 @@ cPhs__Step daNpcThe_c::create() { return cPhs_ERROR_e; } - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); - fopAcM_setCullSizeBox2(this, mpMorf->getModel()->getModelData()); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mAnm_p->getModel()->getModelData()); mSound.init(¤t.pos, &eyePos, 3, 1); mAcchCir.SetWall(mpHIO->m.common.width, mpHIO->m.common.knee_length); mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, @@ -1355,7 +1355,7 @@ void daNpcThe_c::setAttnPos() { lookat(); cXyz vec1(-10.0f, 0.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&vec1, &eyePos); vec1.y = 0.0f; diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp index 8ec561ebcd..584785d355 100644 --- a/src/d/actor/d_a_npc_tks.cpp +++ b/src/d/actor/d_a_npc_tks.cpp @@ -222,7 +222,7 @@ daNpcTks_c::~daNpcTks_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } if (parentActorID != fpcM_ERROR_PROCESS_ID_e) { @@ -319,7 +319,7 @@ cPhs__Step daNpcTks_c::Create() { return cPhs_ERROR_e; } - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -80.0f, -30.0f, -80.0f, 80.0f, 10.0f, 80.0f); mSound.init(¤t.pos, &eyePos, 3, 1); mTksTsubo.mSound.init(&mTksTsubo.mPos, &mTksTsubo.mPos, 3, 1); @@ -362,17 +362,17 @@ int daNpcTks_c::CreateHeap() { JUT_ASSERT(410, NULL != mdlData_p); - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -417,7 +417,7 @@ int daNpcTks_c::Execute() { /* 80B15430-80B1548C 000EF0 005C+00 1/1 0/0 0/0 .text Draw__10daNpcTks_cFv */ int daNpcTks_c::Draw() { - mpMorf->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); + mAnm_p->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); draw(FALSE, FALSE, daNpcTks_Param_c::m.common.real_shadow_size, NULL, FALSE); return 1; } @@ -428,11 +428,11 @@ int daNpcTks_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int i_jointList[3] = {JNT_NECK1, JNT_NECK2, JNT_HEAD}; if (jntNo == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_NECK2)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_NECK2)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_HEAD)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HEAD)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -451,8 +451,8 @@ int daNpcTks_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK) != 0) { J3DAnmTransform* anm = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(anm); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(anm); } return 1; @@ -479,7 +479,7 @@ int daNpcTks_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) { /* 80B156BC-80B157C0 00117C 0104+00 1/0 0/0 0/0 .text setMtx__10daNpcTks_cFv */ void daNpcTks_c::setMtx() { - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); @@ -505,7 +505,7 @@ void daNpcTks_c::setMtx() { mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame()); } - mpMorf->modelCalc(); + mAnm_p->modelCalc(); } /* 80B157C0-80B1590C 001280 014C+00 1/0 0/0 0/0 .text setExpressionAnm__10daNpcTks_cFib */ @@ -561,7 +561,7 @@ bool daNpcTks_c::setExpressionBtp(int i_index) { return true; } - if (setBtpAnm(i_btp, mpMorf->getModel()->getModelData(), 1.0f, i_attr)) { + if (setBtpAnm(i_btp, mAnm_p->getModel()->getModelData(), 1.0f, i_attr)) { mAnmFlags |= ANM_PLAY_BTP | ANM_PAUSE_BTP; if (i_index == 0) { @@ -853,7 +853,7 @@ void daNpcTks_c::playMotion() { /* 80B1CFD0-80B1D1FC 008A90 022C+00 1/1 0/0 0/0 .text lookat__10daNpcTks_cFv */ void daNpcTks_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL i_snap = FALSE; f32 body_angleX_min = daNpcTks_Param_c::m.common.body_angleX_min; f32 body_angleX_max = daNpcTks_Param_c::m.common.body_angleX_max; @@ -1014,9 +1014,9 @@ void daNpcTks_c::setMotionAnm(int i_index, f32 i_morf) { mMotionLoops = 0; if (i_index == ANM_RUN) { - mpMorf->setPlaySpeed(speedF / daNpcTks_Param_c::m.walk_spd); + mAnm_p->setPlaySpeed(speedF / daNpcTks_Param_c::m.walk_spd); } else { - mpMorf->setPlaySpeed(1.0f); + mAnm_p->setPlaySpeed(1.0f); } if (field_0x138a) { @@ -1044,7 +1044,7 @@ void daNpcTks_c::setMotionAnm(int i_index, f32 i_morf) { i_attr = l_btkGetParamList[0].attr; if (i_btk != NULL) { - if (setBtkAnm(i_btk, mpMorf->getModel()->getModelData(), 1.0f, i_attr)) { + if (setBtkAnm(i_btk, mAnm_p->getModel()->getModelData(), 1.0f, i_attr)) { mAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK; } } @@ -1310,7 +1310,7 @@ void daNpcTks_c::shake() { break; case 2: - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { setAction(&daNpcTks_c::hide); } @@ -1339,7 +1339,7 @@ void daNpcTks_c::showUp() { break; case 2: - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { setAction(&daNpcTks_c::showUpWait); } break; @@ -1421,7 +1421,7 @@ void daNpcTks_c::lookAroundA() { break; case 2: - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { setAction(&daNpcTks_c::showUpWait); } @@ -1450,7 +1450,7 @@ void daNpcTks_c::lookAroundB() { break; case 2: - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { setAction(&daNpcTks_c::showUpWait); } @@ -1479,7 +1479,7 @@ void daNpcTks_c::in() { break; case 2: - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { setAction(&daNpcTks_c::hide); } break; @@ -1505,7 +1505,7 @@ void daNpcTks_c::damage() { break; case 2: - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { setAction(&daNpcTks_c::hide); } @@ -1549,7 +1549,7 @@ void daNpcTks_c::broken() { case 2: if (mAcch.ChkGroundLanding()) { setMotion(MOT_LAND, -1.0f, 0); - } else if (mAcch.ChkGroundHit() && mpMorf->isStop()) { + } else if (mAcch.ChkGroundHit() && mAnm_p->isStop()) { setAction(&daNpcTks_c::waitNude); } break; @@ -1655,7 +1655,7 @@ void daNpcTks_c::demo_appear() { break; case '0002': - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { eventManager.cutEnd(staffId); } break; @@ -1761,7 +1761,7 @@ void daNpcTks_c::demo_scannon() { case '0003': setMotion(MOT_JUMP_S, 0.0f, 0); - mpMorf->setPlaySpeed(1.0f); + mAnm_p->setPlaySpeed(1.0f); setAngle(0); speedF = 0.0f; speed.y = 0.0f; @@ -1804,7 +1804,7 @@ void daNpcTks_c::demo_scannon() { } case '0003': - if (mMotionPhase == 0 && mpMorf->checkFrame(9.0f)) { + if (mMotionPhase == 0 && mAnm_p->checkFrame(9.0f)) { speedF = 25.0f; speed.y = 60.0f; mSound.startCreatureSound(Z2SE_TKS_V_JUMP_UP, 0, -1); @@ -2031,7 +2031,7 @@ void daNpcTks_c::demo_farewell() { cXyz* pos = dComIfGp_evmng_getMyXyzP(staffId, "pos"); if (mMotion == 4) { - if (mMotionPhase == 0 && mpMorf->checkFrame(9.0f)) { + if (mMotionPhase == 0 && mAnm_p->checkFrame(9.0f)) { speedF = 15.0f; speed.y = 60.0f; mSound.startCreatureSound(Z2SE_TKS_V_JUMP_UP, 0, -1); @@ -2040,7 +2040,7 @@ void daNpcTks_c::demo_farewell() { speedF = 0.0f; speed.y = 0.0f; } - } else if (mMotion == 5 && mpMorf->isStop()) { + } else if (mMotion == 5 && mAnm_p->isStop()) { Z2GetAudioMgr()->subBgmStop(); eventManager.cutEnd(staffId); } @@ -2161,7 +2161,7 @@ void daNpcTks_c::demo_warpBack() { break; case '0003': - if (mMotionPhase == 0 && mpMorf->checkFrame(9.0f)) { + if (mMotionPhase == 0 && mAnm_p->checkFrame(9.0f)) { speedF = 12.0f; speed.y = 33.0f; field_0x1370 = 200.0f / speedF; @@ -2290,7 +2290,7 @@ void daNpcTks_c::demo_walkBack() { break; case '0003': - if (mMotionPhase == 0 && mpMorf->checkFrame(9.0f)) { + if (mMotionPhase == 0 && mAnm_p->checkFrame(9.0f)) { speedF = 12.0f; speed.y = 31.0f; field_0x1370 = 200.0f / speedF; @@ -2598,7 +2598,7 @@ void daNpcTks_c::demo_Lv7Start() { case '0010': if (mMotion == 4) { - if (mMotionPhase == 0 && mpMorf->checkFrame(9.0f)) { + if (mMotionPhase == 0 && mAnm_p->checkFrame(9.0f)) { speedF = 8.0f; speed.y = 30.0f; mSound.startCreatureSound(Z2SE_TKS_V_JUMP_UP, 0, -1); @@ -2611,7 +2611,7 @@ void daNpcTks_c::demo_Lv7Start() { speed.y = 0.0f; } } else if (mMotion == 5) { - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { eventManager.cutEnd(staffId); } } @@ -2738,7 +2738,7 @@ void daNpcTks_c::demo_Lv3PickUp() { break; case '0003': - if (mMotionPhase == 0 && mpMorf->checkFrame(9.0f)) { + if (mMotionPhase == 0 && mAnm_p->checkFrame(9.0f)) { speed.y = 33.0f; field_0x136c = speed.y * -2.0f / gravity; field_0x1370 = field_0x136c; @@ -2870,7 +2870,7 @@ void daNpcTks_c::demo_Lv6PickUp() { break; case '0003': - if (mMotionPhase == 0 && mpMorf->checkFrame(9.0f)) { + if (mMotionPhase == 0 && mAnm_p->checkFrame(9.0f)) { speedF = 16.0f; speed.y = 36.0f; field_0x1370 = 300.0f / speedF; @@ -2972,7 +2972,7 @@ void daNpcTks_c::setAttnPos() { } } - J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); + J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -2985,7 +2985,7 @@ void daNpcTks_c::setAttnPos() { eyePos.y += 80.0f; } else { cXyz sp2c(10.0f, 10.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0x11)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(0x11)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&sp2c, &eyePos); sp2c.x = 0.0f; diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index 0d3cbf6fe8..613ee9f4ed 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -643,7 +643,7 @@ daNpcWrestler_c::~daNpcWrestler_c() { dComIfG_resDelete(&mPhase2, l_resName[mType]); dComIfG_TimerDeleteRequest(9); if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } #if DEBUG @@ -677,7 +677,7 @@ cPhs__Step daNpcWrestler_c::Create() { l_HIO.entryHIO("力士"); #endif - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -160.0f, -50.0f, -160.0f, 160.0f, 220.0f, 160.0f); reset(); @@ -713,16 +713,16 @@ int daNpcWrestler_c::CreateHeap() { JUT_ASSERT(830, NULL != mdlData_p); u32 reg_r23 = 0x11020284; - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, reg_r23); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, reg_r23); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - model = mpMorf->getModel(); + model = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -761,7 +761,7 @@ int daNpcWrestler_c::Draw() { return 0; } - J3DModelData* model_data = mpMorf->getModel()->getModelData(); + J3DModelData* model_data = mAnm_p->getModel()->getModelData(); model_data->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); return draw(FALSE, FALSE, field_0xbdc->real_shadow_size, NULL, FALSE); } @@ -777,11 +777,11 @@ int daNpcWrestler_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int iVar1[3] = {dbg_0x3c, dbg_0x38, dbg_0x34}; if (jnt_no == dbg_0x40) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(dbg_0x3c)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(dbg_0x3c)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(dbg_0x38)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(dbg_0x38)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(dbg_0x34)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(dbg_0x34)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -825,8 +825,8 @@ int daNpcWrestler_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int dbg_0x2c = mType == 0 ? 8 : 7; if ((jnt_no == dbg_0x30 - 1 || jnt_no == dbg_0x2c) && (mAnmFlags & 0x100)) { J3DAnmTransform* anm = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(anm); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(anm); } return 1; @@ -883,7 +883,7 @@ void daNpcWrestler_c::setAttnPos() { lookat(); int dbg_0x20 = mType == 0 ? 4 : 4; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(dbg_0x20)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(dbg_0x20)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); eyeOffset.y = 0.0f; @@ -1081,7 +1081,7 @@ bool daNpcWrestler_c::setExpressionBtp(int param_1) { return 1; } - if (setBtpAnm(anmTexPattern, mpMorf->getModel()->getModelData(), 1.0f, iVar1)) { + if (setBtpAnm(anmTexPattern, mAnm_p->getModel()->getModelData(), 1.0f, iVar1)) { mAnmFlags |= 0x280; if (param_1 == 0 || param_1 == 20) { @@ -1149,7 +1149,7 @@ void daNpcWrestler_c::setMotionAnm(int param_1, f32 param_2) { mMotionLoops = 0; } - if (anmTextureSRTKey != NULL && setBtkAnm(anmTextureSRTKey, mpMorf->getModel()->getModelData(), + if (anmTextureSRTKey != NULL && setBtkAnm(anmTextureSRTKey, mAnm_p->getModel()->getModelData(), 1.0f, btk_arc)) { mAnmFlags |= 0x12; } @@ -1572,7 +1572,7 @@ void daNpcWrestler_c::playMotion() { /* 80B40B3C-80B40D1C 01199C 01E0+00 1/1 0/0 0/0 .text lookat__15daNpcWrestler_cFv */ void daNpcWrestler_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL snap = FALSE; f32 fVar1 = field_0xbd8->common.body_angleX_min; f32 fVar2 = field_0xbd8->common.body_angleX_max; @@ -2181,7 +2181,7 @@ bool daNpcWrestler_c::sumouReady(void* param_1) { mActorMngr[0].entry(daPy_getPlayerActorClass()); setExpression(3, -1.0f); setMotionAnm(30, 0.0f); - mpMorf->modelCalc(); + mAnm_p->modelCalc(); player->setSumouReady(this); initDemoCamera_ArenaSide(); @@ -2284,7 +2284,7 @@ bool daNpcWrestler_c::sumouReady(void* param_1) { case 6: if (mType == 0) { - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { setAction(&daNpcWrestler_c::sumouWait); } } else { @@ -2465,7 +2465,7 @@ bool daNpcWrestler_c::sumouPunchHit(void* param_1) { case 0: setExpressionAnm(6, true); setMotion(12, -1.0f, 0); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp2c); field_0xdd8 = dComIfGp_particle_set(0x8537, &sp2c, &mCurAngle, NULL); @@ -2479,13 +2479,13 @@ bool daNpcWrestler_c::sumouPunchHit(void* param_1) { case 2: oppositeToPlayer(); - mpMorf->setPlaySpeed(0.0f); - mpMorf->setFrameF(player->getBaseAnimeFrame()); - mpMorf->modelCalc(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mAnm_p->setPlaySpeed(0.0f); + mAnm_p->setFrameF(player->getBaseAnimeFrame()); + mAnm_p->modelCalc(); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp2c); - if (mpMorf->getFrame() == 13.0f) { + if (mAnm_p->getFrame() == 13.0f) { if (mType == 1 && !player->checkEquipHeavyBoots()) { setAction(&daNpcWrestler_c::demoSumouUnilateralWin); } else { @@ -2504,7 +2504,7 @@ bool daNpcWrestler_c::sumouPunchHit(void* param_1) { } if (field_0xdd8 != NULL) { - field_0xdd8->setGlobalRTMatrix(mpMorf->getModel()->getAnmMtx(jointNo)); + field_0xdd8->setGlobalRTMatrix(mAnm_p->getModel()->getAnmMtx(jointNo)); } if (field_0xddc != NULL) { @@ -2572,7 +2572,7 @@ bool daNpcWrestler_c::sumouPunchChaseHit(void* param_1) { setExpressionAnm(6, true); setMotion(12, -1.0f, 0); daPy_getPlayerActorClass()->setSumouForcePunch(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp38); field_0xdd8 = dComIfGp_particle_set(0x8537, &sp38, &mCurAngle, NULL); @@ -2588,11 +2588,11 @@ bool daNpcWrestler_c::sumouPunchChaseHit(void* param_1) { mCurAngle.y = fopAcM_searchPlayerAngleY(this); current.angle.y = mCurAngle.y; shape_angle.y = current.angle.y; - mpMorf->modelCalc(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mAnm_p->modelCalc(); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp38); - if (mpMorf->getFrame() == 13.0f) { + if (mAnm_p->getFrame() == 13.0f) { if (mType == 1 && !daPy_getPlayerActorClass()->checkEquipHeavyBoots()) { setAction(&daNpcWrestler_c::demoSumouUnilateralWin); } else { @@ -2611,7 +2611,7 @@ bool daNpcWrestler_c::sumouPunchChaseHit(void* param_1) { } if (field_0xdd8 != NULL) { - field_0xdd8->setGlobalRTMatrix(mpMorf->getModel()->getAnmMtx(jointNo)); + field_0xdd8->setGlobalRTMatrix(mAnm_p->getModel()->getAnmMtx(jointNo)); } if (field_0xddc != NULL) { @@ -2631,7 +2631,7 @@ bool daNpcWrestler_c::sumouPunchChaseHit(void* param_1) { if (checkOutOfArenaP()) { setAction(&daNpcWrestler_c::demoSumouWin2); - } else if (mpMorf->isStop()) { + } else if (mAnm_p->isStop()) { setAction(&daNpcWrestler_c::sumouWait); } break; @@ -2693,7 +2693,7 @@ bool daNpcWrestler_c::sumouPunchMiss(void* param_1) { case 0: setExpressionAnm(8, true); setMotion(0x10, -1.0f, 0); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp2c); field_0xdd8 = dComIfGp_particle_set(0x8537, &sp2c, &mCurAngle, NULL); @@ -2706,21 +2706,21 @@ bool daNpcWrestler_c::sumouPunchMiss(void* param_1) { case 2: oppositeToPlayer(); - mpMorf->setPlaySpeed(0.0f); - mpMorf->setFrameF(player->getBaseAnimeFrame()); - mpMorf->modelCalc(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mAnm_p->setPlaySpeed(0.0f); + mAnm_p->setFrameF(player->getBaseAnimeFrame()); + mAnm_p->modelCalc(); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp2c); - if (mpMorf->getFrame() > 13.0f && mpMorf->getFrame() < 34.0f) { + if (mAnm_p->getFrame() > 13.0f && mAnm_p->getFrame() < 34.0f) { dCam_getBody()->ModeFix(6); } - if (mpMorf->getFrame() == 35.0f) { + if (mAnm_p->getFrame() == 35.0f) { dComIfGp_getVibration().StartShock(field_0xbd8->slap_hit_impact, 15, cXyz(0.0f, 1.0f, 0.0f)); } if (field_0xdd8 != NULL) { - field_0xdd8->setGlobalRTMatrix(mpMorf->getModel()->getAnmMtx(jointNo)); + field_0xdd8->setGlobalRTMatrix(mAnm_p->getModel()->getAnmMtx(jointNo)); } if (checkOutOfArenaW()) { @@ -2749,7 +2749,7 @@ bool daNpcWrestler_c::sumouPunchMiss(void* param_1) { /* 80B358F0-80B35968 006750 0078+00 4/4 0/0 0/0 .text getJointPos__15daNpcWrestler_cFi */ cXyz daNpcWrestler_c::getJointPos(int i_jointNo) { cXyz jointPos; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(i_jointNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(i_jointNo)); mDoMtx_stack_c::multVecZero(&jointPos); return jointPos; } @@ -2764,7 +2764,7 @@ bool daNpcWrestler_c::sumouPunchDraw(void* param_1) { case 0: setExpressionAnm(9, true); setMotion(0x11, -1.0f, 0); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp2c); field_0xdd8 = dComIfGp_particle_set(0x8537, &sp2c, &mCurAngle, NULL); @@ -2779,17 +2779,17 @@ bool daNpcWrestler_c::sumouPunchDraw(void* param_1) { case 2: oppositeToPlayer(); - mpMorf->setPlaySpeed(0.0f); - mpMorf->setFrameF(player->getBaseAnimeFrame()); - mpMorf->modelCalc(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mAnm_p->setPlaySpeed(0.0f); + mAnm_p->setFrameF(player->getBaseAnimeFrame()); + mAnm_p->modelCalc(); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp2c); - if (mpMorf->getFrame() > 18.0f && mpMorf->getFrame() < 32.0f) { + if (mAnm_p->getFrame() > 18.0f && mAnm_p->getFrame() < 32.0f) { dCam_getBody()->ModeFix(5); } - if (mpMorf->getFrame() == 13.0f) { + if (mAnm_p->getFrame() == 13.0f) { if (mType == 1 && !daPy_getPlayerActorClass()->checkEquipHeavyBoots()) { setAction(&daNpcWrestler_c::demoSumouUnilateralWin); } else { @@ -2807,7 +2807,7 @@ bool daNpcWrestler_c::sumouPunchDraw(void* param_1) { } if (field_0xdd8 != NULL) { - field_0xdd8->setGlobalRTMatrix(mpMorf->getModel()->getAnmMtx(jointNo)); + field_0xdd8->setGlobalRTMatrix(mAnm_p->getModel()->getAnmMtx(jointNo)); } if (field_0xddc != NULL) { @@ -2865,7 +2865,7 @@ bool daNpcWrestler_c::sumouTackleHit(void* param_1) { switch (field_0xe96) { case 0: - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp2c); if (player->checkSumouPunchMiss()) { @@ -2910,11 +2910,11 @@ bool daNpcWrestler_c::sumouTackleHit(void* param_1) { case 2: correctGraspPosAngle(true); - mpMorf->setPlaySpeed(0.0f); - mpMorf->setFrameF(player->getBaseAnimeFrame()); - mpMorf->modelCalc(); + mAnm_p->setPlaySpeed(0.0f); + mAnm_p->setFrameF(player->getBaseAnimeFrame()); + mAnm_p->modelCalc(); - if ((mMotion == 13 && mpMorf->getFrame() == 8.0f) || (mMotion == 0x1C && mpMorf->getFrame() == 34.0f)) { + if ((mMotion == 13 && mAnm_p->getFrame() == 8.0f) || (mMotion == 0x1C && mAnm_p->getFrame() == 34.0f)) { field_0xde0 = dComIfGp_particle_set(0x8539, &sp2c, &mCurAngle, NULL); field_0xde4 = dComIfGp_particle_set(0x853A, &sp2c, &mCurAngle, NULL); @@ -2926,23 +2926,23 @@ bool daNpcWrestler_c::sumouTackleHit(void* param_1) { field_0xde4->becomeImmortalEmitter(); } } else { - if (mpMorf->getFrame() == 15.0f) { + if (mAnm_p->getFrame() == 15.0f) { dComIfGp_getVibration().StartShock(field_0xbd8->slap_hit_impact, 15, cXyz(0.0f, 1.0f, 0.0f)); } } if (field_0xdd8 != NULL) { - field_0xdd8->setGlobalRTMatrix(mpMorf->getModel()->getAnmMtx(jointNo)); + field_0xdd8->setGlobalRTMatrix(mAnm_p->getModel()->getAnmMtx(jointNo)); } if (field_0xddc != NULL) { - field_0xddc->setGlobalRTMatrix(mpMorf->getModel()->getAnmMtx(jointNo)); + field_0xddc->setGlobalRTMatrix(mAnm_p->getModel()->getAnmMtx(jointNo)); } - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp2c); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp2c); mDoMtx_stack_c::transS(sp2c); @@ -3020,7 +3020,7 @@ bool daNpcWrestler_c::sumouTackleMiss(void* param_1) { setAction(&daNpcWrestler_c::sumouTackleShock); } else if (player->checkSumouPunchSuccess()) { setAction(&daNpcWrestler_c::sumouPunchShock); - } else if (mpMorf->isStop()) { + } else if (mAnm_p->isStop()) { setAction(&daNpcWrestler_c::sumouLostBalance); } break; @@ -3052,17 +3052,17 @@ bool daNpcWrestler_c::sumouTackleDraw(void* param_1) { break; case 2: - mpMorf->setPlaySpeed(0.0f); - mpMorf->setFrameF(player->getBaseAnimeFrame()); - mpMorf->modelCalc(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mAnm_p->setPlaySpeed(0.0f); + mAnm_p->setFrameF(player->getBaseAnimeFrame()); + mAnm_p->modelCalc(); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp2c); mDoMtx_stack_c::transS(sp2c); mDoMtx_stack_c::YrotM(mCurAngle.y); mDoMtx_stack_c::transM(0.0f, 20.0f, 60.0f); mDoMtx_stack_c::multVecZero(&sp2c); - if (mpMorf->getFrame() == 4.0f) { + if (mAnm_p->getFrame() == 4.0f) { if (mType == 1 && !daPy_getPlayerActorClass()->checkEquipHeavyBoots()) { setAction(&daNpcWrestler_c::demoSumouUnilateralWin); } else { @@ -3096,7 +3096,7 @@ bool daNpcWrestler_c::sumouTackleDraw(void* param_1) { } } - if (mpMorf->getFrame() > 4.0f && mpMorf->getFrame() < 24.0f) { + if (mAnm_p->getFrame() > 4.0f && mAnm_p->getFrame() < 24.0f) { dCam_getBody()->ModeFix(5); } @@ -3168,7 +3168,7 @@ bool daNpcWrestler_c::sumouSideStep(void* param_1) { setMotion(10, -1.0f, 0); } - mpMorf->setPlaySpeed(2.4f); + mAnm_p->setPlaySpeed(2.4f); field_0xe96 = 2; break; @@ -3179,7 +3179,7 @@ bool daNpcWrestler_c::sumouSideStep(void* param_1) { int jointNo2 = mType == 0 ? 0x1E : 0x1B; JPABaseEmitter* emitter = NULL; cXyz sp2c; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp2c); sp2c.y = current.pos.y; fopAcM_effSmokeSet2(&field_0xde8, NULL, &sp2c, &mCurAngle, 0.8f, &tevStr); @@ -3188,7 +3188,7 @@ bool daNpcWrestler_c::sumouSideStep(void* param_1) { emitter->setRateStep(1); } - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo2)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo2)); mDoMtx_stack_c::multVecZero(&sp2c); sp2c.y = current.pos.y; fopAcM_effSmokeSet2(&field_0xdec, NULL, &sp2c, &mCurAngle, 0.8f, &tevStr); @@ -3279,9 +3279,9 @@ bool daNpcWrestler_c::sumouPunchShock(void* param_1) { break; case 2: - mpMorf->setPlaySpeed(0.0f); - mpMorf->setFrameF(player->getBaseAnimeFrame()); - if (mpMorf->getFrame() == 13.0f) { + mAnm_p->setPlaySpeed(0.0f); + mAnm_p->setFrameF(player->getBaseAnimeFrame()); + if (mAnm_p->getFrame() == 13.0f) { dComIfGp_getVibration().StartShock(field_0xbd8->slap_hit_impact, 15, cXyz(0.0f, 1.0f, 0.0f)); } @@ -3322,7 +3322,7 @@ bool daNpcWrestler_c::sumouPunchChaseShock(void* param_1) { setMotion(10, -1.0f, 0); } - mpMorf->setPlaySpeed(2.4f); + mAnm_p->setPlaySpeed(2.4f); field_0xe96 = 2; break; @@ -3330,13 +3330,13 @@ bool daNpcWrestler_c::sumouPunchChaseShock(void* param_1) { if (player->getBaseAnimeFrame() == 13.0f) { setExpressionAnm(7, true); setMotion(0xF, -1.0f, 0); - mpMorf->setFrameF(13.0f); + mAnm_p->setFrameF(13.0f); dComIfGp_getVibration().StartShock(field_0xbd8->slap_hit_impact, 15, cXyz(0.0f, 1.0f, 0.0f)); } if (player->getBaseAnimeFrame() >= 13.0f) { - mpMorf->setPlaySpeed(0.0f); - mpMorf->setFrameF(player->getBaseAnimeFrame()); + mAnm_p->setPlaySpeed(0.0f); + mAnm_p->setFrameF(player->getBaseAnimeFrame()); } else { correctGraspPosAngle(true); } @@ -3416,9 +3416,9 @@ bool daNpcWrestler_c::sumouTackleShock(void* param_1) { break; case 2: - mpMorf->setPlaySpeed(0.0f); - mpMorf->setFrameF(player->getBaseAnimeFrame()); - if (mpMorf->getFrame() == 5.0f) { + mAnm_p->setPlaySpeed(0.0f); + mAnm_p->setFrameF(player->getBaseAnimeFrame()); + if (mAnm_p->getFrame() == 5.0f) { dComIfGp_getVibration().StartShock(field_0xbd8->slap_hit_impact, 15, cXyz(0.0f, 1.0f, 0.0f)); } @@ -3458,12 +3458,12 @@ bool daNpcWrestler_c::sumouTackleStagger(void* param_1) { case 2: { correctGraspPosAngle(true); cXyz sp58; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp58); sp58.y = current.pos.y; fopAcM_effSmokeSet2(&field_0xde8, NULL, &sp58, &mCurAngle, 0.9f, &tevStr); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo2)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo2)); mDoMtx_stack_c::multVecZero(&sp58); sp58.y = current.pos.y; fopAcM_effSmokeSet2(&field_0xdec, NULL, &sp58, &mCurAngle, 0.9f, &tevStr); @@ -3478,8 +3478,8 @@ bool daNpcWrestler_c::sumouTackleStagger(void* param_1) { player->setSumouPushFrontStop(); } - mpMorf->setPlaySpeed(0.0f); - mpMorf->setFrameF(player->getBaseAnimeFrame()); + mAnm_p->setPlaySpeed(0.0f); + mAnm_p->setFrameF(player->getBaseAnimeFrame()); field_0xe80--; @@ -3517,8 +3517,8 @@ bool daNpcWrestler_c::sumouTackleStaggerRelease(void* param_1) { case 2: correctGraspPosAngle(true); Z2GetAudioMgr()->changeSubBgmStatus(2); - mpMorf->setPlaySpeed(0.0f); - mpMorf->setFrameF(player->getBaseAnimeFrame()); + mAnm_p->setPlaySpeed(0.0f); + mAnm_p->setFrameF(player->getBaseAnimeFrame()); if (player->checkSumouWait()) { setAction(&daNpcWrestler_c::sumouWait); @@ -3555,12 +3555,12 @@ bool daNpcWrestler_c::sumouTacklePush(void* param_1) { jointNo2 = mType == 0 ? 0x1E : 0x1B; cXyz sp60; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp60); sp60.y = current.pos.y; fopAcM_effSmokeSet2(&field_0xde8, NULL, &sp60, &mCurAngle, 0.9f, &tevStr); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo2)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo2)); mDoMtx_stack_c::multVecZero(&sp60); sp60.y = current.pos.y; fopAcM_effSmokeSet2(&field_0xdec, NULL, &sp60, &mCurAngle, 0.9f, &tevStr); @@ -3581,8 +3581,8 @@ bool daNpcWrestler_c::sumouTacklePush(void* param_1) { } player->setSumouPushBackDirection(sVar1); - mpMorf->setPlaySpeed(0.0f); - mpMorf->setFrameF(player->getBaseAnimeFrame()); + mAnm_p->setPlaySpeed(0.0f); + mAnm_p->setFrameF(player->getBaseAnimeFrame()); if (checkOutOfArenaP()) { setAction(&daNpcWrestler_c::demoSumouWin); @@ -3615,26 +3615,26 @@ bool daNpcWrestler_c::sumouTackleRelease(void* param_1) { case 2: { correctGraspPosAngle(true); - f32 frame = mpMorf->getFrame(); + f32 frame = mAnm_p->getFrame(); if (frame >= 23.0f && frame <= 34.0f) { int jointNo = mType == 0 ? 0x1A : 0x18; int jointNo2 = mType == 0 ? 0x1E : 0x1B; cXyz sp3c; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp3c); sp3c.y = current.pos.y; fopAcM_effSmokeSet2(&field_0xde8, NULL, &sp3c, &mCurAngle, 0.9f, &tevStr); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo2)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo2)); mDoMtx_stack_c::multVecZero(&sp3c); sp3c.y = current.pos.y; fopAcM_effSmokeSet2(&field_0xdec, NULL, &sp3c, &mCurAngle, 0.9f, &tevStr); } Z2GetAudioMgr()->changeSubBgmStatus(2); - mpMorf->setPlaySpeed(0.0f); - mpMorf->setFrameF(daPy_getPlayerActorClass()->getBaseAnimeFrame()); + mAnm_p->setPlaySpeed(0.0f); + mAnm_p->setFrameF(daPy_getPlayerActorClass()->getBaseAnimeFrame()); if (daPy_getPlayerActorClass()->checkSumouWait()) { setAction(&daNpcWrestler_c::sumouWait); @@ -3785,13 +3785,13 @@ bool daNpcWrestler_c::demoSumouReady(void* param_1) { break; case 4: - if ((mType == 0 && mpMorf->checkFrame(103.0f)) || (mType == 1 && mpMorf->checkFrame(94.0f))) { + if ((mType == 0 && mAnm_p->checkFrame(103.0f)) || (mType == 1 && mAnm_p->checkFrame(94.0f))) { dComIfGp_getVibration().StartShock(8, 15, cXyz(0.0f, 1.0f, 0.0f)); int jointNo = mType == 0 ? 0x1E : 0x1B; cXyz sp3c; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp3c); sp3c.y = current.pos.y; fopAcM_effSmokeSet1(&field_0xde8, &field_0xdec, &sp3c, NULL, 0.8f, &tevStr, 1); @@ -4128,16 +4128,16 @@ bool daNpcWrestler_c::demoSumouLose(void* param_1) { break; case 1: - if (mMotionPhase == 0 && mpMorf->getFrame() == 40.0f) { + if (mMotionPhase == 0 && mAnm_p->getFrame() == 40.0f) { dComIfGp_getVibration().StartShock(8, 15, cXyz(0.0f, 1.0f, 0.0f)); int jointNo = mType == 0 ? 0x16 : 0x14; cXyz sp74; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp74); fopAcM_effSmokeSet1(&field_0xde8, &field_0xdec, &sp74, NULL, 1.6f, &tevStr, 1); } else if (mMotionPhase == 0) { - if (mpMorf->getFrame() > mpMorf->getEndFrame() - 1.0f) { + if (mAnm_p->getFrame() > mAnm_p->getEndFrame() - 1.0f) { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(mCurAngle.y); @@ -4374,16 +4374,16 @@ bool daNpcWrestler_c::demoSumouLose2(void* param_1) { break; case 1: { - if (mMotionPhase == 0 && mpMorf->getFrame() == 20.0f) { + if (mMotionPhase == 0 && mAnm_p->getFrame() == 20.0f) { dComIfGp_getVibration().StartShock(8, 15, cXyz(0.0f, 1.0f, 0.0f)); int jointNo = mType == 0 ? 0x16 : 0x14; cXyz sp74; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jointNo)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jointNo)); mDoMtx_stack_c::multVecZero(&sp74); fopAcM_effSmokeSet1(&field_0xde8, &field_0xdec, &sp74, NULL, 1.6f, &tevStr, 1); } else if (mMotionPhase == 0) { - if (mpMorf->getFrame() > mpMorf->getEndFrame() - 1.0f) { + if (mAnm_p->getFrame() > mAnm_p->getEndFrame() - 1.0f) { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(mCurAngle.y); @@ -4627,7 +4627,7 @@ bool daNpcWrestler_c::demoTalkAfterLose(void* param_1) { break; case 1: - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { setLookMode(3); initTalk(mMsgNo, NULL); field_0xe84++; @@ -5080,142 +5080,142 @@ bool daNpcWrestler_c::selectAction() { /* 80B3EF10-80B3FCE8 00FD70 0DD8+00 1/1 0/0 0/0 .text setWrestlerVoice__15daNpcWrestler_cFv */ void daNpcWrestler_c::setWrestlerVoice() { - J3DAnmTransform* anmTransform = mpMorf->getAnm(); + J3DAnmTransform* anmTransform = mAnm_p->getAnm(); if (mType == 0) { if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x27)) { - if (mpMorf->getFrame() == 11.0f) { + if (mAnm_p->getFrame() == 11.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_HARITE_ATK, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x29)) { - if (mpMorf->getFrame() == 11.0f) { + if (mAnm_p->getFrame() == 11.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_HARITE_ATK, -1); - } else if (mpMorf->getFrame() == 35.0f) { + } else if (mAnm_p->getFrame() == 35.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_HOLDED, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x28)) { - if (mpMorf->getFrame() == 15.0f) { + if (mAnm_p->getFrame() == 15.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_HARITE_DMG, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x2A)) { - if (mpMorf->getFrame() == 15.0f) { + if (mAnm_p->getFrame() == 15.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_HARITE_DMG, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x30)) { - if (mpMorf->getFrame() == 2.0f) { + if (mAnm_p->getFrame() == 2.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_TUCKLE_ATK, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x31)) { - if (mpMorf->getFrame() == 32.0f) { + if (mAnm_p->getFrame() == 32.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_TUCKLE_ATK, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x32)) { - if (mpMorf->getFrame() == 2.0f) { + if (mAnm_p->getFrame() == 2.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_TUCKLE_ATK, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x33)) { - if (mpMorf->getFrame() == 7.0f) { + if (mAnm_p->getFrame() == 7.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_HOLDED, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x36)) { - if (mpMorf->getFrame() == 7.0f) { + if (mAnm_p->getFrame() == 7.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_HOLDED, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x2B)) { - if (mpMorf->getFrame() == 5.0f) { + if (mAnm_p->getFrame() == 5.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_HOLD_BACK, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x35)) { - if (mpMorf->getFrame() == 5.0f) { + if (mAnm_p->getFrame() == 5.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_PUSH, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x39)) { - if (mpMorf->getFrame() == 10.0f) { + if (mAnm_p->getFrame() == 10.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_PUSH_LAST, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x23)) { - if (mpMorf->getFrame() == 23.0f) { + if (mAnm_p->getFrame() == 23.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_FALL_LOSE, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x24)) { - if (mpMorf->getFrame() == 3.0f) { + if (mAnm_p->getFrame() == 3.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_FALL_LOSE, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x2D)) { - if (mpMorf->getFrame() == 37.0f) { + if (mAnm_p->getFrame() == 37.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_SHIKO, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x26)) { - if (mpMorf->getFrame() == 13.0f) { + if (mAnm_p->getFrame() == 13.0f) { mSound.startCreatureVoice(Z2SE_BOU_V_SUMO_PUSHED_BACK, -1); } } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x31)) { - if (mpMorf->getFrame() == 42.0f) { + if (mAnm_p->getFrame() == 42.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_SHIKO, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x2C)) { - if (mpMorf->getFrame() == 11.0f) { + if (mAnm_p->getFrame() == 11.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_HARITE_ATK, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x2E)) { - if (mpMorf->getFrame() == 11.0f) { + if (mAnm_p->getFrame() == 11.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_HARITE_ATK, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x2D)) { - if (mpMorf->getFrame() == 12.0f) { + if (mAnm_p->getFrame() == 12.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_HARITE_DMG, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x2F)) { - if (mpMorf->getFrame() == 15.0f) { + if (mAnm_p->getFrame() == 15.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_HARITE_DMG, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x35)) { - if (mpMorf->getFrame() == 2.0f) { + if (mAnm_p->getFrame() == 2.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_TUCKLE_ATK, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x36)) { - if (mpMorf->getFrame() == 32.0f) { + if (mAnm_p->getFrame() == 32.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_TUCKLE_ATK, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x37)) { - if (mpMorf->getFrame() == 2.0f) { + if (mAnm_p->getFrame() == 2.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_TUCKLE_ATK, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x2E)) { - if (mpMorf->getFrame() == 35.0f) { + if (mAnm_p->getFrame() == 35.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_HOLDED, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x38)) { - if (mpMorf->getFrame() == 7.0f) { + if (mAnm_p->getFrame() == 7.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_HOLDED, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x3B)) { - if (mpMorf->getFrame() == 7.0f) { + if (mAnm_p->getFrame() == 7.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_HOLDED, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x30)) { - if (mpMorf->getFrame() == 5.0f) { + if (mAnm_p->getFrame() == 5.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_HOLD_BACK, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x2B)) { - if (mpMorf->getFrame() == 13.0f) { + if (mAnm_p->getFrame() == 13.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_PUSHED_BACK, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x3A)) { - if (mpMorf->getFrame() == 5.0f) { + if (mAnm_p->getFrame() == 5.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_PUSH, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x43)) { - if (mpMorf->getFrame() == 10.0f) { + if (mAnm_p->getFrame() == 10.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_PUSH_LAST, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x28)) { - if (mpMorf->getFrame() == 23.0f) { + if (mAnm_p->getFrame() == 23.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_FALL_LOSE, -1); } } else if (anmTransform == (J3DAnmTransform*)getTrnsfrmKeyAnmP(l_resName[mType], 0x29)) { - if (mpMorf->getFrame() == 3.0f) { + if (mAnm_p->getFrame() == 3.0f) { mSound.startCreatureVoice(Z2SE_GRN_V_SUMO_FALL_LOSE, -1); } } diff --git a/src/d/actor/d_a_npc_zra.cpp b/src/d/actor/d_a_npc_zra.cpp index 11bdb8e4af..80755dc560 100644 --- a/src/d/actor/d_a_npc_zra.cpp +++ b/src/d/actor/d_a_npc_zra.cpp @@ -512,7 +512,7 @@ daNpc_zrA_c::~daNpc_zrA_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -583,7 +583,7 @@ cPhs__Step daNpc_zrA_c::create() { return cPhs_ERROR_e; } - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); mCreatureSound.init(¤t.pos, &eyePos, 3, 1); mAcchCir.SetWall(daNpc_zrA_Param_c::m.mWallR, daNpc_zrA_Param_c::m.mWallH); @@ -628,17 +628,17 @@ int daNpc_zrA_c::CreateHeap() { } model_flag = 0; } - mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, + mAnm_p = new mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, model_flag, 0x11020285); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 i = 0; i < model_data->getJointNum(); i++) { switch (i) { case 0: @@ -711,7 +711,7 @@ int daNpc_zrA_c::Execute() { /* 80B7A570-80B7A864 002150 02F4+00 1/1 0/0 0/0 .text Draw__11daNpc_zrA_cFv */ int daNpc_zrA_c::Draw() { BOOL bvar2 = false; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); J3DModelData* model_data = model->getModelData(); model_data->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); @@ -754,10 +754,10 @@ int daNpc_zrA_c::Draw() { if (mTwilight) { dComIfGd_setListDark(); - mpMorf->entryDL(); + mAnm_p->entryDL(); dComIfGd_setList(); } else { - mpMorf->entryDL(); + mAnm_p->entryDL(); } if (mAnmFlags & ANM_PLAY_BTP) { @@ -825,11 +825,11 @@ int daNpc_zrA_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int lookat_joints[3] = {1, 3, 4}; if (jnt_no == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -856,8 +856,8 @@ int daNpc_zrA_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jnt_no == 4 || jnt_no == 14) && (mAnmFlags & ANM_PLAY_BCK)) { J3DAnmTransform* bck_anm = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(bck_anm); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(bck_anm); } return 1; @@ -1062,7 +1062,7 @@ void daNpc_zrA_c::setAttnPos() { } } - J3DModelData* model_data = mpMorf->getModel()->getModelData(); + J3DModelData* model_data = mAnm_p->getModel()->getModelData(); for (u16 i = 0; i < model_data->getJointNum(); i++) { switch (i) { @@ -1085,7 +1085,7 @@ void daNpc_zrA_c::setAttnPos() { lookat(); setPrtcl(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); eyeOffset.y = 0.0f; @@ -1113,7 +1113,7 @@ void daNpc_zrA_c::setAttnPos() { || mActionType == ACT_TYPE_2 || mActionType == ACT_TYPE_3))) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(29)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(29)); mDoMtx_stack_c::multVecZero(¢er); center.y = current.pos.y; extra_radius = 70.0f; @@ -1121,7 +1121,7 @@ void daNpc_zrA_c::setAttnPos() { center = current.pos; } - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&vec5); attention_info.position.set(vec5.x, vec5.y + 40.0f, vec5.z); } else { @@ -1179,7 +1179,7 @@ void daNpc_zrA_c::setAttnPos() { /* 80B7B91C-80B7B9D4 0034FC 00B8+00 1/0 0/0 0/0 .text setMtx__11daNpc_zrA_cFv */ void daNpc_zrA_c::setMtx() { - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); cXyz pos = current.pos; pos += mModulationOffset; mDoMtx_stack_c::transS(pos); @@ -1190,9 +1190,9 @@ void daNpc_zrA_c::setMtx() { if (mAnmFlags & ANM_PLAY_BCK) { mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame()); - mpMorf->modelCalc(); + mAnm_p->modelCalc(); } else { - mpMorf->modelCalc(); + mAnm_p->modelCalc(); } } @@ -1338,7 +1338,7 @@ bool daNpc_zrA_c::setExpressionBtp(int i_idx) { return true; } - if (setBtpAnm(btp_anm, mpMorf->getModel()->getModelData(), 1.0f, attr)) { + if (setBtpAnm(btp_anm, mAnm_p->getModel()->getModelData(), 1.0f, attr)) { mAnmFlags |= ANM_PLAY_BTP | ANM_PAUSE_BTP; if (i_idx == 0) { mAnmFlags |= ANM_FLAG_800; @@ -1439,7 +1439,7 @@ void daNpc_zrA_c::setMotionAnm(int i_idx, f32 i_morf) { l_btkGetParamList[btk_idx].fileIdx); } - if (btk_anm != NULL && setBtkAnm(btk_anm, mpMorf->getModel()->getModelData(), 1.0f, 2)) { + if (btk_anm != NULL && setBtkAnm(btk_anm, mAnm_p->getModel()->getModelData(), 1.0f, 2)) { mAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK; } @@ -1487,7 +1487,7 @@ void daNpc_zrA_c::setMotionWaterAnm(int i_idx) { if (brk_anm != NULL) { if (mBrkAnm.getBrkAnm() == brk_anm) { mAnmFlags |= ANM_PLAY_BRK; - } else if (setBrkAnm(brk_anm, mpMorf->getModel()->getModelData(), 1.0f, 2)) { + } else if (setBrkAnm(brk_anm, mAnm_p->getModel()->getModelData(), 1.0f, 2)) { mAnmFlags |= ANM_PLAY_BRK | ANM_PAUSE_BRK; } } @@ -1502,7 +1502,7 @@ void daNpc_zrA_c::setMotionWaterAnm(int i_idx) { if (btk_anm != NULL) { if (mWaterBtkAnm.getBtkAnm() == btk_anm) { mWaterAnmFlags |= ANM_PLAY_BTK; - } else if (mWaterBtkAnm.init(mpMorf->getModel()->getModelData(), + } else if (mWaterBtkAnm.init(mAnm_p->getModel()->getModelData(), btk_anm, 1, 2, 1.0f, 0, -1)) { mWaterAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK; } @@ -1517,7 +1517,7 @@ void daNpc_zrA_c::setMotionWaterAnm(int i_idx) { if (bpk_anm != NULL) { if (mWaterBpkAnm.getBpkAnm() == bpk_anm) { mWaterAnmFlags |= ANM_PLAY_BPK; - } else if (mWaterBpkAnm.init(mpMorf->getModel()->getModelData(), + } else if (mWaterBpkAnm.init(mAnm_p->getModel()->getModelData(), bpk_anm, 1, 2, 1.0f, 0, -1)) { mWaterAnmFlags |= ANM_PLAY_BPK | ANM_PAUSE_BPK; } @@ -1556,7 +1556,7 @@ void daNpc_zrA_c::drawOtherMdls() { J3DModel* model = mpObjectModel[i]; if (model != NULL && jnt_no >= 0) { g_env_light.setLightTevColorType_MAJI(model, &tevStr); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(jnt_no)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(jnt_no)); mDoMtx_stack_c::scaleM(scale); model->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(model); @@ -2229,7 +2229,7 @@ void daNpc_zrA_c::setLookMode(int i_lookMode) { /* 80B7E718-80B7E9E0 0062F8 02C8+00 1/1 0/0 0/0 .text lookat__11daNpc_zrA_cFv */ void daNpc_zrA_c::lookat() { fopAc_ac_c* attn_actor = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL snap = false; f32 body_down_angle = daNpc_zrA_Param_c::m.mBodyDownAngle; f32 body_up_angle = daNpc_zrA_Param_c::m.mBodyUpAngle; diff --git a/src/d/actor/d_a_npc_zra.inc b/src/d/actor/d_a_npc_zra.inc index d5028a3292..c29de5d37b 100644 --- a/src/d/actor/d_a_npc_zra.inc +++ b/src/d/actor/d_a_npc_zra.inc @@ -108,7 +108,7 @@ void daNpc_zrA_c::walkCalc() { } s16 target_angle = cLib_targetAngleY(¤t.pos, &next_pnt); speedF = HIO_PARAM(this).mWalkSpeed; - mpMorf->setPlaySpeed(HIO_PARAM(this).mWalkSpeed / HIO_PARAM(this).mWalkAnmRate); + mAnm_p->setPlaySpeed(HIO_PARAM(this).mWalkSpeed / HIO_PARAM(this).mWalkAnmRate); cLib_addCalcAngleS2(¤t.angle.y, target_angle, HIO_PARAM(this).mWalkAngleScale, HIO_PARAM(this).mWalkAngleSpeed); mCurAngle = current.angle; @@ -456,16 +456,16 @@ BOOL daNpc_zrA_c::railSwim() { csXyz angle; if (field_0x153c) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::scaleM(scale); mDoMtx_stack_c::multVecZero(&vec1); mPath.getDstPosDst2(current.pos, vec2); if (field_0x153e) { - if (mpMorf->getFrame() > 13.0f && mpMorf->getFrame() < 21.0f) { - f32 play_speed = mpMorf->getPlaySpeed(); + if (mAnm_p->getFrame() > 13.0f && mAnm_p->getFrame() < 21.0f) { + f32 play_speed = mAnm_p->getPlaySpeed(); cLib_addCalc2(&play_speed, 0.3f, 0.7f, 0.3f); - mpMorf->setPlaySpeed(play_speed); + mAnm_p->setPlaySpeed(play_speed); } calcBank(ang_step, 8, current.angle.y, current.angle.z); @@ -492,7 +492,7 @@ BOOL daNpc_zrA_c::railSwim() { field_0x153c = false; mSwimSpeedScale = 1.0f; mSwimSpeedF = mSwimSpeed.absXZ(); - mpMorf->setPlaySpeed(1.0f); + mAnm_p->setPlaySpeed(1.0f); } return true; @@ -511,10 +511,10 @@ BOOL daNpc_zrA_c::railSwim() { mIsAboveWater = true; mCreatureSound.startCreatureSound(Z2SE_ZRA_DIVE_SPLASH_OUT, 0, -1); } else { - if (mpMorf->getFrame() > 13.0f && mpMorf->getFrame() < 17.0f) { - f32 play_speed = mpMorf->getPlaySpeed(); + if (mAnm_p->getFrame() > 13.0f && mAnm_p->getFrame() < 17.0f) { + f32 play_speed = mAnm_p->getPlaySpeed(); cLib_addCalc2(&play_speed, 0.3f, 0.7f, 0.5f); - mpMorf->setPlaySpeed(play_speed); + mAnm_p->setPlaySpeed(play_speed); } if (current.pos.y > water_height && current.angle.x < -0x2000 @@ -585,7 +585,7 @@ BOOL daNpc_zrA_c::railSwim() { if (mActionType != ACT_TYPE_0 && mSpinAngle == 0 && !field_0x153c && !field_0x153d && (abs(ang_diff_x) > 0x3000 || abs(ang_diff_y) > 0x3000) && mSwimSpeedF > 14.0f) { - f32 frame = mpMorf->getFrame(); + f32 frame = mAnm_p->getFrame(); if ((angle.z <= 0x2000 || ang_diff_y >= 0) && (angle.z >= -0x2000 || ang_diff_y <= 0)) { if (ang_diff_x < -0x3000) { if (frame >= 2.0f && frame <= 4.0f) { @@ -614,15 +614,15 @@ BOOL daNpc_zrA_c::railSwim() { cLib_addCalc2(&mSwimSpeedF, fvar3 * HIO_PARAM(this).mSwimSpeed, fvar15, fvar2); if (field_0x153c == true && mIsAboveWater == true) { - if (mpMorf->getFrame() > 13.0f && mpMorf->getFrame() < 21.0f) { - f32 play_speed = mpMorf->getPlaySpeed(); + if (mAnm_p->getFrame() > 13.0f && mAnm_p->getFrame() < 21.0f) { + f32 play_speed = mAnm_p->getPlaySpeed(); cLib_addCalc2(&play_speed, 0.3f, 0.7f, 0.3f); - mpMorf->setPlaySpeed(play_speed); + mAnm_p->setPlaySpeed(play_speed); } } else if (!bvar6) { - f32 play_speed = mpMorf->getPlaySpeed(); + f32 play_speed = mAnm_p->getPlaySpeed(); cLib_addCalc2(&play_speed, mSwimSpeedF / HIO_PARAM(this).mSwimAnmRate, 0.2f, 0.1f); - mpMorf->setPlaySpeed(play_speed); + mAnm_p->setPlaySpeed(play_speed); } swim_speed.set(0.0f, 0.0f, mSwimSpeedF); @@ -761,24 +761,24 @@ BOOL daNpc_zrA_c::turnSwim() { shape_angle = mCurAngle; if (mBaseMotionAnm == ANM_SWIM_TURN) { - if (mpMorf->getFrame() < 40.0f) { + if (mAnm_p->getFrame() < 40.0f) { cXyz zero(0.0f, 0.0f, 0.0f); cLib_chasePos(&mSwimSpeed, zero, 0.7f); current.pos += mSwimSpeed; - mpMorf->setPlaySpeed(0.8f); + mAnm_p->setPlaySpeed(0.8f); } else { cXyz swim_speed; mSwimSpeedF = 1.5f * HIO_PARAM(this).mSwimSpeed; swim_speed.set(0.0f, 0.0f, mSwimSpeedF); calcSwimPos(swim_speed); - mpMorf->setPlaySpeed(1.0f); + mAnm_p->setPlaySpeed(1.0f); } } else if (mBaseMotionAnm == ANM_STILL) { cXyz swim_speed; mSwimSpeedF = 1.5f * HIO_PARAM(this).mSwimSpeed; swim_speed.set(0.0f, 0.0f, mSwimSpeedF); calcSwimPos(swim_speed); - mpMorf->setPlaySpeed(1.0f); + mAnm_p->setPlaySpeed(1.0f); if (mIsTurning) { mSwimTurnTimer = 10; @@ -808,7 +808,7 @@ BOOL daNpc_zrA_c::turnSwim() { BOOL daNpc_zrA_c::turnSwimCheck() { if (mSoldierType != SOLDIER_SPEAR) { if (mCheckSwimTurn) { - if (mpMorf->isLoop()) { + if (mAnm_p->isLoop()) { turnSwimInit(); turnSwim(); return true; @@ -1266,7 +1266,7 @@ BOOL daNpc_zrA_c::swimWaterfall(void* param_0) { if (mActionType != ACT_TYPE_0 && (abs(ang_diff_x) > 0x3000 || abs(ang_diff_y) > 0x3000) && mSwimSpeedF > 14.0f) { - f32 frame = mpMorf->getFrame(); + f32 frame = mAnm_p->getFrame(); if ((angle.z <= 0x2000 || ang_diff_y >= 0) && (angle.z >= -0x2000 || ang_diff_y <= 0)) { if (ang_diff_x < -0x3000) { if (frame >= 2.0f && frame <= 4.0f) { @@ -1274,9 +1274,9 @@ BOOL daNpc_zrA_c::swimWaterfall(void* param_0) { } } else { if (frame >= 16.0f && frame <= 18.0f) { - mpMorf->setFrame(18.0f); - mpMorf->setMorf(4.0f); - mpMorf->setPlaySpeed(0.1f); + mAnm_p->setFrame(18.0f); + mAnm_p->setMorf(4.0f); + mAnm_p->setPlaySpeed(0.1f); bvar5 = true; } } @@ -1303,11 +1303,11 @@ BOOL daNpc_zrA_c::swimWaterfall(void* param_0) { calcSwimPos(swim_speed); if (!bvar5) { - f32 play_speed = mpMorf->getPlaySpeed(); + f32 play_speed = mAnm_p->getPlaySpeed(); f32 target_speed = cLib_minMaxLimit(mSwimSpeedF / HIO_PARAM(this).mSwimAnmRate, 0.0f, 1.5f); cLib_addCalc2(&play_speed, target_speed, 0.2f, 0.1f); - mpMorf->setPlaySpeed(play_speed); + mAnm_p->setPlaySpeed(play_speed); } calcBank(angle_step, angle_scale, angle.y, angle.z); @@ -1645,7 +1645,7 @@ BOOL daNpc_zrA_c::diveCalc(s16 i_angleStep, s16 i_angleScale, BOOL param_2) { calcSwimAngle(angle, mSwimAngleCalc, i_angleScale, i_angleStep); shape_angle = mCurAngle = current.angle; - f32 frame = mpMorf->getFrame(); + f32 frame = mAnm_p->getFrame(); cXyz dive_speed(0.0f, 0.0f, 0.0f); if (frame < 3.0f) { dive_speed.set(0.0f, -6.0f, 0.0f); @@ -1860,15 +1860,15 @@ BOOL daNpc_zrA_c::swimRiverDescend(void* param_0) { if (field_0x153c) { mMeterCount = dMeter2Info_getNowCount(); cXyz head_pos_sp7c; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::scaleM(scale); mDoMtx_stack_c::multVecZero(&head_pos_sp7c); if (field_0x153e) { - if (mIsAboveWater && mpMorf->getFrame() > 13.0f && mpMorf->getFrame() < 17.0f) { - f32 play_speed_sp1c = mpMorf->getPlaySpeed(); + if (mIsAboveWater && mAnm_p->getFrame() > 13.0f && mAnm_p->getFrame() < 17.0f) { + f32 play_speed_sp1c = mAnm_p->getPlaySpeed(); cLib_addCalc2(&play_speed_sp1c, 0.3f, 0.7f, 0.5f); - mpMorf->setPlaySpeed(play_speed_sp1c); + mAnm_p->setPlaySpeed(play_speed_sp1c); } angle_sp44.y = cLib_targetAngleY(¤t.pos, &pos_sp94); @@ -1896,7 +1896,7 @@ BOOL daNpc_zrA_c::swimRiverDescend(void* param_0) { fopKyM_createWpillar(&wpillar_pos, 2.5f, 0); mIsAboveWater = false; mCreatureSound.startCreatureSound(Z2SE_ZRA_DIVE_SPLASH, 0, -1); - mpMorf->setPlaySpeed(1.0f); + mAnm_p->setPlaySpeed(1.0f); } if (current.pos.y <= water_height - HIO_PARAM(this).mMinDepth) { @@ -1924,10 +1924,10 @@ BOOL daNpc_zrA_c::swimRiverDescend(void* param_0) { mIsAboveWater = true; mCreatureSound.startCreatureSound(Z2SE_ZRA_DIVE_SPLASH_OUT, 0, -1); } else { - if (mpMorf->getFrame() > 13.0f && mpMorf->getFrame() < 17.0f) { - f32 play_speed_sp18 = mpMorf->getPlaySpeed(); + if (mAnm_p->getFrame() > 13.0f && mAnm_p->getFrame() < 17.0f) { + f32 play_speed_sp18 = mAnm_p->getPlaySpeed(); cLib_addCalc2(&play_speed_sp18, 0.3f, 0.7f, 0.8f); - mpMorf->setPlaySpeed(play_speed_sp18); + mAnm_p->setPlaySpeed(play_speed_sp18); } if (current.pos.y > water_height && current.angle.x < -0x2000) { swim_speed_sp88.set(0.0f, 0.0f, mSwimSpeedF); @@ -2008,7 +2008,7 @@ BOOL daNpc_zrA_c::swimRiverDescend(void* param_0) { swim_speed_sp88.set(0.0f, 0.0f, mSwimSpeedF); calcSwimPos(swim_speed_sp88); - f32 play_speed_sp14 = mpMorf->getPlaySpeed(); + f32 play_speed_sp14 = mAnm_p->getPlaySpeed(); if (target_speed_f31 != 0.0f) { cLib_addCalc2(&play_speed_sp14, cLib_minMaxLimit((mSwimSpeedF - vec_sp58.abs()) / 25.0f, 0.0f, 1.3f) + 0.7f, @@ -2016,7 +2016,7 @@ BOOL daNpc_zrA_c::swimRiverDescend(void* param_0) { } else { cLib_addCalc2(&play_speed_sp14, 1.7f, 0.2f, 0.05f); } - mpMorf->setPlaySpeed(play_speed_sp14); + mAnm_p->setPlaySpeed(play_speed_sp14); if (!field_0x153c && mAcch.ChkWaterHit() && current.pos.y > water_height - HIO_PARAM(this).mMinDepth) @@ -2097,9 +2097,9 @@ BOOL daNpc_zrA_c::swimRiverDescend2(void* param_0) { swim_speed.set(0.0f, 0.0f, mSwimSpeedF); calcSwimPos(swim_speed); - f32 play_speed = mpMorf->getPlaySpeed(); + f32 play_speed = mAnm_p->getPlaySpeed(); cLib_addCalc2(&play_speed, 1.7f, 0.2f, 0.05f); - mpMorf->setPlaySpeed(play_speed); + mAnm_p->setPlaySpeed(play_speed); if (mAcch.ChkWaterHit() && current.pos.y > water_height - HIO_PARAM(this).mMinDepth) @@ -2154,7 +2154,7 @@ BOOL daNpc_zrA_c::diveRiverDescend(void* param_0) { calcSwimAngle(angle, mSwimAngleCalc, 3, angle_step); shape_angle = mCurAngle = current.angle; - f32 frame = mpMorf->getFrame(); + f32 frame = mAnm_p->getFrame(); cXyz dive_speed(0.0f, 0.0f, 0.0f); if (mBaseMotionAnm == ANM_DIVE_B) { if (frame <= 3.0f) { @@ -2276,12 +2276,12 @@ BOOL daNpc_zrA_c::swimGoalRiverDescend(void* param_0) { swim_speed.set(0.0f, 0.0f, mSwimSpeedF); calcSwimPos(swim_speed); - f32 play_speed = mpMorf->getPlaySpeed(); + f32 play_speed = mAnm_p->getPlaySpeed(); //!@bug vec is used here despite not being initialized in all code paths f32 target_play_speed = cLib_minMaxLimit((mSwimSpeedF - vec.abs()) / 25.0f, 0.0f, 1.3f) + 0.7f; cLib_addCalc2(&play_speed, target_play_speed, 0.2f, 0.1f); - mpMorf->setPlaySpeed(play_speed); + mAnm_p->setPlaySpeed(play_speed); calcBank(angle_step, 3, angle.y, angle.z); current.angle.z = angle.z; @@ -2327,7 +2327,7 @@ BOOL daNpc_zrA_c::returnRiverDescend(void* param_0) { && (abs(angle_diff_x) > 0x3000 || abs(angle_diff_y) > 0x3000) && mSwimSpeedF > 14.0f) { - f32 frame = mpMorf->getFrame(); + f32 frame = mAnm_p->getFrame(); if ((angle.z <= 0x2000 || angle_diff_y >= 0) && (angle.z >= -0x2000 || angle_diff_y <= 0)) { @@ -2337,9 +2337,9 @@ BOOL daNpc_zrA_c::returnRiverDescend(void* param_0) { } } else { if (frame >= 16.0f && frame <= 18.0f) { - mpMorf->setFrame(18.0f); - mpMorf->setMorf(2.0f); - mpMorf->setPlaySpeed(0.1f); + mAnm_p->setFrame(18.0f); + mAnm_p->setMorf(2.0f); + mAnm_p->setPlaySpeed(0.1f); bvar4 = true; } } @@ -2364,10 +2364,10 @@ BOOL daNpc_zrA_c::returnRiverDescend(void* param_0) { } if (!bvar4) { - f32 play_speed = mpMorf->getPlaySpeed(); + f32 play_speed = mAnm_p->getPlaySpeed(); cLib_addCalc2(&play_speed, mSwimSpeedF / HIO_PARAM(this).mSwimAnmRate, 0.2f, 0.1f); - mpMorf->setPlaySpeed(play_speed); + mAnm_p->setPlaySpeed(play_speed); } calcBank(angle_step, 8, angle.y, angle.z); @@ -2743,9 +2743,9 @@ BOOL daNpc_zrA_c::ECut_thanksBlast(int i_staffID) { } cLib_addCalc2(&mSwimSpeedF, target_speed, 0.2f, 3.0f); - f32 play_speed = mpMorf->getPlaySpeed(); + f32 play_speed = mAnm_p->getPlaySpeed(); cLib_addCalc2(&play_speed, 1.0f, 0.2f, 0.03f); - mpMorf->setPlaySpeed(play_speed); + mAnm_p->setPlaySpeed(play_speed); csXyz angle; angle.x = cLib_targetAngleX(&pos, ¤t.pos); @@ -2837,7 +2837,7 @@ BOOL daNpc_zrA_c::ECut_thanksBlast(int i_staffID) { calcSwimAngle(angle, mSwimAngleCalc, 4, angle_step); shape_angle = mCurAngle = current.angle; - f32 frame = mpMorf->getFrame(); + f32 frame = mAnm_p->getFrame(); cXyz dive_speed(0.0f, 0.0f, 0.0f); if (mBaseMotionAnm == ANM_DIVE_B) { if (frame <= 3.0f) { @@ -3059,9 +3059,9 @@ BOOL daNpc_zrA_c::ECut_resultAnnounce(int i_staffID) { } cLib_addCalc2(&mSwimSpeedF, target_speed, 0.2f, 3.0f); - f32 play_speed = mpMorf->getPlaySpeed(); + f32 play_speed = mAnm_p->getPlaySpeed(); cLib_addCalc2(&play_speed, 1.0f, 0.2f, 0.03f); - mpMorf->setPlaySpeed(play_speed); + mAnm_p->setPlaySpeed(play_speed); csXyz angle; angle.x = cLib_targetAngleX(&pos, ¤t.pos); @@ -3149,7 +3149,7 @@ BOOL daNpc_zrA_c::ECut_resultAnnounce(int i_staffID) { calcSwimAngle(angle, mSwimAngleCalc, 4, angle_step); shape_angle = mCurAngle = current.angle; - f32 frame = mpMorf->getFrame(); + f32 frame = mAnm_p->getFrame(); cXyz dive_speed(0.0f, 0.0f, 0.0f); if (mBaseMotionAnm == ANM_DIVE_B) { if (frame <= 3.0f) { @@ -3353,7 +3353,7 @@ BOOL daNpc_zrA_c::tobikomi1(void* param_0) { case 2: if (mBaseMotionAnm == MOT_FLOAT_B) { - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { cXyz vec(-1.68f, -7.99f, 206.37f); mDoMtx_stack_c::YrotS(mCurAngle.y); mDoMtx_stack_c::multVec(&vec, &vec); @@ -3398,7 +3398,7 @@ BOOL daNpc_zrA_c::tobikomi2(void* param_0) { case 2: if (fopAcM_getWaterY(¤t.pos, &water_y)) { cXyz head_pos; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::scaleM(scale); mDoMtx_stack_c::multVecZero(&head_pos); if (head_pos.y <= water_y) { @@ -3472,15 +3472,15 @@ BOOL daNpc_zrA_c::tobiJump(void* param_0) { case 2: { cXyz head_pos; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::scaleM(scale); mDoMtx_stack_c::multVecZero(&head_pos); if (field_0x153e) { - if (mpMorf->getFrame() > 13.0f && mpMorf->getFrame() < 17.0f) { - f32 play_speed = mpMorf->getPlaySpeed(); + if (mAnm_p->getFrame() > 13.0f && mAnm_p->getFrame() < 17.0f) { + f32 play_speed = mAnm_p->getPlaySpeed(); cLib_addCalc2(&play_speed, 0.3f, 0.5f, 0.8f); - mpMorf->setPlaySpeed(play_speed); + mAnm_p->setPlaySpeed(play_speed); } calcBank(angle_step, angle_scale, current.angle.y, current.angle.z); @@ -3538,9 +3538,9 @@ BOOL daNpc_zrA_c::tobiJump(void* param_0) { cLib_addCalc2(&mSwimSpeedF, 2.0f * HIO_PARAM(this).mSwimSpeed, 0.7f, 10.0f); swim_speed.set(0.0f, 0.0f, mSwimSpeedF); calcSwimPos(swim_speed); - f32 play_speed = mpMorf->getPlaySpeed(); + f32 play_speed = mAnm_p->getPlaySpeed(); cLib_addCalc2(&play_speed, mSwimSpeedF / HIO_PARAM(this).mSwimAnmRate, 0.2f, 0.1f); - mpMorf->setPlaySpeed(play_speed); + mAnm_p->setPlaySpeed(play_speed); shape_angle = mCurAngle = current.angle; } @@ -3582,9 +3582,9 @@ BOOL daNpc_zrA_c::tobiEnd(void* param_0) { HIO_PARAM(this).mSwimSpeed / 3.0f); swim_speed.set(0.0f, 0.0f, mSwimSpeedF); calcSwimPos(swim_speed); - f32 play_speed = mpMorf->getPlaySpeed(); + f32 play_speed = mAnm_p->getPlaySpeed(); cLib_addCalc2(&play_speed, mSwimSpeedF / HIO_PARAM(this).mSwimAnmRate, 0.2f, 0.1f); - mpMorf->setPlaySpeed(play_speed); + mAnm_p->setPlaySpeed(play_speed); calcBank(angle_step, 8, angle.y, angle.z); current.angle.z = angle.z; shape_angle = mCurAngle = current.angle; @@ -3703,7 +3703,7 @@ BOOL daNpc_zrA_c::ECut_searchPrince1(int i_staffID) { case 20: { if (mBaseMotionAnm == ANM_TOBIKOMI_S) { - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { cXyz dive_speed(-1.68f, -30.0f, 210.37f); mDoMtx_stack_c::YrotS(mCurAngle.y); mDoMtx_stack_c::multVec(&dive_speed, &dive_speed); @@ -3720,7 +3720,7 @@ BOOL daNpc_zrA_c::ECut_searchPrince1(int i_staffID) { ret = true; } cXyz head_pos; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::scaleM(scale); mDoMtx_stack_c::multVecZero(&head_pos); break; @@ -3731,7 +3731,7 @@ BOOL daNpc_zrA_c::ECut_searchPrince1(int i_staffID) { ret = true; } else if (fopAcM_getWaterY(¤t.pos, &water_y)) { cXyz head_pos; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::scaleM(scale); mDoMtx_stack_c::multVecZero(&head_pos); if (head_pos.y <= water_y) { @@ -3768,7 +3768,7 @@ BOOL daNpc_zrA_c::ECut_searchPrince1(int i_staffID) { angle.x = cLib_targetAngleX(&pos, ¤t.pos); angle.y = cLib_targetAngleY(¤t.pos, &pos); angle.z = current.angle.z; - mpMorf->setPlaySpeed(HIO_PARAM(this).mSwimSpeed / HIO_PARAM(this).mSwimAnmRate); + mAnm_p->setPlaySpeed(HIO_PARAM(this).mSwimSpeed / HIO_PARAM(this).mSwimAnmRate); calcSwimAngle(angle, mSwimAngleCalc, 23, HIO_PARAM(this).mSwimAngleSpeed / 2); calcSwimPos(swim_speed); calcBank(HIO_PARAM(this).mSwimAngleSpeed / 2, 16, angle.y, angle.z); @@ -3842,7 +3842,7 @@ BOOL daNpc_zrA_c::ECut_searchPrince2(int i_staffID) { case 20: if (mBaseMotionAnm == ANM_TOBIKOMI_S) { - if (mpMorf->isStop()) { + if (mAnm_p->isStop()) { cXyz dive_speed(-1.68f, -30.0f, 210.37f); mDoMtx_stack_c::YrotS(mCurAngle.y); mDoMtx_stack_c::multVec(&dive_speed, &dive_speed); @@ -3865,7 +3865,7 @@ BOOL daNpc_zrA_c::ECut_searchPrince2(int i_staffID) { ret = true; } else if (fopAcM_getWaterY(¤t.pos, &water_y)) { cXyz head_pos; - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::scaleM(scale); mDoMtx_stack_c::multVecZero(&head_pos); if (head_pos.y <= water_y) { @@ -3902,7 +3902,7 @@ BOOL daNpc_zrA_c::ECut_searchPrince2(int i_staffID) { angle.x = cLib_targetAngleX(&pos, ¤t.pos); angle.y = cLib_targetAngleY(¤t.pos, &pos); angle.z = current.angle.z; - mpMorf->setPlaySpeed(HIO_PARAM(this).mSwimSpeed / HIO_PARAM(this).mSwimAnmRate); + mAnm_p->setPlaySpeed(HIO_PARAM(this).mSwimSpeed / HIO_PARAM(this).mSwimAnmRate); calcSwimAngle(angle, mSwimAngleCalc, 23, HIO_PARAM(this).mSwimAngleSpeed / 2); calcSwimPos(swim_speed); calcBank(HIO_PARAM(this).mSwimAngleSpeed / 2, 16, angle.y, angle.z); diff --git a/src/d/actor/d_a_npc_zrc.cpp b/src/d/actor/d_a_npc_zrc.cpp index 03fc74e28c..758006220e 100644 --- a/src/d/actor/d_a_npc_zrc.cpp +++ b/src/d/actor/d_a_npc_zrc.cpp @@ -213,7 +213,7 @@ daNpc_zrC_c::~daNpc_zrC_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -255,7 +255,7 @@ cPhs__Step daNpc_zrC_c::create() { return cPhs_ERROR_e; } - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); mCreatureSound.init(¤t.pos, &eyePos, 3, 1); mAcchCir.SetWall(daNpc_zrC_Param_c::m.mWallR, daNpc_zrC_Param_c::m.mWallH); @@ -300,17 +300,17 @@ int daNpc_zrC_c::CreateHeap() { model_flag = 0; } - mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, + mAnm_p = new mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, model_flag, 0x11020284); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 i = 0; i < model_data->getJointNum(); i++) { model_data->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -349,7 +349,7 @@ int daNpc_zrC_c::Execute() { /* 80B8E884-80B8E914 000D64 0090+00 1/1 0/0 0/0 .text Draw__11daNpc_zrC_cFv */ int daNpc_zrC_c::Draw() { - mpMorf->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); + mAnm_p->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); BOOL is_test = chkAction(&daNpc_zrC_c::test); return draw(is_test, true, daNpc_zrC_Param_c::m.mShadowDepth, NULL, false); } @@ -361,11 +361,11 @@ int daNpc_zrC_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int lookat_joints[3] = {1, 3, 4}; if (jnt_no == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -392,8 +392,8 @@ int daNpc_zrC_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jnt_no == 4 || jnt_no == 13) && (mAnmFlags & ANM_PLAY_BCK)) { J3DAnmTransform* bck_anm = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(bck_anm); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(bck_anm); } return 1; @@ -558,7 +558,7 @@ void daNpc_zrC_c::setAttnPos() { setMtx(); lookat(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); eyeOffset.x = 0.0f; @@ -582,7 +582,7 @@ void daNpc_zrC_c::setAttnPos() { extra_height = -20.0f; extra_radius = 15.0f; vec2.set(0.0f, 0.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(0)); mDoMtx_stack_c::multVec(&vec2, ¢er); attention_info.position.set(center.x, center.y + offset, center.z); } else { @@ -756,7 +756,7 @@ bool daNpc_zrC_c::setExpressionBtp(int i_idx) { return true; } - if (setBtpAnm(btp_anm, mpMorf->getModel()->getModelData(), 1.0f, attr)) { + if (setBtpAnm(btp_anm, mAnm_p->getModel()->getModelData(), 1.0f, attr)) { mAnmFlags |= ANM_PLAY_BTP | ANM_PAUSE_BTP; if (i_idx == 0) { mAnmFlags |= ANM_FLAG_800; @@ -845,7 +845,7 @@ void daNpc_zrC_c::setMotionAnm(int i_idx, f32 i_morf) { l_btkGetParamList[btk_idx].fileIdx); } - if (btk_anm != NULL && setBtkAnm(btk_anm, mpMorf->getModel()->getModelData(), 1.0f, btk_attr)) { + if (btk_anm != NULL && setBtkAnm(btk_anm, mAnm_p->getModel()->getModelData(), 1.0f, btk_attr)) { mAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK; } @@ -1072,7 +1072,7 @@ void daNpc_zrC_c::playMotionAnm2(daNpcF_c::daNpcF_anmPlayData*** i_data) { if (morf > 0.0f) { mExpressionMorf = 0.0f; - mpMorf->setMorf(morf); + mAnm_p->setMorf(morf); } } } @@ -1257,7 +1257,7 @@ void daNpc_zrC_c::setLookMode(int i_lookMode) { /* 80B91160-80B91418 003640 02B8+00 1/1 0/0 0/0 .text lookat__11daNpc_zrC_cFv */ void daNpc_zrC_c::lookat() { fopAc_ac_c* attn_actor = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL snap = false; f32 body_down_angle = daNpc_zrC_Param_c::m.mBodyDownAngle; f32 body_up_angle = daNpc_zrC_Param_c::m.mBodyUpAngle; diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp index c5734cb276..066df7b26c 100644 --- a/src/d/actor/d_a_npc_zrz.cpp +++ b/src/d/actor/d_a_npc_zrz.cpp @@ -191,7 +191,7 @@ daNpc_zrZ_c::~daNpc_zrZ_c() { } if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } } @@ -232,7 +232,7 @@ cPhs__Step daNpc_zrZ_c::create() { return cPhs_ERROR_e; } - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 800.0f, 300.0f); mCreatureSound.init(¤t.pos, &eyePos, 3, 1); mAcchCir.SetWall(daNpc_zrZ_Param_c::m.mWallR, daNpc_zrZ_Param_c::m.mWallH); @@ -274,21 +274,21 @@ int daNpc_zrZ_c::CreateHeap() { } } - mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, + mAnm_p = new mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, 0x80000, 0x11020284); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - if (!mInvisibleModel.create(mpMorf->getModel(), 1)) { + if (!mInvisibleModel.create(mAnm_p->getModel(), 1)) { return 0; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); for (u16 i = 0; i < model_data->getJointNum(); i++) { model_data->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -320,7 +320,7 @@ int daNpc_zrZ_c::Execute() { /* 80B94A48-80B94B34 000D68 00EC+00 1/1 0/0 0/0 .text Draw__11daNpc_zrZ_cFv */ int daNpc_zrZ_c::Draw() { - mpMorf->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); + mAnm_p->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm); if (mType == 1) { return draw(chkAction(&daNpc_zrZ_c::test), false, daNpc_zrZ_Param_c::m.mShadowDepth, NULL, false); } else { @@ -333,7 +333,7 @@ int daNpc_zrZ_c::Draw() { int daNpc_zrZ_c::draw(int i_isTest, int param_1, f32 i_shadowDepth, _GXColorS10* i_fogColor, int i_hideDamage) { f32 damage_ratio, frame; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); J3DModelData* modelData = model->getModelData(); field_0x9f3 = 1; @@ -417,11 +417,11 @@ int daNpc_zrZ_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { cXyz pos; if (jnt_no == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(1)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(3)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(3)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -470,8 +470,8 @@ int daNpc_zrZ_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jnt_no == 4 || jnt_no == 12) && (mAnmFlags & ANM_PLAY_BCK)) { J3DAnmTransform* bck_anm = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(bck_anm); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(bck_anm); } return 1; @@ -652,12 +652,12 @@ void daNpc_zrZ_c::setAttnPos() { } } - J3DModelData* model_data = mpMorf->getModel()->getModelData(); + J3DModelData* model_data = mAnm_p->getModel()->getModelData(); setMtx(); lookat(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(4)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(4)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&eyeOffset, &eyePos); eyeOffset.y = 0.0f; @@ -704,7 +704,7 @@ void daNpc_zrZ_c::setAttnPos() { /* 80B95BB8-80B95C6C 001ED8 00B4+00 1/0 0/0 0/0 .text setMtx__11daNpc_zrZ_cFv */ void daNpc_zrZ_c::setMtx() { - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); cXyz pos = current.pos; pos.y += mModulationOffset; mDoMtx_stack_c::transS(pos); @@ -715,9 +715,9 @@ void daNpc_zrZ_c::setMtx() { if (mAnmFlags & ANM_PLAY_BCK) { mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame()); - mpMorf->modelCalc(); + mAnm_p->modelCalc(); } else { - mpMorf->modelCalc(); + mAnm_p->modelCalc(); } } @@ -799,7 +799,7 @@ bool daNpc_zrZ_c::setExpressionBtp(int i_idx) { return true; } - if (setBtpAnm(btp_anm, mpMorf->getModel()->getModelData(), 1.0f, attr)) { + if (setBtpAnm(btp_anm, mAnm_p->getModel()->getModelData(), 1.0f, attr)) { mAnmFlags |= ANM_PLAY_BTP | ANM_PAUSE_BTP; if (i_idx == 0) { mAnmFlags |= ANM_FLAG_800; @@ -864,7 +864,7 @@ void daNpc_zrZ_c::setMotionAnm(int i_idx, f32 i_morf) { } } - if (btk_anm != NULL && setBtkAnm(btk_anm, mpMorf->getModel()->getModelData(), 1.0f, 2)) { + if (btk_anm != NULL && setBtkAnm(btk_anm, mAnm_p->getModel()->getModelData(), 1.0f, 2)) { mAnmFlags |= ANM_PLAY_BTK | ANM_PAUSE_BTK; } @@ -1218,7 +1218,7 @@ void daNpc_zrZ_c::setLookMode(int i_lookMode) { /* 80B96EA0-80B97128 0031C0 0288+00 1/1 0/0 0/0 .text lookat__11daNpc_zrZ_cFv */ void daNpc_zrZ_c::lookat() { fopAc_ac_c* attn_actor = NULL; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); BOOL snap = false; f32 body_down_angle = daNpc_zrZ_Param_c::m.mBodyDownAngle; f32 body_up_angle = daNpc_zrZ_Param_c::m.mBodyUpAngle; @@ -2473,7 +2473,7 @@ void daNpc_zrZ_c::himoCalc() { mLimbCalcPos = vec2 + vec1; mDoMtx_stack_c::push(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(29)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(29)); mDoMtx_stack_c::inverse(); mDoMtx_stack_c::multVec(&mLimbCalcPos, &mLimbCalcRelPos); mDoMtx_stack_c::pop(); diff --git a/src/d/actor/d_a_obj_tks.cpp b/src/d/actor/d_a_obj_tks.cpp index 3decd1543e..aa0bfeb90e 100644 --- a/src/d/actor/d_a_obj_tks.cpp +++ b/src/d/actor/d_a_obj_tks.cpp @@ -52,7 +52,7 @@ daObjTks_c::~daObjTks_c() { dComIfG_resDelete(&mPhase, l_arcName); if (heap != NULL) { - mpMorf->stopZelAnime(); + mAnm_p->stopZelAnime(); } if (parentActorID != fpcM_ERROR_PROCESS_ID_e) { @@ -112,8 +112,8 @@ int daObjTks_c::Create() { return cPhs_ERROR_e; } - J3DModelData* mdlData_p = mpMorf->getModel()->getModelData(); - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData(); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -80.0f, -30.0f, -80.0f, 80.0f, 10.0f, 80.0f); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -160,17 +160,17 @@ int daObjTks_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 0xE); JUT_ASSERT(314, NULL != mdlData_p); - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); - if (mpMorf != NULL && mpMorf->getModel() == NULL) { - mpMorf->stopZelAnime(); - mpMorf = NULL; + mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { + mAnm_p->stopZelAnime(); + mAnm_p = NULL; } - if (mpMorf == NULL) { + if (mAnm_p == NULL) { return 0; } - J3DModel* mdl_p = mpMorf->getModel(); + J3DModel* mdl_p = mAnm_p->getModel(); for (u16 i = 0; i < mdlData_p->getJointNum(); i++) { mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -221,7 +221,7 @@ int daObjTks_c::Draw() { return 1; } - mpMorf->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); + mAnm_p->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm); draw(FALSE, FALSE, daObjTks_Param_c::m.common.real_shadow_size, NULL, FALSE); return 1; } @@ -233,13 +233,13 @@ int daObjTks_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int spC[] = {15, 16, 17}; if (jnt_no == 0) { - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(15)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(15)); mDoMtx_stack_c::multVecZero(&mLookatPos[0]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(16)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(16)); mDoMtx_stack_c::multVecZero(&mLookatPos[1]); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(17)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(17)); mDoMtx_stack_c::multVecZero(&mLookatPos[2]); } @@ -258,8 +258,8 @@ int daObjTks_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { if ((jnt_no == 0x11 || jnt_no == 0x13) && (mAnmFlags & 0x100)) { J3DAnmTransform* bck_p = mBckAnm.getBckAnm(); - mBckAnm.changeBckOnly(mpMorf->getAnm()); - mpMorf->changeAnm(bck_p); + mBckAnm.changeBckOnly(mAnm_p->getAnm()); + mAnm_p->changeAnm(bck_p); } return 1; @@ -288,7 +288,7 @@ int daObjTks_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { /* 80D10100-80D10184 000F60 0084+00 1/0 0/0 0/0 .text setMtx__10daObjTks_cFv */ void daObjTks_c::setMtx() { - J3DModel* mdl_p = mpMorf->getModel(); + J3DModel* mdl_p = mAnm_p->getModel(); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); @@ -301,7 +301,7 @@ void daObjTks_c::setMtx() { mBckAnm.getBckAnm()->setFrame(mBckAnm.getFrame()); } - mpMorf->modelCalc(); + mAnm_p->modelCalc(); } /* 80D10184-80D102D0 000FE4 014C+00 1/0 0/0 0/0 .text setExpressionAnm__10daObjTks_cFib @@ -354,7 +354,7 @@ bool daObjTks_c::setExpressionBtp(int i_anm) { return 1; } - if (setBtpAnm(btp_p, mpMorf->getModel()->getModelData(), 1.0f, mode)) { + if (setBtpAnm(btp_p, mAnm_p->getModel()->getModelData(), 1.0f, mode)) { mAnmFlags |= (ANM_PLAY_BTP | ANM_PAUSE_BTP); if (i_anm == 0) { mAnmFlags |= ANM_FLAG_800; @@ -497,7 +497,7 @@ void daObjTks_c::playMotion() { /* 80D11CB4-80D11E94 002B14 01E0+00 1/1 0/0 0/0 .text lookat__10daObjTks_cFv */ void daObjTks_c::lookat() { daPy_py_c* player = NULL; - J3DModel* model_p = mpMorf->getModel(); + J3DModel* model_p = mAnm_p->getModel(); int var_r28 = 0; f32 body_angleX_min = daObjTks_Param_c::m.common.body_angleX_min; @@ -726,7 +726,7 @@ void daObjTks_c::setMotionAnm(int i_anm, f32 i_morf) { J3DAnmTextureSRTKey* btk_p = getTexSRTKeyAnmP(l_arcName, l_btkGetParamList[0].fileIdx); int temp_r24 = l_btkGetParamList[0].arcIdx; - if (btk_p != NULL && setBtkAnm(btk_p, mpMorf->getModel()->getModelData(), 1.0f, temp_r24)) { + if (btk_p != NULL && setBtkAnm(btk_p, mAnm_p->getModel()->getModelData(), 1.0f, temp_r24)) { mAnmFlags |= (ANM_PLAY_BTK | ANM_PAUSE_BTK); } } @@ -876,7 +876,7 @@ void daObjTks_c::setAttnPos() { cXyz sp14(10.0f, 10.0f, 0.0f); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(17)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(17)); mDoMtx_stack_c::multVecZero(&mHeadPos); mDoMtx_stack_c::multVec(&sp14, &eyePos); sp14.x = 0.0f;