d_a_obj_thdoor,d_a_obj_zra_rock OK (#2557)

* d_a_obj_thdoor,d_a_obj_zra_rock OK

* Remove ;
This commit is contained in:
hatal175
2025-07-26 22:34:45 +03:00
committed by GitHub
parent 9844494edf
commit a1b63ae940
15 changed files with 444 additions and 540 deletions
+3 -1
View File
@@ -64,11 +64,13 @@ public:
STATIC_ASSERT(sizeof(e_bs_class) == 0xcfc);
class daE_BS_HIO_c {
class daE_BS_HIO_c : public JORReflexible {
public:
/* 8068E12C */ daE_BS_HIO_c();
/* 8069091C */ virtual ~daE_BS_HIO_c() {}
void genMessage(JORMContext* ctx);
/* 0x04 */ s8 id;
/* 0x08 */ f32 base_size;
/* 0x0C */ f32 move_speed;
+48 -11
View File
@@ -1,6 +1,9 @@
#ifndef D_A_OBJ_THDOOR_H
#define D_A_OBJ_THDOOR_H
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_cc_d.h"
#include "d/d_msg_flow.h"
#include "f_op/f_op_actor_mng.h"
/**
@@ -11,14 +14,23 @@
* @details
*
*/
class daObjThDoor_c : public fopAc_ac_c {
class daObjThDoor_c : public dBgS_MoveBgActor {
public:
typedef void (daObjThDoor_c::*actionFunc)();
enum Action {
ACTION_WAIT,
ACTION_ORDER_EVENT,
ACTION_EVENT,
ACTION_DEAD,
};
/* 80D0D618 */ void initBaseMtx();
/* 80D0D654 */ void setBaseMtx();
/* 80D0D6B8 */ void Create();
/* 80D0D7F8 */ void CreateHeap();
/* 80D0D868 */ void create1st();
/* 80D0D8E8 */ void Execute(f32 (**)[3][4]);
/* 80D0D6B8 */ int Create();
/* 80D0D7F8 */ int CreateHeap();
/* 80D0D868 */ int create1st();
/* 80D0D8E8 */ int Execute(Mtx**);
/* 80D0D9B4 */ void set_cyl();
/* 80D0DAC8 */ void action();
/* 80D0DB90 */ void event_proc_call();
@@ -26,16 +38,41 @@ public:
/* 80D0DCC8 */ void actionOrderEvent();
/* 80D0DD90 */ void actionEvent();
/* 80D0DE30 */ void actionDead();
/* 80D0DE34 */ void demoProc();
/* 80D0E06C */ void checkArea();
/* 80D0E150 */ void Draw();
/* 80D0E1F4 */ void Delete();
/* 80D0DE34 */ int demoProc();
/* 80D0E06C */ BOOL checkArea();
/* 80D0E150 */ int Draw();
/* 80D0E1F4 */ int Delete();
private:
/* 0x568 */ u8 field_0x568[0x8c0 - 0x568];
u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
int getMsg() { return fopAcM_GetParamBit(this, 8, 16); }
BOOL checkDemo() { return fopAcM_GetParamBit(this, 24, 1); }
void setAction(u8 action) { mAction = action; }
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mModel;
/* 0x5AC */ u8 mAction;
/* 0x5AD */ u8 mMapToolId;
/* 0x5AE */ s16 mEventIdx;
/* 0x5B0 */ int mStaffId;
/* 0x5B4 */ u8 field_0x5b4;
/* 0x5B5 */ u8 field_0x5b5;
/* 0x5B6 */ u8 field_0x5b6;
/* 0x5B8 */ s16 field_0x5b8;
/* 0x5BC */ dMsgFlow_c mMsgFlow;
/* 0x608 */ s16 field_0x608;
/* 0x60A */ s16 field_0x60a;
/* 0x60C */ dCcD_Stts mStts;
/* 0x648 */ dCcD_Cyl mCyls[2];
};
STATIC_ASSERT(sizeof(daObjThDoor_c) == 0x8c0);
#ifdef DEBUG
class daObjThDoor_HIO_c : public mDoHIO_entry_c {
public:
daObjThDoor_HIO_c();
void genMessage(JORMContext* ctx);
};
#endif
#endif /* D_A_OBJ_THDOOR_H */