diff options
| author | Lachlan Watson <lachlanjwatson@gmail.com> | 2025-05-17 00:22:14 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-16 17:22:14 +0300 |
| commit | df8d6655a39ae9972ad8d48f4e172ebfae155a00 (patch) | |
| tree | 100448bc16bf63c8d69d393d142359d63ac1b48f /include | |
| parent | d86fc591f4c42d16fdb7e0cd307296aa3c3661a8 (diff) | |
d_a_obj_nameplate matching (#2445)
* d_a_obj_nameplate equivalent
* Address review comments d_a_obj_nameplate matching
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/actor/d_a_obj_nameplate.h | 56 |
1 files changed, 46 insertions, 10 deletions
diff --git a/include/d/actor/d_a_obj_nameplate.h b/include/d/actor/d_a_obj_nameplate.h index 7b988e0dd4..fc184a3eb6 100644 --- a/include/d/actor/d_a_obj_nameplate.h +++ b/include/d/actor/d_a_obj_nameplate.h @@ -1,8 +1,9 @@ #ifndef D_A_OBJ_NAMEPLATE_H #define D_A_OBJ_NAMEPLATE_H -#include "f_op/f_op_actor_mng.h" #include "d/d_cc_d.h" +#include "d/d_com_inf_game.h" +#include "d/d_msg_flow.h" /** * @ingroup actors-objects @@ -21,21 +22,56 @@ public: /* 805942B8 */ void setCcSphere(); /* 8059434C */ void calcAngle(); /* 805945CC */ void calcSpring(); - /* 80594754 */ void checkHitAngle(); + /* 80594754 */ int checkHitAngle(); /* 805947F8 */ void messageProc(); - static u8 const M_attr[32]; + struct M_attrs { + /* 0x00 */ f32 radius1; + /* 0x04 */ f32 field_0x04; + /* 0x08 */ f32 field_0x08; + /* 0x0C */ f32 field_0x0C; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ s16 field_0x18; + /* 0x1A */ s16 field_0x1A; + /* 0x1C */ s16 field_0x1C; + // unknown types + /* 0x1E */ u8 field_0x1E; + /* 0x1F */ u8 field_0x1F; + }; -private: - /* 0x568 */ u8 field_0x568[0x780 - 0x568]; -}; + static M_attrs const M_attr; + static M_attrs const& attr() { return M_attr; } -STATIC_ASSERT(sizeof(daObjNameplate_c) == 0x780); + static char* l_arcName; -struct daObj { -public: - /* 80037900 */ void HitSeStart(cXyz const*, int, dCcD_GObjInf const*, u32); + ~daObjNameplate_c() { dComIfG_resDelete(&this->mPhase, l_arcName); } + + inline int create(); + inline int draw(); + inline int createHeap(); + +private: + /* 0x568 */ J3DModel* model; + /* 0x56C */ request_of_phase_process_class mPhase; + /* 0x574 */ Mtx mMtx; + /* 0x5A4 */ dCcD_Stts mCcDStts; + /* 0x5E0 */ dCcD_Sph mCcDSph; + /* 0x718 */ f32 field_0x718; + /* 0x71C */ f32 field_0x71C; + /* 0x720 */ s16 field_0x720; + /* 0x722 */ s16 field_0x722; + /* 0x724 */ s16 field_0x724; + /* 0x726 */ u16 field_0x726; + /* 0x728 */ dMsgFlow_c mMsgFlow; + /* 0x774 */ s16 mShowMessage; + /* 0x776 */ s16 mMessageFlowId; + /* 0x778 */ s16 field_0x778; + /* 0x77A */ s16 field_0x77A; + /* 0x77C */ s16 field_0x77C; + /* 0x77E */ s16 field_0x77E; }; +STATIC_ASSERT(sizeof(daObjNameplate_c) == 0x780); #endif /* D_A_OBJ_NAMEPLATE_H */ |