d_a_obj_hakai_brl matching (#2504)

This commit is contained in:
Max Roncace
2025-06-27 23:13:48 +03:00
committed by GitHub
parent 79c56b2548
commit cb2c3744eb
3 changed files with 188 additions and 287 deletions
+1 -1
View File
@@ -1942,7 +1942,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_groundwater"),
ActorRel(NonMatching, "d_a_obj_grz_rock"),
ActorRel(NonMatching, "d_a_obj_h_saku"),
ActorRel(NonMatching, "d_a_obj_hakai_brl"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_hakai_brl"),
ActorRel(NonMatching, "d_a_obj_hakai_ftr"),
ActorRel(NonMatching, "d_a_obj_hasu2"),
ActorRel(NonMatching, "d_a_obj_hata"),
+19 -9
View File
@@ -1,6 +1,7 @@
#ifndef D_A_OBJ_HAKAI_BRL_H
#define D_A_OBJ_HAKAI_BRL_H
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
/**
@@ -11,24 +12,33 @@
* @details
*
*/
class daObjHBarrel_c : public fopAc_ac_c {
class daObjHBarrel_c : public fopAc_ac_c, public request_of_phase_process_class {
public:
/* 80C16758 */ daObjHBarrel_c();
/* 80C16918 */ ~daObjHBarrel_c();
/* 80C16A98 */ void createHeap();
/* 80C16B08 */ void create();
/* 80C16BF8 */ void Delete();
/* 80C16C44 */ void draw();
/* 80C16CA8 */ void execute();
/* 80C16918 */ virtual ~daObjHBarrel_c();
/* 80C16A98 */ int createHeap();
/* 80C16B08 */ int create();
/* 80C16BF8 */ int Delete();
/* 80C16C44 */ int draw();
/* 80C16CA8 */ int execute();
/* 80C16D50 */ void init();
/* 80C16DEC */ void setModelMtx();
/* 80C16E50 */ void hitAction();
u8 getItemBit() {
return fopAcM_GetParamBit(this, 8, 8);
}
u8 getItemNo() {
return fopAcM_GetParamBit(this, 0, 8);
}
/* 80C17090 */ void callEmt();
static u8 const s_CcDCyl[68];
static dCcD_SrcCyl const s_CcDCyl;
private:
/* 0x568 */ u8 field_0x568[0x710 - 0x568];
/* 0x574 */ J3DModel* mpModel;
/* 0x578 */ dCcD_Stts mStts;
/* 0x5B4 */ dCcD_Cyl mCyl;
/* 0x6F0 */ Z2SoundObjSimple mSound;
};
STATIC_ASSERT(sizeof(daObjHBarrel_c) == 0x710);
File diff suppressed because it is too large Load Diff