diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h index ac7e09f6e..a49e4ab1f 100644 --- a/include/JSystem/J3DGraphBase/J3DPacket.h +++ b/include/JSystem/J3DGraphBase/J3DPacket.h @@ -98,7 +98,7 @@ public: J3DPacket() { mpNextPacket = NULL; mpFirstChild = NULL; - mpUserData = 0; + mUserData = 0; } void addChildPacket(J3DPacket*); @@ -111,8 +111,8 @@ public: mpFirstChild = NULL; } - void setUserArea(uintptr_t area) { mpUserData = area; } - uintptr_t getUserArea() const { return mpUserData; } + void setUserArea(uintptr_t area) { mUserData = area; } + uintptr_t getUserArea() const { return mUserData; } virtual bool isSame(J3DMatPacket*) const; virtual int entry(J3DDrawBuffer*); @@ -122,7 +122,7 @@ public: public: /* 0x04 */ J3DPacket* mpNextPacket; /* 0x08 */ J3DPacket* mpFirstChild; - /* 0x0C */ uintptr_t mpUserData; + /* 0x0C */ uintptr_t mUserData; }; // Size: 0x10 class J3DDrawPacket : public J3DPacket { diff --git a/include/SSystem/SComponent/c_tag.h b/include/SSystem/SComponent/c_tag.h index 1bd2ca05b..387efdaa0 100644 --- a/include/SSystem/SComponent/c_tag.h +++ b/include/SSystem/SComponent/c_tag.h @@ -8,7 +8,7 @@ typedef struct node_list_class node_list_class; typedef struct node_lists_tree_class node_lists_tree_class; typedef struct create_tag_class { - /* 0x00 */ node_class mpNode; + /* 0x00 */ node_class mNode; /* 0x0C */ void* mpTagData; /* 0x10 */ s8 mbIsUse; } create_tag_class; // Size: 0x14 diff --git a/include/d/actor/d_a_fm.h b/include/d/actor/d_a_fm.h index 20a4873a0..9ec9e5f4e 100644 --- a/include/d/actor/d_a_fm.h +++ b/include/d/actor/d_a_fm.h @@ -128,7 +128,7 @@ public: public: /* 0x2AC */ int mMode; - /* 0x2B0 */ dPa_followEcallBack mpFollowEcallBack; + /* 0x2B0 */ dPa_followEcallBack mPtclFollowCb; /* 0x2C4 */ s8 mBckIdx; /* 0x2C5 */ s8 mAnmPrmIdx; /* 0x2C6 */ s8 mOldAnmPrmIdx; diff --git a/include/d/actor/d_a_majuu_flag.h b/include/d/actor/d_a_majuu_flag.h index c91b74633..51fd247b7 100644 --- a/include/d/actor/d_a_majuu_flag.h +++ b/include/d/actor/d_a_majuu_flag.h @@ -22,9 +22,9 @@ public: Mtx* getMtx() { return &mPosMtx; } GXTexObj* getToonTexObj() { return &mToonTex; } GXTexObj* getImageTexObj() { return &mFlagTex; } - cXyz* getPos() { return mpPosArr[mCurArr]; } - cXyz* getNrm() { return mpNrmArr[mCurArr]; } - cXyz* getBackNrm() { return mpNrmArrBack[mCurArr]; } + cXyz* getPos() { return mPos[mCurArr]; } + cXyz* getNrm() { return mNrm[mCurArr]; } + cXyz* getBackNrm() { return mBackNrm[mCurArr]; } cXyz* getOffsetVec() { return mSpeed; } void setTevStr(dKy_tevstr_c* tevStr) { mpTevStr = tevStr; } @@ -40,11 +40,11 @@ public: /* 0x044 */ GXTexObj mToonTex; /* 0x064 */ GXTexObj mFlagTex; /* 0x084 */ u8 m084[0x0A0 - 0x084]; - /* 0x0A0 */ cXyz mpPosArr[2][21]; + /* 0x0A0 */ cXyz mPos[2][21]; /* 0x298 */ u8 m298[0x2A0 - 0x298]; - /* 0x2A0 */ cXyz mpNrmArr[2][21]; + /* 0x2A0 */ cXyz mNrm[2][21]; /* 0x498 */ u8 m498[0x4A0 - 0x498]; - /* 0x4A0 */ cXyz mpNrmArrBack[2][21]; + /* 0x4A0 */ cXyz mBackNrm[2][21]; /* 0x698 */ cXyz mSpeed[21]; /* 0x794 */ s16 mRotateY; /* 0x796 */ s16 m796; diff --git a/include/d/actor/d_a_mgameboard.h b/include/d/actor/d_a_mgameboard.h index 30928d565..5ae513dd1 100644 --- a/include/d/actor/d_a_mgameboard.h +++ b/include/d/actor/d_a_mgameboard.h @@ -60,7 +60,7 @@ public: /* 0x5C4 */ dDlst_2DNumber_c* mpNumber1; /* 0x5C8 */ dDlst_2DMinigame_c* mpMinigameDList; /* 0x5CC */ dDlst_2DObject_c* mpSquidIcon[3]; - /* 0x5D8 */ u8 mpBombIcons; + /* 0x5D8 */ u8 mBombIcons; /* 0x5D9 */ u8 field_0x5D9[0x638 - 0x5D9]; /* 0x638 */ int mState; /* 0x63C */ u8 mbDraw; diff --git a/include/d/actor/d_a_npc_hr.h b/include/d/actor/d_a_npc_hr.h index f66688f38..76bf5108b 100644 --- a/include/d/actor/d_a_npc_hr.h +++ b/include/d/actor/d_a_npc_hr.h @@ -25,7 +25,7 @@ public: void move(); public: - /* 0x00 */ dPa_followEcallBack mpFollowECallBack; + /* 0x00 */ dPa_followEcallBack mPtclFollowCb; /* 0x14 */ cXyz mPos; /* 0x20 */ cXyz mSpeed; /* 0x2C */ cXyz* mpSquallPos; diff --git a/include/d/actor/d_a_obj_gaship2.h b/include/d/actor/d_a_obj_gaship2.h index 24627a658..344eb0b61 100644 --- a/include/d/actor/d_a_obj_gaship2.h +++ b/include/d/actor/d_a_obj_gaship2.h @@ -19,7 +19,7 @@ public: static const char M_arcname[8]; - /* 0x290 */ request_of_phase_process_class mphs; + /* 0x290 */ request_of_phase_process_class mPhase; /* 0x29C */ J3DModel* mpModel; /* 0x2A0 */ dBgW* mpBgW; /* 0x2A4 */ Mtx mMtx; diff --git a/include/d/actor/d_a_obj_gnndemotakie.h b/include/d/actor/d_a_obj_gnndemotakie.h index 5e9cf797f..04488a62e 100644 --- a/include/d/actor/d_a_obj_gnndemotakie.h +++ b/include/d/actor/d_a_obj_gnndemotakie.h @@ -19,7 +19,7 @@ public: public: /* 0x290 */ J3DModel* mpModel; /* 0x294 */ request_of_phase_process_class mPhase; - /* 0x29C */ mDoExt_btkAnm mpBtkAnm; + /* 0x29C */ mDoExt_btkAnm mBtkAnm; }; // Size: 0x2B0 #endif /* D_A_OBJ_GNNDEMOTAKIE_H */ diff --git a/include/d/actor/d_a_obj_gnndemotakis.h b/include/d/actor/d_a_obj_gnndemotakis.h index 8862e5475..44cb39713 100644 --- a/include/d/actor/d_a_obj_gnndemotakis.h +++ b/include/d/actor/d_a_obj_gnndemotakis.h @@ -19,7 +19,7 @@ public: public: /* 0x290 */ J3DModel* mpModel; /* 0x294 */ request_of_phase_process_class mPhs; - /* 0x29C */ mDoExt_btkAnm mpBtkAnm; + /* 0x29C */ mDoExt_btkAnm mBtkAnm; /* 0x2B0 */ BOOL m2B0; }; // Size: 0x2B4 diff --git a/include/d/d_cloth_packet.h b/include/d/d_cloth_packet.h index 6cbd74964..ee33e7e04 100644 --- a/include/d/d_cloth_packet.h +++ b/include/d/d_cloth_packet.h @@ -12,7 +12,7 @@ class dKy_tevstr_c; class dCloth_packet_c : public J3DPacket { public: typedef dCloth_packet_c* (*CreateFunc)(ResTIMG*, ResTIMG*, dKy_tevstr_c*, cXyz**); - typedef int (*FactorCheck)(dCloth_packet_c*, int, int); + typedef int (*FactorCheckCallback)(dCloth_packet_c*, int, int); dCloth_packet_c(ResTIMG* i_toonimage, int flyGridSize, int hoistGridSize, float flyLength, float hoistLength, dKy_tevstr_c* tevstr, cXyz** posArr); ~dCloth_packet_c(); @@ -31,7 +31,7 @@ public: void setScale(cXyz scale) { mScale = scale; } void setMtx(Mtx mtx); - void setFactorCheckCB(FactorCheck cb) { mpFactorCheckCB = cb; } + void setFactorCheckCB(FactorCheckCallback cb) { mpFactorCheckCB = cb; } void setWindPower(f32 wind, f32 windWave) { mWindSpeed = wind; mWindSpeedWave = windWave; @@ -75,7 +75,7 @@ protected: /* 0x18 */ f32 mFlyLength; /* 0x1C */ f32 mHoistLength; /* 0x20 */ dKy_tevstr_c* mpTevstr; - /* 0x24 */ FactorCheck mpFactorCheckCB; + /* 0x24 */ FactorCheckCallback mpFactorCheckCB; /* 0x28 */ cXyz* mpPosArr[2]; /* 0x30 */ cXyz* mpNrmArr[2]; /* 0x38 */ cXyz* mpNrmArrBack[2]; diff --git a/src/SSystem/SComponent/c_tag.cpp b/src/SSystem/SComponent/c_tag.cpp index 9f63014d8..c2a4c7fe9 100644 --- a/src/SSystem/SComponent/c_tag.cpp +++ b/src/SSystem/SComponent/c_tag.cpp @@ -17,7 +17,7 @@ BOOL cTg_IsUse(create_tag_class* pTag) { BOOL cTg_SingleCutFromTree(create_tag_class* pTag) { if (pTag->mbIsUse == true) { pTag->mbIsUse = false; - cTr_SingleCut(&pTag->mpNode); + cTr_SingleCut(&pTag->mNode); return TRUE; } else { return FALSE; @@ -27,7 +27,7 @@ BOOL cTg_SingleCutFromTree(create_tag_class* pTag) { /* 8024545C-802454AC .text cTg_AdditionToTree__FP21node_lists_tree_classiP16create_tag_class */ int cTg_AdditionToTree(node_lists_tree_class* pTree, int listIdx, create_tag_class* pTag) { if (!pTag->mbIsUse) { - int ret = cTr_Addition(pTree, listIdx, &pTag->mpNode); + int ret = cTr_Addition(pTree, listIdx, &pTag->mNode); if (ret) { pTag->mbIsUse = true; return ret; @@ -40,7 +40,7 @@ int cTg_AdditionToTree(node_lists_tree_class* pTree, int listIdx, create_tag_cla /* 802454AC-802454FC .text cTg_InsertToTree__FP21node_lists_tree_classiP16create_tag_classi */ int cTg_InsertToTree(node_lists_tree_class* pTree, int listIdx, create_tag_class* pTag, int idx) { if (!pTag->mbIsUse) { - int ret = cTr_Insert(pTree, listIdx, &pTag->mpNode, idx); + int ret = cTr_Insert(pTree, listIdx, &pTag->mNode, idx); if (ret) { pTag->mbIsUse = true; return ret; @@ -58,14 +58,14 @@ node_class* cTg_GetFirst(node_list_class* pList) { } else { pTag = NULL; } - return &pTag->mpNode; + return &pTag->mNode; } /* 80245534-80245574 .text cTg_SingleCut__FP16create_tag_class */ int cTg_SingleCut(create_tag_class* pTag) { if (pTag->mbIsUse == 1) { pTag->mbIsUse = false; - cLs_SingleCut(&pTag->mpNode); + cLs_SingleCut(&pTag->mNode); return 1; } @@ -75,7 +75,7 @@ int cTg_SingleCut(create_tag_class* pTag) { /* 80245574-802455C4 .text cTg_Addition__FP15node_list_classP16create_tag_class */ int cTg_Addition(node_list_class* pList, create_tag_class* pTag) { if (!pTag->mbIsUse) { - int ret = cLs_Addition(pList, &pTag->mpNode); + int ret = cLs_Addition(pList, &pTag->mNode); if (ret) { pTag->mbIsUse = true; return ret; @@ -87,7 +87,7 @@ int cTg_Addition(node_list_class* pList, create_tag_class* pTag) { /* 802455C4-8024560C .text cTg_Create__FP16create_tag_classPv */ void cTg_Create(create_tag_class* pTag, void* pData) { - cNd_Create(&pTag->mpNode, NULL); + cNd_Create(&pTag->mNode, NULL); pTag->mpTagData = pData; pTag->mbIsUse = false; } diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp index 862795290..05fc375e7 100644 --- a/src/d/actor/d_a_fm.cpp +++ b/src/d/actor/d_a_fm.cpp @@ -2952,10 +2952,10 @@ int daFm_c::setRnd(int param_1, int param_2) { /* 00008044-00008114 .text setHoleEffect__6daFm_cFv */ void daFm_c::setHoleEffect() { - if(mpFollowEcallBack.getEmitter() == NULL) { - dComIfGp_particle_setShipTail(dPa_name::ID_AK_SN_PITFALL00, ¤t.pos, NULL, NULL, 0xFF, &mpFollowEcallBack, fopAcM_GetRoomNo(this)); + if(mPtclFollowCb.getEmitter() == NULL) { + dComIfGp_particle_setShipTail(dPa_name::ID_AK_SN_PITFALL00, ¤t.pos, NULL, NULL, 0xFF, &mPtclFollowCb, fopAcM_GetRoomNo(this)); } - JPABaseEmitter* emitter = mpFollowEcallBack.getEmitter(); + JPABaseEmitter* emitter = mPtclFollowCb.getEmitter(); if(emitter != NULL) { Vec scale = {field_0x3E0, field_0x3E0, field_0x3E0}; @@ -2972,7 +2972,7 @@ void daFm_c::holeExecute() { setHoleEffect(); } else { fopAcM_ClearStatusMap(this); - mpFollowEcallBack.end(); + mPtclFollowCb.end(); } } @@ -3434,7 +3434,7 @@ cPhs_State daFm_c::_create() { bool daFm_c::_delete() { cancelGrab(); dComIfG_resDelete(&mPhs, m_arc_name); - mpFollowEcallBack.remove(); + mPtclFollowCb.remove(); #if VERSION > VERSION_DEMO if(heap != NULL) { mpMorf->stopZelAnime(); diff --git a/src/d/actor/d_a_majuu_flag.cpp b/src/d/actor/d_a_majuu_flag.cpp index 39415aa2e..f14cc8399 100644 --- a/src/d/actor/d_a_majuu_flag.cpp +++ b/src/d/actor/d_a_majuu_flag.cpp @@ -115,8 +115,8 @@ void daMajuu_Flag_packet_c::setNrmMtx() { /* 000003E4-0000046C .text setBackNrm__21daMajuu_Flag_packet_cFv */ void daMajuu_Flag_packet_c::setBackNrm() { - cXyz* nrm = mpNrmArr[mCurArr]; - cXyz* nrmBack = mpNrmArrBack[mCurArr]; + cXyz* nrm = mNrm[mCurArr]; + cXyz* nrmBack = mBackNrm[mCurArr]; for (s32 i = 0; i < 21; i++, nrm++, nrmBack++) { *nrmBack = cXyz::Zero; @@ -477,7 +477,7 @@ void daMajuu_Flag_packet_c::draw() { GXSetCullMode(GX_CULL_BACK); GXCallDisplayList(l_majuu_flagDL, 0x80); GXSetCullMode(GX_CULL_FRONT); - GXSetArray(GX_VA_NRM, mpNrmArrBack[mCurArr], sizeof(cXyz) * 1); + GXSetArray(GX_VA_NRM, mBackNrm[mCurArr], sizeof(cXyz) * 1); GXCallDisplayList(l_majuu_flagDL, 0x80); #if VERSION > VERSION_JPN J3DShape::resetVcdVatCache(); @@ -759,11 +759,11 @@ void majuu_flag_move(daMajuu_Flag_c* i_this) { i_this->mPacket.setBackNrm(); #if VERSION <= VERSION_JPN - DCStoreRangeNoSync(i_this->mPacket.getPos(), sizeof(i_this->mPacket.mpPosArr[0]) * 21); + DCStoreRangeNoSync(i_this->mPacket.getPos(), sizeof(i_this->mPacket.mPos[0]) * 21); #else - DCStoreRangeNoSync(i_this->mPacket.getPos(), sizeof(i_this->mPacket.mpPosArr[0])); - DCStoreRangeNoSync(i_this->mPacket.getNrm(), sizeof(i_this->mPacket.mpNrmArr[0])); - DCStoreRangeNoSync(i_this->mPacket.getBackNrm(), sizeof(i_this->mPacket.mpNrmArrBack[0])); + DCStoreRangeNoSync(i_this->mPacket.getPos(), sizeof(i_this->mPacket.mPos[0])); + DCStoreRangeNoSync(i_this->mPacket.getNrm(), sizeof(i_this->mPacket.mNrm[0])); + DCStoreRangeNoSync(i_this->mPacket.getBackNrm(), sizeof(i_this->mPacket.mBackNrm[0])); #endif } diff --git a/src/d/actor/d_a_npc_hr.cpp b/src/d/actor/d_a_npc_hr.cpp index 22eb155c8..0872d4c07 100644 --- a/src/d/actor/d_a_npc_hr.cpp +++ b/src/d/actor/d_a_npc_hr.cpp @@ -28,7 +28,7 @@ void daNpc_Wind_Eff::init() { /* 000000A0-000000EC .text remove__14daNpc_Wind_EffFv */ void daNpc_Wind_Eff::remove() { if (mWindEffState != WIND_EFF_INACTIVE) { - mpFollowECallBack.end(); + mPtclFollowCb.end(); init(); } } @@ -40,7 +40,7 @@ BOOL daNpc_Wind_Eff::create(cXyz* squallPos) { mAlphaFactor = 1.0f; mpSquallPos = squallPos; - JPABaseEmitter* pEmitter = dComIfGp_particle_set(dPa_name::ID_AK_JN_WINDLINE00, &mPos, NULL, NULL, 0xFF, &mpFollowECallBack); + JPABaseEmitter* pEmitter = dComIfGp_particle_set(dPa_name::ID_AK_JN_WINDLINE00, &mPos, NULL, NULL, 0xFF, &mPtclFollowCb); if (pEmitter == NULL) { return FALSE; @@ -67,7 +67,7 @@ void daNpc_Wind_Eff::proc() { JPABaseEmitter* pEmitter; switch(mWindEffState) { case WIND_EFF_FADE_IN: - pEmitter = mpFollowECallBack.getEmitter(); + pEmitter = mPtclFollowCb.getEmitter(); if (mAlphaFactor < 0.9f) { mAlphaFactor += 0.1f; @@ -91,7 +91,7 @@ void daNpc_Wind_Eff::proc() { move(); break; case WIND_EFF_FADE_OUT: - pEmitter = mpFollowECallBack.getEmitter(); + pEmitter = mPtclFollowCb.getEmitter(); if (mAlphaFactor > 0.1f) { mAlphaFactor -= 0.1f; diff --git a/src/d/actor/d_a_obj_gaship2.cpp b/src/d/actor/d_a_obj_gaship2.cpp index 30b30ed79..c5467ac1d 100644 --- a/src/d/actor/d_a_obj_gaship2.cpp +++ b/src/d/actor/d_a_obj_gaship2.cpp @@ -52,7 +52,7 @@ bool daObjGaship2::Act_c::create_heap() { /* 00000220-000002F8 .text _create__Q212daObjGaship25Act_cFv */ cPhs_State daObjGaship2::Act_c::_create() { fopAcM_ct(this, Act_c); - cPhs_State phase_state = dComIfG_resLoad(&mphs, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhase, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x0)) { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); @@ -76,7 +76,7 @@ bool daObjGaship2::Act_c::_delete() { } } - dComIfG_resDelete(&mphs, M_arcname); + dComIfG_resDelete(&mPhase, M_arcname); return true; } diff --git a/src/d/actor/d_a_obj_gnndemotakie.cpp b/src/d/actor/d_a_obj_gnndemotakie.cpp index fd800fc1b..e2e907829 100644 --- a/src/d/actor/d_a_obj_gnndemotakie.cpp +++ b/src/d/actor/d_a_obj_gnndemotakie.cpp @@ -27,7 +27,7 @@ BOOL daObjGnntakie_c::create_heap() { if (mpModel != NULL) { btk_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_GNNDEMOTAKIE_BTK_GNN_DEMO_TAKI_E_e)); JUT_ASSERT(97, btk_data != NULL); - if (btk_data != NULL && mpBtkAnm.init(mdl_data, btk_data, true, J3DFrameCtrl::EMode_LOOP)) { + if (btk_data != NULL && mBtkAnm.init(mdl_data, btk_data, true, J3DFrameCtrl::EMode_LOOP)) { ret = TRUE; } } @@ -44,8 +44,8 @@ cPhs_State daObjGnntakie_c::_create() { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x0)) { cullMtx = mpModel->getBaseTRMtx(); init_mtx(); - mpBtkAnm.getFrameCtrl()->setFrame(mpBtkAnm.getStartFrame()); - mpBtkAnm.setPlaySpeed(1.0); + mBtkAnm.getFrameCtrl()->setFrame(mBtkAnm.getStartFrame()); + mBtkAnm.setPlaySpeed(1.0); state = cPhs_COMPLEATE_e; } } @@ -65,7 +65,7 @@ void daObjGnntakie_c::init_mtx() { /* 000003F4-0000041C .text _execute__15daObjGnntakie_cFv */ bool daObjGnntakie_c::_execute() { - mpBtkAnm.play(); + mBtkAnm.play(); return true; } @@ -73,7 +73,7 @@ bool daObjGnntakie_c::_execute() { bool daObjGnntakie_c::_draw() { g_env_light.settingTevStruct(TEV_TYPE_BG3, ¤t.pos, &tevStr); g_env_light.setLightTevColorType(mpModel, &tevStr); - mpBtkAnm.entry(mpModel->getModelData()); + mBtkAnm.entry(mpModel->getModelData()); mDoExt_modelUpdateDL(mpModel); return true; } diff --git a/src/d/actor/d_a_obj_gnndemotakis.cpp b/src/d/actor/d_a_obj_gnndemotakis.cpp index ce0cb7f5d..eb887790e 100644 --- a/src/d/actor/d_a_obj_gnndemotakis.cpp +++ b/src/d/actor/d_a_obj_gnndemotakis.cpp @@ -27,7 +27,7 @@ BOOL daObjGnntakis_c::create_heap() { if (mpModel != NULL) { btk_data = static_cast(dComIfG_getObjectRes(M_arcname, dRes_INDEX_GNNDEMOTAKIS_BTK_GNN_DEMO_TAKI_S_e)); JUT_ASSERT(162, btk_data != NULL); - if (btk_data != NULL && mpBtkAnm.init(mdl_data, btk_data, TRUE, 0, 1.0f, 0, -1, FALSE, 0)) { + if (btk_data != NULL && mBtkAnm.init(mdl_data, btk_data, TRUE, 0, 1.0f, 0, -1, FALSE, 0)) { ret = TRUE; } } @@ -46,8 +46,8 @@ cPhs_State daObjGnntakis_c::_create() { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0)) { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); init_mtx(); - mpBtkAnm.getFrameCtrl()->setFrame(mpBtkAnm.getStartFrame()); - mpBtkAnm.setPlaySpeed(0.0f); + mBtkAnm.getFrameCtrl()->setFrame(mBtkAnm.getStartFrame()); + mBtkAnm.setPlaySpeed(0.0f); state = cPhs_COMPLEATE_e; m2B0 = FALSE; } @@ -74,15 +74,15 @@ bool daObjGnntakis_c::_execute() { dComIfGp_evmng_startCheck("g2before") && dComIfGp_demo_get()) { if (m2B0 == 0 && dComIfGp_demo_get()->getFrameNoMsg() >= 0x11d9) { - mpBtkAnm.setFrame(mpBtkAnm.getStartFrame()); - mpBtkAnm.setPlaySpeed(1.0f); + mBtkAnm.setFrame(mBtkAnm.getStartFrame()); + mBtkAnm.setPlaySpeed(1.0f); m2B0 = TRUE; } else if (dComIfGp_demo_get()->getFrameNoMsg() >= 0x126f) { fopAcM_delete(this); } } - mpBtkAnm.play(); + mBtkAnm.play(); return TRUE; } @@ -90,7 +90,7 @@ bool daObjGnntakis_c::_execute() { bool daObjGnntakis_c::_draw() { g_env_light.settingTevStruct(TEV_TYPE_BG3, ¤t.pos, &tevStr); g_env_light.setLightTevColorType(mpModel, &tevStr); - mpBtkAnm.entry(mpModel->getModelData()); + mBtkAnm.entry(mpModel->getModelData()); mDoExt_modelUpdateDL(mpModel); return TRUE; } diff --git a/src/f_op/f_op_draw_iter.cpp b/src/f_op/f_op_draw_iter.cpp index dabda0296..8401f9642 100644 --- a/src/f_op/f_op_draw_iter.cpp +++ b/src/f_op/f_op_draw_iter.cpp @@ -37,7 +37,7 @@ create_tag_class* fopDwIt_Begin() { /* 8003C6C0-8003C6EC .text fopDwIt_Next__FP16create_tag_class */ create_tag_class* fopDwIt_Next(create_tag_class *i_createTag) { - create_tag_class* createTagClass = (create_tag_class*)i_createTag->mpNode.mpNextNode; + create_tag_class* createTagClass = (create_tag_class*)i_createTag->mNode.mpNextNode; if (!createTagClass) { createTagClass = fopDwIt_GetTag(); }