Add bomb headers

This commit is contained in:
LagoLunatic
2023-10-04 15:38:22 -04:00
parent ed56218aa2
commit 8d95d62196
8 changed files with 296 additions and 191 deletions
+7 -7
View File
@@ -30,10 +30,10 @@ public:
JPACallBackBase() {}
virtual ~JPACallBackBase() {}
virtual void init(JPABaseEmitter*);
virtual void execute(JPABaseEmitter*);
virtual void executeAfter(JPABaseEmitter*);
virtual void draw(JPABaseEmitter*);
virtual void init(T) {}
virtual void execute(T) {}
virtual void executeAfter(T) {}
virtual void draw(T) {}
};
template<typename T, typename U>
@@ -42,9 +42,9 @@ public:
JPACallBackBase2() {}
virtual ~JPACallBackBase2() {}
virtual void init(JPABaseEmitter*, JPABaseParticle*);
virtual void execute(JPABaseEmitter*, JPABaseParticle*);
virtual void draw(JPABaseEmitter*, JPABaseParticle*);
virtual void init(T, U) {}
virtual void execute(T, U) {}
virtual void draw(T, U) {}
};
class JPABaseEmitter {
+5
View File
@@ -15,6 +15,11 @@ class JPAParticleCallBack;
class JPAResourceManager;
struct JPAEmitterWorkData;
template<typename T>
class JPACallBackBase;
template<typename T, typename U>
class JPACallBackBase2;
class JPABaseParticle {
public:
void initParticle();
+110
View File
@@ -0,0 +1,110 @@
#ifndef D_A_BOMB_H
#define D_A_BOMB_H
#include "d/d_particle.h"
#include "d/d_bg_s_acch.h"
#include "f_op/f_op_actor.h"
class daBomb_fuseSmokeEcallBack : public dPa_levelEcallBack {
public:
void executeAfter(JPABaseEmitter*);
void execute(JPABaseEmitter*);
void draw(JPABaseEmitter*);
void setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char);
};
class daBomb_fuseSparksEcallBack : public dPa_levelEcallBack {
public:
void execute(JPABaseEmitter*);
void draw(JPABaseEmitter*);
void setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char);
};
class daBomb_c : public fopAc_ac_c {
public:
enum State_e {
};
void getBombRestTime();
void getBombCheck_Flag();
void setBombCheck_Flag();
void setBombFire_ON();
void setBombNoHit();
void setBombOffCoSet();
void setBombOnCoSet();
void setBombNoEff();
void setBombRestTime(short);
void setNoGravityTime(short);
void prm_make(State_e, bool, bool);
void chk_state(State_e) const;
void change_state(State_e);
void prm_get_state() const;
void get_explode_instant() const;
void prm_get_cheapEff() const;
void prm_get_angXZero() const;
void prm_get_version() const;
void _prm_chk_version() const;
void draw_norm();
void draw_nut();
void draw();
void checkExplodeCc_norm();
void checkExplodeCc_nut();
void checkExplodeCc_cannon();
void checkExplodeCc();
void checkExplodeTimer();
void checkExplode();
void checkExplodeBg_norm();
void checkExplodeBg_nut();
void checkExplodeBg_cannon();
void checkExplodeBg();
void water_tention();
void posMoveF();
void bgCrrPos();
void bgCrrPos_lava();
void bgCrrPos_water();
void chk_water_land();
void chk_water_in();
void chk_water_sink();
void chk_lava_hit();
void chk_dead_zone();
void bound(float);
void set_real_shadow_flag();
void setRoomInfo();
void makeFireEffect(cXyz&, csXyz&);
void makeWaterEffect();
void setFuseEffect();
void eff_explode_normal(const csXyz*);
void eff_explode_cheap(const csXyz*);
void eff_explode();
void procExplode_init();
void procExplode();
void procCarry_init();
void procCarry();
void procWait_init();
void procWait();
void waitState_cannon();
void waitState_bomtyu();
void procSink();
void execute();
void set_wind_vec();
void anm_play_nut();
void set_mtx();
void init_mtx();
void se_cannon_fly_set();
void se_cannon_fly_stop();
void eff_water_splash();
void bombDelete();
void createHeap();
void create();
daBomb_c();
void create_init();
};
class dBgS_BombAcch : public dBgS_Acch {
public:
};
#endif /* D_A_BOMB_H */
+135
View File
@@ -0,0 +1,135 @@
#ifndef D_A_BOMB2_H
#define D_A_BOMB2_H
#include "JSystem/JParticle/JPAEmitter.h"
#include "f_op/f_op_actor.h"
namespace daBomb2 {
class Env_c {
public:
void set(const cXyz&);
void clean();
void is_end() const;
void proc(const cXyz&);
};
class FuseSmokeCB_c {
public:
~FuseSmokeCB_c();
void setOldPosP(const cXyz*, const cXyz*);
void deleteCallBack();
void execute(JPABaseEmitter*);
void executeAfter(JPABaseEmitter*);
void draw(JPABaseEmitter*);
void setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char);
};
class FuseSparksCB_c {
public:
~FuseSparksCB_c();
void deleteCallBack();
void execute(JPABaseEmitter*);
void draw(JPABaseEmitter*);
void setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char);
};
class Act_c : public fopAc_ac_c {
public:
enum Prm_e {
};
void remove_fuse_effect();
void set_time(int);
void get_time() const;
void chk_eat() const;
void set_eat();
void set_no_hit();
void chk_explode();
void solidHeapCB(fopAc_ac_c*);
void create_heap_nut();
void create_heap();
void crr_init();
void cc_init();
void start_explode_instant();
void start_explode_interval();
void start_carry();
void start_proc_call();
void create_init();
void _create();
Act_c();
void _delete();
void set_mtx();
void init_mtx();
void cc_set();
void camera_lockoff() const;
void posMoveF();
void bgCrrPos();
void bgCrrPos_lava();
void bgCrrPos_water();
void chk_water_in() const;
void chk_lava_in() const;
void setRoomInfo();
void bound(float);
void set_nut_exp_interval();
void anm_play();
void set_wind_vec();
void eff_explode();
void eff_explode_normal(const csXyz*);
void eff_explode_water();
void eff_fuse_init();
void eff_fuse_start();
void eff_fuse_move();
void eff_fuse_end();
void eff_water_splash();
void se_fall_water();
void se_explode();
void se_explode_water();
void se_ignition();
void set_sound_env(int, int);
void chk_exp_cc_nut();
void chk_exp_cc();
void chk_exp_bg_nut();
void chk_exp_bg();
void chk_exp_timer();
void chk_sink_bg_nut();
void chk_sink_bg();
void chk_exp_pre();
void chk_exp_post();
void chk_sink_post();
void set_real_shadow_flag();
void carry_fuse_start();
void on_carry();
void off_carry();
void mode_wait_init();
void mode_wait();
void mode_carry_init();
void mode_carry();
void mode_explode_init();
void mode_explode();
void mode_sink_init();
void mode_sink();
void mode_proc_call();
void tensor_init();
void vib_init();
void vib_proc();
void set_vib_tensor();
void tensor_wait();
void tensor_wait_drop();
void tensor_wait_ground();
void tensor_carry();
void tensor_explode();
void tensor_sink();
void tensor_proc_call();
void _execute();
void is_draw();
void draw_nut();
void draw_shadow();
void _draw();
};
};
#endif /* D_A_BOMB2_H */
+11 -40
View File
@@ -3,12 +3,19 @@
// Translation Unit: d_a_bomb.cpp
//
#include "d_a_bomb.h"
#include "d/actor/d_a_bomb.h"
#include "dolphin/types.h"
#include "m_Do/m_Do_ext.h"
/* 800D9318-800D9364 .text chk_attrState__22@unnamed@d_a_bomb_cpp@FPC8daBomb_cQ222@unnamed@d_a_bomb_cpp@8AttrSt_e */
void @unnamed@d_a_bomb_cpp@::chk_attrState(const daBomb_c*, @unnamed@d_a_bomb_cpp@::AttrSt_e) {
/* Nonmatching */
namespace {
enum AttrSt_e {
};
/* 800D9318-800D9364 .text chk_attrState__22@unnamed@d_a_bomb_cpp@FPC8daBomb_cQ222@unnamed@d_a_bomb_cpp@8AttrSt_e */
void chk_attrState(const daBomb_c*, AttrSt_e) {
/* Nonmatching */
}
}
/* 800D9364-800D977C .text executeAfter__25daBomb_fuseSmokeEcallBackFP14JPABaseEmitter */
@@ -311,11 +318,6 @@ daBomb_c::daBomb_c() {
/* Nonmatching */
}
/* 800DCEBC-800DCEF8 .text __dt__15LIGHT_INFLUENCEFv */
LIGHT_INFLUENCE::~LIGHT_INFLUENCE() {
/* Nonmatching */
}
/* 800DCEF8-800DCF18 .text daBomb_Create__FP10fopAc_ac_c */
void daBomb_Create(fopAc_ac_c*) {
/* Nonmatching */
@@ -326,26 +328,6 @@ void daBomb_c::create_init() {
/* Nonmatching */
}
/* 800DD1A4-800DD210 .text __dt__26daBomb_fuseSparksEcallBackFv */
daBomb_fuseSparksEcallBack::~daBomb_fuseSparksEcallBack() {
/* Nonmatching */
}
/* 800DD210-800DD27C .text __dt__25daBomb_fuseSmokeEcallBackFv */
daBomb_fuseSmokeEcallBack::~daBomb_fuseSmokeEcallBack() {
/* Nonmatching */
}
/* 800DD27C-800DD2EC .text __dt__13dBgS_BombAcchFv */
dBgS_BombAcch::~dBgS_BombAcch() {
/* Nonmatching */
}
/* 800DD2EC-800DD348 .text __dt__13mDoExt_bckAnmFv */
mDoExt_bckAnm::~mDoExt_bckAnm() {
/* Nonmatching */
}
/* 800DD348-800DD34C .text draw__26daBomb_fuseSparksEcallBackFP14JPABaseEmitter */
void daBomb_fuseSparksEcallBack::draw(JPABaseEmitter*) {
/* Nonmatching */
@@ -370,14 +352,3 @@ void daBomb_fuseSmokeEcallBack::draw(JPABaseEmitter*) {
void daBomb_fuseSmokeEcallBack::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) {
/* Nonmatching */
}
/* 800DD36C-800DD374 .text @32@__dt__13dBgS_BombAcchFv */
void @32@__dt__13dBgS_BombAcchFv {
/* Nonmatching */
}
/* 800DD374-800DD37C .text @20@__dt__13dBgS_BombAcchFv */
void @20@__dt__13dBgS_BombAcchFv {
/* Nonmatching */
}
+25 -27
View File
@@ -3,7 +3,7 @@
// Translation Unit: d_a_bomb2.cpp
//
#include "d_a_bomb2.h"
#include "d/actor/d_a_bomb2.h"
#include "dolphin/types.h"
/* 800DD37C-800DD454 .text set__Q27daBomb25Env_cFRC4cXyz */
@@ -476,30 +476,34 @@ void daBomb2::Act_c::_draw() {
/* Nonmatching */
}
/* 800E0A80-800E0AA0 .text Mthd_Create__Q27daBomb223@unnamed@d_a_bomb2_cpp@FPv */
void daBomb2::@unnamed@d_a_bomb2_cpp@::Mthd_Create(void*) {
/* Nonmatching */
}
namespace daBomb2 {
namespace {
/* 800E0A80-800E0AA0 .text Mthd_Create__Q27daBomb223@unnamed@d_a_bomb2_cpp@FPv */
void Mthd_Create(void*) {
/* Nonmatching */
}
/* 800E0AA0-800E0AC4 .text Mthd_Delete__Q27daBomb223@unnamed@d_a_bomb2_cpp@FPv */
void daBomb2::@unnamed@d_a_bomb2_cpp@::Mthd_Delete(void*) {
/* Nonmatching */
}
/* 800E0AA0-800E0AC4 .text Mthd_Delete__Q27daBomb223@unnamed@d_a_bomb2_cpp@FPv */
void Mthd_Delete(void*) {
/* Nonmatching */
}
/* 800E0AC4-800E0AE8 .text Mthd_Execute__Q27daBomb223@unnamed@d_a_bomb2_cpp@FPv */
void daBomb2::@unnamed@d_a_bomb2_cpp@::Mthd_Execute(void*) {
/* Nonmatching */
}
/* 800E0AC4-800E0AE8 .text Mthd_Execute__Q27daBomb223@unnamed@d_a_bomb2_cpp@FPv */
void Mthd_Execute(void*) {
/* Nonmatching */
}
/* 800E0AE8-800E0B0C .text Mthd_Draw__Q27daBomb223@unnamed@d_a_bomb2_cpp@FPv */
void daBomb2::@unnamed@d_a_bomb2_cpp@::Mthd_Draw(void*) {
/* Nonmatching */
}
/* 800E0AE8-800E0B0C .text Mthd_Draw__Q27daBomb223@unnamed@d_a_bomb2_cpp@FPv */
void Mthd_Draw(void*) {
/* Nonmatching */
}
/* 800E0B0C-800E0B14 .text Mthd_IsDelete__Q27daBomb223@unnamed@d_a_bomb2_cpp@FPv */
void daBomb2::@unnamed@d_a_bomb2_cpp@::Mthd_IsDelete(void*) {
/* Nonmatching */
}
/* 800E0B0C-800E0B14 .text Mthd_IsDelete__Q27daBomb223@unnamed@d_a_bomb2_cpp@FPv */
void Mthd_IsDelete(void*) {
/* Nonmatching */
}
};
};
/* 800E0B14-800E0B80 .text __dt__Q27daBomb214FuseSparksCB_cFv */
daBomb2::FuseSparksCB_c::~FuseSparksCB_c() {
@@ -510,9 +514,3 @@ daBomb2::FuseSparksCB_c::~FuseSparksCB_c() {
daBomb2::FuseSmokeCB_c::~FuseSmokeCB_c() {
/* Nonmatching */
}
/* 800E0BEC-800E0C08 .text PrmAbstract<Q37daBomb25Act_c5Prm_e>__5daObjFPC10fopAc_ac_cQ37daBomb25Act_c5Prm_eQ37daBomb25Act_c5Prm_e */
void daObj::PrmAbstract<daBomb2::Act_c::Prm_e>(const fopAc_ac_c*, daBomb2::Act_c::Prm_e, daBomb2::Act_c::Prm_e) {
/* Nonmatching */
}
+2 -7
View File
@@ -3,7 +3,8 @@
// Translation Unit: d_a_bomb_static.cpp
//
#include "d_a_bomb_static.h"
#include "d/actor/d_a_bomb.h"
#include "d/actor/d_a_bomb2.h"
#include "dolphin/types.h"
/* 80067FA0-80067FD0 .text getBombRestTime__8daBomb_cFv */
@@ -135,9 +136,3 @@ void daBomb2::Act_c::set_no_hit() {
void daBomb2::Act_c::chk_explode() {
/* Nonmatching */
}
/* 800684F4-80068510 .text PrmAbstract<Q28daBomb_c5Prm_e>__5daObjFPC10fopAc_ac_cQ28daBomb_c5Prm_eQ28daBomb_c5Prm_e */
void daObj::PrmAbstract<daBomb_c::Prm_e>(const fopAc_ac_c*, daBomb_c::Prm_e, daBomb_c::Prm_e) {
/* Nonmatching */
}
+1 -110
View File
@@ -16,11 +16,6 @@ dPa_J3DmodelEmitter_c::dPa_J3DmodelEmitter_c(JPABaseEmitter*, J3DModelData*, dKy
/* Nonmatching */
}
// /* 8007A804-8007A84C .text __dt__18dPa_modelEmitter_cFv */
// dPa_modelEmitter_c::~dPa_modelEmitter_c() {
// /* Nonmatching */
// }
/* 8007A84C-8007A8C8 .text __dt__21dPa_J3DmodelEmitter_cFv */
dPa_J3DmodelEmitter_c::~dPa_J3DmodelEmitter_c() {
if (mpHeap) {
@@ -45,6 +40,7 @@ dPa_J3Dmodel_c::dPa_J3Dmodel_c() {
/* 8007AED8-8007AF64 .text __dt__18dPa_modelControl_cFv */
dPa_modelControl_c::~dPa_modelControl_c() {
/* Nonmatching (node_class has no virtual destructor) */
node_class* node = parent.mpHead;
while (node) {
node_class* nextNode = node->mpNextNode;
@@ -94,11 +90,6 @@ dPa_smokeEcallBack::dPa_smokeEcallBack(unsigned char) {
/* Nonmatching */
}
// /* 8007B444-8007B4B0 .text __dt__19dPa_followEcallBackFv */
// dPa_followEcallBack::~dPa_followEcallBack() {
// /* Nonmatching */
// }
/* 8007B4B0-8007B558 .text __ct__18dPa_smokeEcallBackFUcUcUcUc */
dPa_smokeEcallBack::dPa_smokeEcallBack(unsigned char, unsigned char, unsigned char, unsigned char) {
/* Nonmatching */
@@ -114,16 +105,6 @@ void dPa_smokeEcallBack::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signe
/* Nonmatching */
}
// /* 8007B698-8007B6F4 .text __dt__18dPa_smokePcallBackFv */
// dPa_smokePcallBack::~dPa_smokePcallBack() {
// /* Nonmatching */
// }
// /* 8007B6F4-8007B73C .text __dt__54JPACallBackBase2<P14JPABaseEmitter,P15JPABaseParticle>Fv */
// JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*>::~JPACallBackBase2() {
// /* Nonmatching */
// }
/* 8007B73C-8007B804 .text initiateLighting__FR11_GXColorS10R8_GXColorR8_GXColor */
void initiateLighting(_GXColorS10&, _GXColor&, _GXColor&) {
/* Nonmatching */
@@ -170,11 +151,6 @@ dPa_simpleEcallBack::dPa_simpleEcallBack() {
mCount = 0;
}
// /* 8007C420-8007C45C .text __dt__16dPa_simpleData_cFv */
// dPa_simpleData_c::~dPa_simpleData_c() {
// /* Nonmatching */
// }
/* 8007C45C-8007C460 .text __ct__16dPa_simpleData_cFv */
dPa_simpleData_c::dPa_simpleData_c() {
/* Nonmatching */
@@ -185,11 +161,6 @@ void dPa_simpleEcallBack::executeAfter(JPABaseEmitter*) {
/* Nonmatching */
}
// /* 8007C618-8007C674 .text __dt__17dPa_windPcallBackFv */
// dPa_windPcallBack::~dPa_windPcallBack() {
// /* Nonmatching */
// }
/* 8007C674-8007C6EC .text draw__19dPa_simpleEcallBackFP14JPABaseEmitter */
void dPa_simpleEcallBack::draw(JPABaseEmitter*) {
/* Nonmatching */
@@ -220,11 +191,6 @@ dPa_control_c::dPa_control_c() {
/* Nonmatching */
}
// /* 8007C9A4-8007CA28 .text __dt__19dPa_simpleEcallBackFv */
// dPa_simpleEcallBack::~dPa_simpleEcallBack() {
// /* Nonmatching */
// }
/* 8007CA28-8007CA30 .text getRM_ID__13dPa_control_cFUs */
void dPa_control_c::getRM_ID(unsigned short) {
/* Nonmatching */
@@ -465,91 +431,21 @@ void dPa_trackEcallBack::draw(JPABaseEmitter*) {
/* Nonmatching */
}
// /* 8007F62C-8007F698 .text __dt__18dPa_trackEcallBackFv */
// dPa_trackEcallBack::~dPa_trackEcallBack() {
// /* Nonmatching */
// }
// /* 8007F698-8007F704 .text __dt__22dPa_bombSmokeEcallBackFv */
// dPa_bombSmokeEcallBack::~dPa_bombSmokeEcallBack() {
// /* Nonmatching */
// }
/* 8007F704-8007F708 .text setup__22dPa_bombSmokeEcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
void dPa_bombSmokeEcallBack::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) {
/* Nonmatching */
}
// /* 8007F708-8007F764 .text __dt__19dPa_kageroEcallBackFv */
// dPa_kageroEcallBack::~dPa_kageroEcallBack() {
// /* Nonmatching */
// }
// /* 8007F764-8007F7D0 .text __dt__20dPa_stripesEcallBackFv */
// dPa_stripesEcallBack::~dPa_stripesEcallBack() {
// /* Nonmatching */
// }
/* 8007F7D0-8007F7D4 .text setup__20dPa_stripesEcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
void dPa_stripesEcallBack::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) {
/* Nonmatching */
}
// /* 8007F7D4-8007F840 .text __dt__22dPa_cutTurnEcallBack_cFv */
// dPa_cutTurnEcallBack_c::~dPa_cutTurnEcallBack_c() {
// /* Nonmatching */
// }
// /* 8007F840-8007F8AC .text __dt__19dPa_splashEcallBackFv */
// dPa_splashEcallBack::~dPa_splashEcallBack() {
// /* Nonmatching */
// }
// /* 8007F8AC-8007F940 .text __dt__17dPa_waveEcallBackFv */
// dPa_waveEcallBack::~dPa_waveEcallBack() {
// /* Nonmatching */
// }
// /* 8007F940-8007F99C .text __dt__19dPa_ripplePcallBackFv */
// dPa_ripplePcallBack::~dPa_ripplePcallBack() {
// /* Nonmatching */
// }
/* 8007F99C-8007F9A0 .text init__54JPACallBackBase2<P14JPABaseEmitter,P15JPABaseParticle>FP14JPABaseEmitterP15JPABaseParticle */
void JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*>::init(JPABaseEmitter*, JPABaseParticle*) {
/* Nonmatching */
}
// /* 8007F9A0-8007FA0C .text __dt__25dPa_singleRippleEcallBackFv */
// dPa_singleRippleEcallBack::~dPa_singleRippleEcallBack() {
// /* Nonmatching */
// }
// /* 8007FA0C-8007FA78 .text __dt__19dPa_rippleEcallBackFv */
// dPa_rippleEcallBack::~dPa_rippleEcallBack() {
// /* Nonmatching */
// }
/* 8007FA78-8007FA7C .text draw__54JPACallBackBase2<P14JPABaseEmitter,P15JPABaseParticle>FP14JPABaseEmitterP15JPABaseParticle */
void JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*>::draw(JPABaseEmitter*, JPABaseParticle*) {
/* Nonmatching */
}
// /* 8007FA7C-8007FAE8 .text __dt__22dPa_selectTexEcallBackFv */
// dPa_selectTexEcallBack::~dPa_selectTexEcallBack() {
// /* Nonmatching */
// }
/* 8007FAE8-8007FAEC .text setup__22dPa_selectTexEcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
void dPa_selectTexEcallBack::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) {
/* Nonmatching */
}
/* 8007FAEC-8007FAF0 .text execute__54JPACallBackBase2<P14JPABaseEmitter,P15JPABaseParticle>FP14JPABaseEmitterP15JPABaseParticle */
void JPACallBackBase2<JPABaseEmitter*, JPABaseParticle*>::execute(JPABaseEmitter*, JPABaseParticle*) {
/* Nonmatching */
}
/* 8007FF78-8007FFA8 .text draw__21dPa_setColorEcallBackFP14JPABaseEmitter */
void dPa_setColorEcallBack::draw(JPABaseEmitter*) {
/* Nonmatching */
@@ -559,8 +455,3 @@ void dPa_setColorEcallBack::draw(JPABaseEmitter*) {
void dPa_setColorEcallBack::setup(JPABaseEmitter*, const cXyz*, const csXyz*, signed char) {
/* Nonmatching */
}
// /* 8007FFAC-80080018 .text __dt__21dPa_setColorEcallBackFv */
// dPa_setColorEcallBack::~dPa_setColorEcallBack() {
// /* Nonmatching */
// }