diff options
| author | roeming <brother64youyou@gmail.com> | 2025-11-12 19:45:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-12 16:45:53 -0800 |
| commit | a3c76c8a7e892b36b30fa900ecacae7dc53a7cec (patch) | |
| tree | 8585b2639f4f1f54de90984c014780eb42bd2b77 /include | |
| parent | 63093fea4a96821e9432e3d05d2c780e628a48b4 (diff) | |
rename variable in accordance with assert (#2797)
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/actor/d_a_npc.h | 2 | ||||
| -rw-r--r-- | include/d/actor/d_a_npc_moir.h | 2 | ||||
| -rw-r--r-- | include/d/actor/d_a_npc_theB.h | 2 | ||||
| -rw-r--r-- | include/d/actor/d_a_npc_zra.h | 2 |
4 files changed, 4 insertions, 4 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]; |