summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTrueffel <106771418+Trueffeloot@users.noreply.github.com>2025-09-14 09:56:51 +0200
committerGitHub <noreply@github.com>2025-09-14 10:56:51 +0300
commit5e71d9832440a85597ddceba198e72fc6694c76f (patch)
treef615199679d27e9dc3c56661c95fa5ad5a55a18d /include
parente0c9d16332f7b46ca42eaccef8318ccbfabd106c (diff)
d_a_obj_stairBlock OK (#2656)
Diffstat (limited to 'include')
-rw-r--r--include/d/actor/d_a_obj_stairBlock.h34
1 files changed, 22 insertions, 12 deletions
diff --git a/include/d/actor/d_a_obj_stairBlock.h b/include/d/actor/d_a_obj_stairBlock.h
index a942724753..d7e58d0883 100644
--- a/include/d/actor/d_a_obj_stairBlock.h
+++ b/include/d/actor/d_a_obj_stairBlock.h
@@ -1,6 +1,8 @@
#ifndef D_A_OBJ_STAIRBLOCK_H
#define D_A_OBJ_STAIRBLOCK_H
+#include "d/d_cc_d.h"
+#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
/**
@@ -14,27 +16,35 @@
class daStairBlock_c : public fopAc_ac_c {
public:
/* 80CE81F4 */ void setBaseMtx();
- /* 80CE82A0 */ void CreateHeap();
- /* 80CE83F0 */ void create();
- /* 80CE8874 */ void createHeapCallBack(fopAc_ac_c*);
- /* 80CE88A0 */ void Execute();
- /* 80CE8B24 */ void Draw();
- /* 80CE8C08 */ void Delete();
+ /* 80CE82A0 */ virtual int CreateHeap();
+ /* 80CE83F0 */ int create();
+ /* 80CE8874 */ static int createHeapCallBack(fopAc_ac_c*);
+ /* 80CE88A0 */ virtual int Execute();
+ /* 80CE8B24 */ virtual int Draw();
+ /* 80CE8C08 */ virtual int Delete();
- static u8 const mCcDObjInfo[48];
- static u8 mCcDSph[64];
+ static dCcD_SrcGObjInf const mCcDObjInfo;
+ static dCcD_SrcSph mCcDSph;
private:
- /* 0x568 */ u8 field_0x568[0x132c - 0x568];
+ /* 0x056C */ request_of_phase_process_class mPhaseReq;
+ /* 0x0574 */ J3DModel* mpModel[10];
+ /* 0x059C */ mDoExt_bckAnm mBckAnm[10];
+ /* 0x06B4 */ u8 mHit[10];
+ /* 0x06C0 */ dCcD_Stts mStts;
+ /* 0x06FC */ dCcD_Sph mSpheres[10];
};
STATIC_ASSERT(sizeof(daStairBlock_c) == 0x132c);
-class daStairBlock_HIO_c {
+class daStairBlock_HIO_c : public mDoHIO_entry_c {
public:
/* 80CE816C */ daStairBlock_HIO_c();
- /* 80CE8CDC */ ~daStairBlock_HIO_c();
-};
+ /* 80CE8CDC */ virtual ~daStairBlock_HIO_c() {}
+
+ void genMessage(JORMContext*);
+ /* 0x4 */ f32 collision_radius[10];
+}; // Size: 0x2C
#endif /* D_A_OBJ_STAIRBLOCK_H */