From 6f2587f2eebbf623d2d2c2465fcabaa0fa84bd16 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Mon, 8 Jan 2024 17:25:17 -0500 Subject: misc actor cleanup --- include/d/actor/d_a_kaji.h | 2 +- include/d/actor/d_a_rd.h | 6 +++--- include/d/actor/d_a_tag_msg.h | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'include/d') diff --git a/include/d/actor/d_a_kaji.h b/include/d/actor/d_a_kaji.h index e7db446f..7d84a3b0 100644 --- a/include/d/actor/d_a_kaji.h +++ b/include/d/actor/d_a_kaji.h @@ -12,7 +12,7 @@ class daKaji_c : public fopAc_ac_c { public: static const char M_arcname[]; - inline void set_mtx() { + void set_mtx() { mpMorf->getModel()->setBaseScale(mScale); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(shape_angle); diff --git a/include/d/actor/d_a_rd.h b/include/d/actor/d_a_rd.h index c6c807cd..4118dfcb 100644 --- a/include/d/actor/d_a_rd.h +++ b/include/d/actor/d_a_rd.h @@ -111,10 +111,10 @@ public: daRd_c() {} bool isAnm(s8 idx) { return mAnmPrmIdx == idx; } + void onIkari() { mbIkari = true; } + void offIkari() { mbIkari = false; } bool isIkari() { return mbIkari; } void modeProcInit(int newMode) { modeProc(PROC_INIT, newMode); } - void offIkari() { mbIkari = false; } - void onIkari() { mbIkari = true; } fopAc_ac_c* _searchNearDeadRd(fopAc_ac_c*); BOOL _nodeControl(J3DNode*, J3DModel*); @@ -153,7 +153,7 @@ public: void modeSwWait(); void modeKanokeInit(); void modeKanoke(); - void modeProc(daRd_c::Proc_e, int); + void modeProc(Proc_e, int); void setBrkAnm(s8); void setBtkAnm(s8); void setAnm(s8, bool); diff --git a/include/d/actor/d_a_tag_msg.h b/include/d/actor/d_a_tag_msg.h index 9bc295ce..efeb5d51 100644 --- a/include/d/actor/d_a_tag_msg.h +++ b/include/d/actor/d_a_tag_msg.h @@ -25,9 +25,6 @@ public: public: /* 0x290 */ u8 mAction; - /* 0x291 */ u8 field_0x291; - /* 0x292 */ u8 field_0x292; - /* 0x293 */ u8 field_0x293; }; #endif /* D_A_TAG_MSG_H */ -- cgit v1.2.3