diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-03-18 16:17:53 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-03-18 16:17:53 -0400 |
| commit | e71662caa0d0344b12e593041fe8a7e7680b9bab (patch) | |
| tree | 39ac304589dccd843089827febb6037ac57b923d /include/d | |
| parent | 4c3bd2c65111f6520a409f2fe06018b6648ba4fe (diff) | |
More return types, set up all dBgS_MoveBgActor subclasses
Diffstat (limited to 'include/d')
30 files changed, 173 insertions, 169 deletions
diff --git a/include/d/actor/d_a_bomb.h b/include/d/actor/d_a_bomb.h index fc5a2f28..bd8b16f8 100644 --- a/include/d/actor/d_a_bomb.h +++ b/include/d/actor/d_a_bomb.h @@ -89,7 +89,7 @@ public: void eff_explode_normal(const csXyz*); void eff_explode_cheap(const csXyz*); void eff_explode(); - int procExplode_init(); + BOOL procExplode_init(); bool procExplode(); bool procCarry_init(); bool procCarry(); diff --git a/include/d/actor/d_a_branch.h b/include/d/actor/d_a_branch.h index 95e47d36..a3e2892b 100644 --- a/include/d/actor/d_a_branch.h +++ b/include/d/actor/d_a_branch.h @@ -25,8 +25,8 @@ public: void set_anim(int, int, int); void demoPlay(mDoExt_McaMorf*); - int CreateHeap(); - static int solidHeapCB(fopAc_ac_c*); + BOOL CreateHeap(); + static BOOL solidHeapCB(fopAc_ac_c*); MtxP getJointMtx(const char*); diff --git a/include/d/actor/d_a_fan.h b/include/d/actor/d_a_fan.h index b4038055..b881079a 100644 --- a/include/d/actor/d_a_fan.h +++ b/include/d/actor/d_a_fan.h @@ -15,7 +15,7 @@ public: void set_mtx(); void set_wind_length(f32); void set_cps(f32); - virtual int Execute(Mtx**); + virtual BOOL Execute(Mtx**); virtual BOOL Draw(); public: diff --git a/include/d/actor/d_a_hmlif.h b/include/d/actor/d_a_hmlif.h index 487bd2d5..c3cbdaba 100644 --- a/include/d/actor/d_a_hmlif.h +++ b/include/d/actor/d_a_hmlif.h @@ -1,17 +1,17 @@ #ifndef D_A_HMLIF_H #define D_A_HMLIF_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" -class daHmlif_c : public fopAc_ac_c { +class daHmlif_c : public dBgS_MoveBgActor { public: - BOOL Delete(); + virtual BOOL Delete(); void daHmlifDelete(); - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State daHmlifCreate(); void set_mtx(); - void Execute(float(**)[3][4]); + virtual BOOL Execute(Mtx**); void move(); void set_se(); void anim_play(); @@ -21,7 +21,7 @@ public: void set_next_pnt(); void setNextPath(); void chkSwitchPathType(); - BOOL Draw(); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_hys.h b/include/d/actor/d_a_hys.h index 6befebb8..31ca8d0f 100644 --- a/include/d/actor/d_a_hys.h +++ b/include/d/actor/d_a_hys.h @@ -1,23 +1,23 @@ #ifndef D_A_HYS_H #define D_A_HYS_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" -class daHys_c : public fopAc_ac_c { +class daHys_c : public dBgS_MoveBgActor { public: inline cPhs_State _create(); void set_mtx(); - BOOL Delete(); - void CreateHeap(); - s32 Create(); - void Execute(float(**)[3][4]); + virtual BOOL Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + virtual BOOL Execute(Mtx**); void mode_proc_call(); void mode_wait(); void mode_sw_on_init(); void mode_sw_on(); void mode_wait_init(); - BOOL Draw(); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_ashut.h b/include/d/actor/d_a_obj_ashut.h index 0c1da345..a4d79403 100644 --- a/include/d/actor/d_a_obj_ashut.h +++ b/include/d/actor/d_a_obj_ashut.h @@ -1,10 +1,10 @@ #ifndef D_A_OBJ_ASHUT_H #define D_A_OBJ_ASHUT_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjAshut { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: enum Mode_e { @@ -14,10 +14,10 @@ namespace daObjAshut { void prm_get_evId() const {} void prm_get_swSave() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -32,8 +32,8 @@ namespace daObjAshut { void mode_l_u(); void mode_demoreq_init(Mode_e); void mode_demoreq(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_aygr.h b/include/d/actor/d_a_obj_aygr.h index b4c28a3a..a77c3231 100644 --- a/include/d/actor/d_a_obj_aygr.h +++ b/include/d/actor/d_a_obj_aygr.h @@ -1,22 +1,22 @@ #ifndef D_A_OBJ_AYGR_H #define D_A_OBJ_AYGR_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjAygr { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_mdl() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_drift.h b/include/d/actor/d_a_obj_drift.h index 2da54265..258de154 100644 --- a/include/d/actor/d_a_obj_drift.h +++ b/include/d/actor/d_a_obj_drift.h @@ -1,21 +1,22 @@ #ifndef D_A_OBJ_DRIFT_H #define D_A_OBJ_DRIFT_H +#include "d/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor.h" #include "d/d_bg_w.h" namespace daObjDrift { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_type() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); void make_flower(); void calc_flower_param(cXyz*, csXyz*); void set_flower_current(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void mode_wait_init(); void mode_wait(); @@ -25,8 +26,8 @@ namespace daObjDrift { void init_mtx(); void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*); void set_current(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_ekskz.h b/include/d/actor/d_a_obj_ekskz.h index e26166a2..bca86d5e 100644 --- a/include/d/actor/d_a_obj_ekskz.h +++ b/include/d/actor/d_a_obj_ekskz.h @@ -19,7 +19,7 @@ namespace daObjEkskz { BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); - virtual BOOL Execute(float(**)[3][4]); + virtual BOOL Execute(Mtx**); virtual BOOL Draw(); public: diff --git a/include/d/actor/d_a_obj_hami2.h b/include/d/actor/d_a_obj_hami2.h index 11a527c5..7b4c3688 100644 --- a/include/d/actor/d_a_obj_hami2.h +++ b/include/d/actor/d_a_obj_hami2.h @@ -1,17 +1,17 @@ #ifndef D_A_OBJ_HAMI2_H #define D_A_OBJ_HAMI2_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjHami2 { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_swSave() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -21,8 +21,8 @@ namespace daObjHami2 { void daObjHami2_open_stop(); void daObjHami2_close_demo_wait(); void daObjHami2_close_demo(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_hami3.h b/include/d/actor/d_a_obj_hami3.h index 572611b5..d42d68cf 100644 --- a/include/d/actor/d_a_obj_hami3.h +++ b/include/d/actor/d_a_obj_hami3.h @@ -1,19 +1,19 @@ #ifndef D_A_OBJ_HAMI3_H #define D_A_OBJ_HAMI3_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjHami3 { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_sound() const {} void prm_get_swSave() const {} void prm_get_swSave2() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -23,8 +23,8 @@ namespace daObjHami3 { void daObjHami3_open_stop(); void daObjHami3_close_demo_wait(); void daObjHami3_close_demo(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_hlift.h b/include/d/actor/d_a_obj_hlift.h index f464c888..3d1b6fd1 100644 --- a/include/d/actor/d_a_obj_hlift.h +++ b/include/d/actor/d_a_obj_hlift.h @@ -1,10 +1,10 @@ #ifndef D_A_OBJ_HLIFT_H #define D_A_OBJ_HLIFT_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjHlift { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: enum Mode_e { @@ -15,10 +15,10 @@ namespace daObjHlift { void prm_get_size() const {} void prm_get_swSave() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void mode_lower_init(); void mode_lower(); @@ -37,8 +37,8 @@ namespace daObjHlift { void vib_proc(); void chk_demo_end(); void se_whole(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_jump.h b/include/d/actor/d_a_obj_jump.h index 0871823e..55debba0 100644 --- a/include/d/actor/d_a_obj_jump.h +++ b/include/d/actor/d_a_obj_jump.h @@ -1,13 +1,14 @@ #ifndef D_A_OBJ_JUMP_H #define D_A_OBJ_JUMP_H +#include "d/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor.h" #include "d/d_bg_w.h" class J3DNode; namespace daObjJump { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: static u32 prm_make_b() { return 1; @@ -20,10 +21,10 @@ namespace daObjJump { void attr() const {} void prm_get_type() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -44,11 +45,11 @@ namespace daObjJump { void mode_upper(); void mode_u_w_init(); void mode_u_w(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: - /* 0x290 */ u8 m290[0x336 - 0x290]; + /* 0x2C8 */ u8 m2C8[0x336 - 0x2C8]; /* 0x336 */ u8 m336; /* 0x337 */ u8 m337[0x358 - 0x337]; }; diff --git a/include/d/actor/d_a_obj_mkie.h b/include/d/actor/d_a_obj_mkie.h index 81a5fc77..410b2b2b 100644 --- a/include/d/actor/d_a_obj_mkie.h +++ b/include/d/actor/d_a_obj_mkie.h @@ -1,10 +1,10 @@ #ifndef D_A_OBJ_MKIE_H #define D_A_OBJ_MKIE_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjMkie { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: static u32 prm_make(u8 eventId, int swNo) { return swNo << 0x10 | (eventId | 0x3000); @@ -20,12 +20,12 @@ namespace daObjMkie { void prm_get_swSave() const {} void prm_get_type() const {} - void CreateHeap(); + virtual BOOL CreateHeap(); void init_cc(); void set_cc_pos(); - s32 Create(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -40,11 +40,11 @@ namespace daObjMkie { void mode_demo_init(); void mode_demo(); void mode_proc_call(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: - /* 0x290 */ u8 m290[0xF58 - 0x290]; + /* 0x2C8 */ u8 m2C8[0xF58 - 0x2C8]; /* 0xF58 */ u8 mF58; /* 0xF59 */ u8 mF59[0xF64 - 0xF59]; }; diff --git a/include/d/actor/d_a_obj_mkiek.h b/include/d/actor/d_a_obj_mkiek.h index 8dcf6c67..6dd49400 100644 --- a/include/d/actor/d_a_obj_mkiek.h +++ b/include/d/actor/d_a_obj_mkiek.h @@ -1,26 +1,26 @@ #ifndef D_A_OBJ_MKIEK_H #define D_A_OBJ_MKIEK_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjMkiek { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_sound() const {} void prm_get_swSave() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void check(); void demo_wait(); void demo(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_msdan_sub.h b/include/d/actor/d_a_obj_msdan_sub.h index 73977f7d..10677295 100644 --- a/include/d/actor/d_a_obj_msdan_sub.h +++ b/include/d/actor/d_a_obj_msdan_sub.h @@ -1,24 +1,24 @@ #ifndef D_A_OBJ_MSDAN_SUB_H #define D_A_OBJ_MSDAN_SUB_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjMsdanSub { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_objNo() const {} void prm_get_size() const {} void prm_get_swSave() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_msdan_sub2.h b/include/d/actor/d_a_obj_msdan_sub2.h index b6ca85ec..1aa53fd4 100644 --- a/include/d/actor/d_a_obj_msdan_sub2.h +++ b/include/d/actor/d_a_obj_msdan_sub2.h @@ -1,23 +1,23 @@ #ifndef D_A_OBJ_MSDAN_SUB2_H #define D_A_OBJ_MSDAN_SUB2_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjMsdanSub2 { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_objNo() const {} void prm_get_swSave() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_nest.h b/include/d/actor/d_a_obj_nest.h index 214360dd..9f75616f 100644 --- a/include/d/actor/d_a_obj_nest.h +++ b/include/d/actor/d_a_obj_nest.h @@ -1,24 +1,25 @@ #ifndef D_A_OBJ_NEST_H #define D_A_OBJ_NEST_H +#include "d/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor.h" #include "d/d_bg_w.h" namespace daObjNest { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*); void vib_set(float); void vib_proc(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_ospbox.h b/include/d/actor/d_a_obj_ospbox.h index 87b52677..f40a8050 100644 --- a/include/d/actor/d_a_obj_ospbox.h +++ b/include/d/actor/d_a_obj_ospbox.h @@ -1,18 +1,18 @@ #ifndef D_A_OBJ_OSPBOX_H #define D_A_OBJ_OSPBOX_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjOspbox { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_itemNo() const {} void prm_get_spec() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -21,8 +21,8 @@ namespace daObjOspbox { void sound_break(); void set_ground(); void init_ground(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_pirateship.h b/include/d/actor/d_a_obj_pirateship.h index 36a6fbf0..18e23b19 100644 --- a/include/d/actor/d_a_obj_pirateship.h +++ b/include/d/actor/d_a_obj_pirateship.h @@ -1,12 +1,13 @@ #ifndef D_A_OBJ_PIRATESHIP_H #define D_A_OBJ_PIRATESHIP_H +#include "d/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor.h" namespace daObjPirateship { f32 getShipOffsetY(s16*, s16*, f32); - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: inline cPhs_State _create(); inline bool _delete(); @@ -18,18 +19,18 @@ namespace daObjPirateship { void pirateCreate(int*); void partsCreate(); void sound_proc(); - void CreateHeap(); + virtual BOOL CreateHeap(); void CreateWave(); void SetWave(); void DeleteWave(); - s32 Create(); - void Execute(float(**)[3][4]); - BOOL Draw(); - BOOL Delete(); + virtual BOOL Create(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); + virtual BOOL Delete(); void demo_move(); public: - /* 0x290 */ u8 m290[0x2CC - 0x290]; + /* 0x2C8 */ u8 m2C8[0x2CC - 0x2C8]; /* 0x2CC */ u8 m2CC; /* 0x2CD */ u8 m2CD[0x2CE - 0x2CD]; /* 0x2CE */ u8 m2CE; diff --git a/include/d/actor/d_a_obj_smplbg.h b/include/d/actor/d_a_obj_smplbg.h index 8fcc5fe4..1498561d 100644 --- a/include/d/actor/d_a_obj_smplbg.h +++ b/include/d/actor/d_a_obj_smplbg.h @@ -1,10 +1,10 @@ #ifndef D_A_OBJ_SMPLBG_H #define D_A_OBJ_SMPLBG_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjSmplbg { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void attr() const {} void isStop() {} @@ -12,16 +12,16 @@ namespace daObjSmplbg { void onStop() {} void prm_get_type() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void exec_qtkhd(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_stair.h b/include/d/actor/d_a_obj_stair.h index 430bea08..c4e203e5 100644 --- a/include/d/actor/d_a_obj_stair.h +++ b/include/d/actor/d_a_obj_stair.h @@ -1,9 +1,9 @@ #ifndef D_A_OBJ_STAIR_H #define D_A_OBJ_STAIR_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" -class daObj_Stair_c : public fopAc_ac_c { +class daObj_Stair_c : public dBgS_MoveBgActor { public: inline cPhs_State _create(); inline bool _delete(); @@ -11,11 +11,11 @@ public: inline bool _execute(); void set_mtx() {} - void CreateHeap(); - s32 Create(); - void Execute(float(**)[3][4]); - BOOL Draw(); - BOOL Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); + virtual BOOL Delete(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_swflat.h b/include/d/actor/d_a_obj_swflat.h index 996734dd..3da3611a 100644 --- a/include/d/actor/d_a_obj_swflat.h +++ b/include/d/actor/d_a_obj_swflat.h @@ -1,25 +1,25 @@ #ifndef D_A_OBJ_SWFLAT_H #define D_A_OBJ_SWFLAT_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjSwflat { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prmGetSwNo() const {} void prmGetSwNo2() const {} void prmGetType() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); - void Execute(float(**)[3][4]); - BOOL Draw(); - BOOL IsDelete(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); + virtual BOOL IsDelete(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_tenmado.h b/include/d/actor/d_a_obj_tenmado.h index 37fa369f..208d5ddb 100644 --- a/include/d/actor/d_a_obj_tenmado.h +++ b/include/d/actor/d_a_obj_tenmado.h @@ -1,23 +1,23 @@ #ifndef D_A_OBJ_TENMADO_H #define D_A_OBJ_TENMADO_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjTenmado { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_swSave() const {} void prm_get_swSave2() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_tide.h b/include/d/actor/d_a_obj_tide.h index b03790b6..4329ddbd 100644 --- a/include/d/actor/d_a_obj_tide.h +++ b/include/d/actor/d_a_obj_tide.h @@ -1,18 +1,18 @@ #ifndef D_A_OBJ_TIDE_H #define D_A_OBJ_TIDE_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjTide { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_swSave() const {} void prm_get_type() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -36,8 +36,8 @@ namespace daObjTide { void se_stop_out(); void se_stop_up(); void se_pos_up(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_volcano.h b/include/d/actor/d_a_obj_volcano.h index 992e84b8..cb06b61c 100644 --- a/include/d/actor/d_a_obj_volcano.h +++ b/include/d/actor/d_a_obj_volcano.h @@ -1,21 +1,21 @@ #ifndef D_A_OBJ_VOLCANO_H #define D_A_OBJ_VOLCANO_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" class J3DMaterial; namespace daObjVolcano { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_swSave() const {} void StartFire(); void StopFire(); - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -27,9 +27,9 @@ namespace daObjVolcano { void daObjVolcano_freeze_main(); void daObjVolcano_fail_demo_wait(); void daObjVolcano_fail_demo_main(); - void Execute(float(**)[3][4]); + virtual BOOL Execute(Mtx**); void set_material(J3DMaterial*, unsigned char); - BOOL Draw(); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_steam_tag.h b/include/d/actor/d_a_steam_tag.h index f3587d6e..f681c362 100644 --- a/include/d/actor/d_a_steam_tag.h +++ b/include/d/actor/d_a_steam_tag.h @@ -29,7 +29,7 @@ public: inline BOOL execute(); const daSteamTag_mData* getData(); - s32 CreateInit(); + BOOL CreateInit(); BOOL createEmitter(); bool endEmitter(); diff --git a/include/d/actor/d_a_stone2.h b/include/d/actor/d_a_stone2.h index 449f2206..013cab56 100644 --- a/include/d/actor/d_a_stone2.h +++ b/include/d/actor/d_a_stone2.h @@ -1,10 +1,10 @@ #ifndef D_A_STONE2_H #define D_A_STONE2_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daStone2 { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: Act_c(); @@ -20,11 +20,11 @@ namespace daStone2 { void prmZ_init(); void is_switch() const; void on_switch() const; - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); void chk_appear(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -60,9 +60,9 @@ namespace daStone2 { void demo_run_init(); void demo_run(); void demo_proc_call(); - void Execute(float(**)[3][4]); + virtual BOOL Execute(Mtx**); void draw_shadow(); - BOOL Draw(); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_swhit0.h b/include/d/actor/d_a_swhit0.h index bdce06ee..aeb969ca 100644 --- a/include/d/actor/d_a_swhit0.h +++ b/include/d/actor/d_a_swhit0.h @@ -24,7 +24,7 @@ public: BOOL CreateHeap(); void decisionRtType(); - s32 CreateInit(); + BOOL CreateInit(); cPhs_State create(); s32 checkHit(); diff --git a/include/d/actor/d_a_tori_flag.h b/include/d/actor/d_a_tori_flag.h index a32051aa..5f45e77b 100644 --- a/include/d/actor/d_a_tori_flag.h +++ b/include/d/actor/d_a_tori_flag.h @@ -30,7 +30,7 @@ public: void set_mtx(); BOOL CreateHeap(); - s32 CreateInit(); + cPhs_State CreateInit(); static const char M_arcname[7]; |
