d_a_obj_hakai_ftr matching (#2507)

This commit is contained in:
Max Roncace
2025-06-28 01:47:00 +03:00
committed by GitHub
parent cb2c3744eb
commit 6eb1f72383
3 changed files with 194 additions and 319 deletions
+1 -1
View File
@@ -1943,7 +1943,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_grz_rock"),
ActorRel(NonMatching, "d_a_obj_h_saku"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_hakai_brl"),
ActorRel(NonMatching, "d_a_obj_hakai_ftr"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_hakai_ftr"),
ActorRel(NonMatching, "d_a_obj_hasu2"),
ActorRel(NonMatching, "d_a_obj_hata"),
ActorRel(NonMatching, "d_a_obj_hb"),
+18 -10
View File
@@ -1,6 +1,7 @@
#ifndef D_A_OBJ_HAKAI_FTR_H
#define D_A_OBJ_HAKAI_FTR_H
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
/**
@@ -11,24 +12,31 @@
* @details
*
*/
class daObjHFtr_c : public fopAc_ac_c {
class daObjHFtr_c : public fopAc_ac_c, public request_of_phase_process_class {
public:
/* 80C174B8 */ daObjHFtr_c();
/* 80C17778 */ ~daObjHFtr_c();
/* 80C17874 */ void createHeap();
/* 80C179B0 */ void create();
/* 80C17AC0 */ void Delete();
/* 80C17B30 */ void draw();
/* 80C17BD4 */ void execute();
/* 80C17778 */ virtual ~daObjHFtr_c();
inline u8 getNameId() {
return fopAcM_GetParamBit(this, 0, 4);
}
/* 80C17874 */ int createHeap();
/* 80C179B0 */ int create();
/* 80C17AC0 */ int Delete();
/* 80C17B30 */ int draw();
/* 80C17BD4 */ int execute();
/* 80C17CD0 */ void init();
/* 80C17E10 */ void setModelMtx();
/* 80C17E74 */ void chkHit();
/* 80C17E74 */ bool chkHit();
/* 80C17EDC */ void callEmt();
static u8 const s_CcDCyl[68];
static dCcD_SrcCyl const s_CcDCyl;
private:
/* 0x568 */ u8 field_0x568[0x860 - 0x568];
/* 0x574 */ Mtx mMtx;
/* 0x5A4 */ dBgW* field_0x5a4;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ dCcD_Stts mStts;
/* 0x5E8 */ dCcD_Cyl mCyls[2];
};
STATIC_ASSERT(sizeof(daObjHFtr_c) == 0x860);
File diff suppressed because it is too large Load Diff