d_a_obj_eskban work

nonmatching dBgS_MoveBgActor::Draw and daObjEskban::<unnamed>::Mthd_IsDelete are swapped
This commit is contained in:
Erilea
2024-05-23 10:22:36 +02:00
parent 963bcc5625
commit a9f55dc187
3 changed files with 409 additions and 43 deletions
+56 -12
View File
@@ -3,26 +3,70 @@
#include "f_op/f_op_actor.h"
#include "d/d_a_obj.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_particle.h"
namespace daObjEskban {
class Act_c : public fopAc_ac_c {
static const int DESTROY_VIBRATION_LEN = 35;
static const int DESTROY_VIBRATION_SHOCK_FRAME_IDX = 28;
static const int DESTROY_SMOKE_ANM_LEN = 20;
class Act_c : public dBgS_MoveBgActor {
public:
void prm_get_swSave() const {}
void CreateHeap();
s32 Create();
void Mthd_Create();
BOOL Delete();
void Mthd_Delete();
static const char M_arcname[7];
static const char M_evname[7];
static Mtx M_tmp_mtx;
enum Prm_e {
PRM_SWSAVE_W = 0x08,
PRM_SWSAVE_S = 0x00,
};
s32 param_get_swSave() const {
return daObj::PrmAbstract<Prm_e>(this, PRM_SWSAVE_W, PRM_SWSAVE_S);
}
enum actor_state {
ST_WAIT = 0,
ST_DESTROYED = 1,
ST_CUTSCENING = 2,
ST_VIBRATING = 3,
ST_SMOKING = 4,
};
Act_c();
int CreateHeap();
int Create();
s32 Mthd_Create();
int Delete();
BOOL Mthd_Delete();
void set_mtx();
void init_mtx();
void eff_m_break(unsigned short, unsigned short);
void eff_b_break(unsigned short);
void daObjEskban_effect_set();
void Execute(float(**)[3][4]);
BOOL Draw();
int Execute(Mtx**);
int Draw();
public:
/* Place member variables here */
/* 0x2C4 Act_c vtable */
/* 0x2C8 */ dPa_smokeEcallBack* M_smoke; // name used in assert
/* 0x2CC */ cXyz mSmokePos;
/* 0x2D8 */ request_of_phase_process_class mPhs;
/* 0x2E0 */ J3DModel* mpModel;
/* 0x2E4 */ dCcD_Stts mCheckStts;
/* 0x320 */ dCcD_Cyl mCheckCyl;
/* 0x450 */ dCcD_Stts mCameraStts;
/* 0x48C */ dCcD_Cyl mCameraCyl;
/* 0x5BC */ u32 mActorID;
/* 0x5C0 */ dCcD_Stts mCheckSphStts;
/* 0x5FC */ dCcD_Sph mCheckSph;
/* 0x728 */ s32 mActorState;
/* 0x72C */ s32 mRemainingSmokeAnm;
/* 0x730 */ s32 mRemainingVibration;
/* 0x734 */ u8 mIsVisible;
};
};