diff options
| author | NhProGamer <neo.huyghe@gmail.com> | 2026-10-15 15:50:50 +0200 |
|---|---|---|
| committer | NhProGamer <neo.huyghe@gmail.com> | 2026-10-15 15:50:50 +0200 |
| commit | 1b74741230645048a15aaa34f6bbcc2834c832ce (patch) | |
| tree | bf24dc8b497c45cb25c3c0c8911bf7fa0f4f1d34 /include | |
| parent | 288e963e1a9276dd6d36918e1bf28c58cafd2b3b (diff) | |
Address review
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/a/obj/d_a_obj_move_elec.h | 10 | ||||
| -rw-r--r-- | include/d/col/c/c_m3d_g_unk.h | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/include/d/a/obj/d_a_obj_move_elec.h b/include/d/a/obj/d_a_obj_move_elec.h index 024d4b05..0123b401 100644 --- a/include/d/a/obj/d_a_obj_move_elec.h +++ b/include/d/a/obj/d_a_obj_move_elec.h @@ -6,13 +6,14 @@ #include "d/col/bg/d_bg_w.h" #include "d/col/cc/d_cc_d.h" #include "m/m3d/m_anmmdl.h" +#include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" #include "toBeSorted/actor_event.h" #include "toBeSorted/d_emitter.h" class dAcOMoveElec_c : public dAcObjBase_c { public: - dAcOMoveElec_c() : mEvent(*this, nullptr), mResFile(nullptr), mStateMgr(*this) {} + dAcOMoveElec_c() : mEvent(*this, nullptr), mStateMgr(*this) {} virtual ~dAcOMoveElec_c() {} virtual bool createHeap() override; @@ -25,6 +26,9 @@ public: STATE_FUNC_DECLARE(dAcOMoveElec_c, WaitOn); STATE_FUNC_DECLARE(dAcOMoveElec_c, Move); + STATE_MGR_DEFINE_UTIL_EXECUTESTATE(dAcOMoveElec_c); + STATE_MGR_DEFINE_UTIL_ISSTATE(dAcOMoveElec_c); + private: enum Phase_e { PHASE_Start, // On at its initial position, waits for mSceneflag + 1 @@ -37,7 +41,7 @@ private: void initPhase(); /* 0x330 */ ActorEventRelated mEvent; - /* 0x380 */ void *mResFile; + /* 0x380 */ nw4r::g3d::ResFile mResFile; /* 0x384 */ m3d::mdlAnmChr mMdl; /* 0x3EC */ dBgW mBgW; /* 0x5FC */ dBgW mBgWGround; @@ -45,8 +49,6 @@ private: /* 0xA14 */ dBgS_AcchCir mAcchCir; /* 0xA70 */ dBgS_ObjAcch mAcch; /* 0xE20 */ STATE_MGR_DECLARE(dAcOMoveElec_c); - STATE_MGR_DEFINE_UTIL_EXECUTESTATE(dAcOMoveElec_c); - STATE_MGR_DEFINE_UTIL_ISSTATE(dAcOMoveElec_c); /* 0xE5C */ dEmitter_c mEffect; /* 0xE90 */ f32 mMoveDist; /* 0xE94 */ s32 mPhase; diff --git a/include/d/col/c/c_m3d_g_unk.h b/include/d/col/c/c_m3d_g_unk.h index 52c0f248..ee4dd380 100644 --- a/include/d/col/c/c_m3d_g_unk.h +++ b/include/d/col/c/c_m3d_g_unk.h @@ -47,6 +47,10 @@ public: bool Cross(const mVec3_c &); void Clamp(const mVec3_c &, mVec3_c &); void fn_80338f30(f32, f32); + + void SetField_0xB4(u32 val) { + field_0xB4 = val; + } }; #endif |