diff options
| author | Łukasz Starzyk <72223520+Aszman@users.noreply.github.com> | 2025-03-19 01:18:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-18 17:18:22 -0700 |
| commit | 57fe6dcdea087f85a38d2ed56cd9261d102699d4 (patch) | |
| tree | 76169e3eea9b771e7da358ac9346e2695e4647fa /include | |
| parent | d3e9175bfb5ca4fce4633e473d8d8a3556c3d3ef (diff) | |
d_a_obj_burnbox matching (#2331)
* initial work
* d_a_obj_burnbox, matching
* renamed varia bles and additional cleanup
* assigned correct comments to models' name
* post review changes
* if statement separation in Execute method
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/actor/d_a_obj_burnbox.h | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/include/d/actor/d_a_obj_burnbox.h b/include/d/actor/d_a_obj_burnbox.h index a73de48b3c..d4ee6b28f7 100644 --- a/include/d/actor/d_a_obj_burnbox.h +++ b/include/d/actor/d_a_obj_burnbox.h @@ -1,6 +1,8 @@ #ifndef D_A_OBJ_BURNBOX_H #define D_A_OBJ_BURNBOX_H +#include "d/d_bg_s_movebg_actor.h" +#include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" /** @@ -11,26 +13,33 @@ * @details * */ -class daObjBurnBox_c : public fopAc_ac_c { +class daObjBurnBox_c : public dBgS_MoveBgActor { public: /* 8046E698 */ void initBaseMtx(); /* 8046E6D4 */ void setBaseMtx(); - /* 8046E738 */ void Create(); - /* 8046E8BC */ void CreateHeap(); - /* 8046E93C */ void create1st(); - /* 8046E9EC */ void Execute(f32 (**)[3][4]); - /* 8046EABC */ void Draw(); - /* 8046EC10 */ void Delete(); + /* 8046E738 */ int Create(); + /* 8046E8BC */ int CreateHeap(); + /* 8046E93C */ cPhs__Step create1st(); + /* 8046E9EC */ int Execute(Mtx**); + /* 8046EABC */ int Draw(); + /* 8046EC10 */ int Delete(); - static void make_prm_burnBox(u32* param_0, u8 param_1) { - *param_0 = param_1; - } + static void make_prm_burnBox(u32* param_0, u8 param_1) { *param_0 = param_1; } + + u8 getType() { return fopAcM_GetParamBit(this, 0, 8); } private: - /* 0x568 */ u8 field_0x568[0x740 - 0x568]; + /* 0x5A0 */ request_of_phase_process_class mPhaseReq; + /* 0x5A8 */ J3DModel* mpBoxModel; + /* 0x5AC */ dCcD_Stts mStts; + /* 0x5E8 */ dCcD_Cyl mCyl; + /* 0x724 */ u32 field_0x724; + /* 0x728 */ s16 field_0x728; + /* 0x72a */ u8 field_0x72a; + /* 0x72b */ u8 field_0x72b; + /* 0x72c */ JPABaseEmitter* mpEmitters[5]; }; STATIC_ASSERT(sizeof(daObjBurnBox_c) == 0x740); - #endif /* D_A_OBJ_BURNBOX_H */ |