mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-09 02:45:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move more actor classes to headers

Browse Source
This commit is contained in:
LagoLunatic
2023-11-25 18:05:07 -05:00
parent 4a496727a9
commit 897b22f936
24 changed files with 346 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_alldie.h
+7 -3
View File
@@ -7,11 +7,15 @@ class daAlldie_c : public fopAc_ac_c {
public:
inline s32 create();
inline BOOL draw();
void setActio(unsigned char) {}
void setActio(u8 action) { mAction = action; }
u8 getSwbit();
BOOL actionWait();
BOOL actionCheck();
BOOL actionTimer();
BOOL execute();
public:
/* 0x290 */ u8 mState;
/* 0x291 */ u8 m291[0x292 - 0x291];
/* 0x290 */ u8 mAction;
/* 0x292 */ s16 mTimer;
};
include/d/actor/d_a_branch.h
+1 -1
View File
@@ -27,7 +27,7 @@ public:
void demoPlay(mDoExt_McaMorf*);
s32 CreateHeap();
static s32 solidHeapCB(fopAc_ac_c*);
static BOOL solidHeapCB(fopAc_ac_c*);
MtxP getJointMtx(const char*);
include/d/actor/d_a_disappear.h
+3 -1
View File
@@ -5,7 +5,9 @@
class disappear_class : public fopAc_ac_c {
public:
/* Place member variables here */
/* 0x290 */ u8 m290[0x298 - 0x290];
/* 0x298 */ s32 mSwitchNo;
/* 0x29C */ s16 mTimer;
};
#endif /* D_A_DISAPPEAR_H */
include/d/actor/d_a_movie_player.h
+2 -2
View File
@@ -16,8 +16,8 @@ public:
void daMP_c_Callback_Draw(daMP_c*);
public:
/* 0x290 */ u8 m290[0x294 - 0x290];
/* 0x294 */ int m294;
/* 0x290 */ u32 (*mpCallBack1)();
/* 0x294 */ u32 (*mpCallBack2)(f32);
};
#endif /* D_A_MOVIE_PLAYER_H */
include/d/actor/d_a_obj_akabe.h
+33 -7
View File
@@ -4,22 +4,48 @@
#include "f_op/f_op_actor.h"
#include "d/d_bg_w.h"
#include "SSystem/SComponent/c_phase.h"
#include "d/d_a_obj.h"
namespace daObjAkabe {
class Act_c : public fopAc_ac_c {
public:
void prm_get_always() const {}
void prm_get_arg0() const {}
void prm_get_scl() const {}
void prm_get_swSave() const {}
enum Prm_e {
PRM_SWSAVE_W = 8,
PRM_SWSAVE_S = 0,
PRM_SCL_W = 2,
PRM_SCL_S = 8,
PRM_ALWAYS_W = 1,
PRM_ALWAYS_S = 12,
PRM_ARG0_W = 4,
PRM_ARG0_S = 16,
};
s32 prm_get_swSave() const { return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S); }
s32 prm_get_scl() const { return daObj::PrmAbstract(this, PRM_SCL_W, PRM_SCL_S); }
s32 prm_get_always() const { return daObj::PrmAbstract(this, PRM_ALWAYS_W, PRM_ALWAYS_S); }
s32 prm_get_arg0() const { return daObj::PrmAbstract(this, PRM_ARG0_W, PRM_ARG0_S); }
s32 _create();
bool create_heap();
bool _delete();
void init_scale();
void init_mtx();
bool chk_appear();
bool _execute();
bool _draw();
static BOOL solidHeapCB(fopAc_ac_c*);
static const char* const M_arcname[4];
public:
/* 0x290 */ request_of_phase_process_class mPhs;
/* 0x298 */ dBgW* mpBgW;
/* 0x29C */ Mtx mCollMtx;
/* 0x2CC */ int mType;
/* 0x29C */ Mtx mMtx;
/* 0x2CC */ s32 mType;
/* 0x2D0 */ u8 mbAppear;
/* 0x2D1 */ u8 m2D1[0x2D4 - 0x2D1];
};
};
include/d/actor/d_a_obj_cafelmp.h
+4 -1
View File
@@ -2,6 +2,7 @@
#define D_A_OBJ_CAFELMP_H
#include "f_op/f_op_actor.h"
#include "SSystem/SComponent/c_phase.h"
class daObjCafelmp_c : public fopAc_ac_c {
public:
@@ -10,11 +11,13 @@ public:
inline BOOL _draw();
inline BOOL _execute();
BOOL CreateHeap();
void CreateInit();
void set_mtx();
public:
/* Place member variables here */
/* 0x290 */ request_of_phase_process_class mPhs;
/* 0x298 */ J3DModel * mpModel;
};
#endif /* D_A_OBJ_CAFELMP_H */
include/d/actor/d_a_obj_homensmoke.h
+18 -3
View File
@@ -2,15 +2,30 @@
#define D_A_OBJ_HOMENSMOKE_H
#include "f_op/f_op_actor.h"
#include "d/d_particle.h"
#include "d/d_a_obj.h"
namespace daObjHomensmoke {
class Act_c : public fopAc_ac_c {
public:
void param_get_arg0() const {}
void param_get_axis() const {}
int param_get_arg0() const { return daObj::PrmAbstract(this, 1, 0) & 0x1; }
int param_get_axis() const { return daObj::PrmAbstract(this, 1, 1) & 0x1; }
virtual ~Act_c() {}
void set_mtx();
s32 _create();
bool _delete();
bool _execute();
bool _draw();
public:
/* Place member variables here */
/* 0x290 */ /* vtable */
/* 0x294 */ u8 m294[0x29C - 0x294];
/* 0x29C */ Mtx mMtx;
/* 0x2CC */ int mType;
/* 0x2D0 */ dPa_smokeEcallBack mSmokeCb;
/* 0x2F0 */ BOOL mbInitialized;
/* 0x2F4 */ cXyz mSmokePos;
};
};
include/d/actor/d_a_obj_pbka.h
+4 -1
View File
@@ -2,6 +2,7 @@
#define D_A_OBJ_PBKA_H
#include "f_op/f_op_actor.h"
#include "SSystem/SComponent/c_phase.h"
class daObjPbka_c : public fopAc_ac_c {
public:
@@ -10,11 +11,13 @@ public:
inline BOOL _draw();
inline BOOL _execute();
BOOL CreateHeap();
void CreateInit();
void set_mtx();
public:
/* Place member variables here */
/* 0x290 */ request_of_phase_process_class mPhase;
/* 0x298 */ J3DModel* mpModel;
};
#endif /* D_A_OBJ_PBKA_H */
include/d/actor/d_a_tbox.h
+97 -55
View File
@@ -6,28 +6,57 @@
#include "JSystem/JParticle/JPAEmitter.h"
#include "m_Do/m_Do_ext.h"
#include "SSystem/SComponent/c_phase.h"
#include "d/d_bg_w.h"
#include "d/d_particle.h"
#include "d/d_bg_s_acch.h"
#include "f_op/f_op_actor_mng.h"
class daTbox_c : public fopAc_ac_c {
public:
void action() {}
void deleteProc() {}
inline BOOL draw();
void flagCheck(unsigned short) {}
void flagClr() {}
void flagOff(unsigned short) {}
void flagOn(unsigned short) {}
void getItemNo() {}
void getPhase() {}
void getSwNo() {}
void getTboxNo() {}
void setAction(int (daTbox_c::*)()) {}
struct modelInfo {
s16 modelId;
s16 openBckId;
s16 btkId;
s16 brkId;
s16 closedColId;
s16 openColId;
};
typedef BOOL (daTbox_c::*ActionFunc)();
u8 getTboxNo() { return fopAcM_GetParam(this) >> 0x07 & 0x1F; }
int getSwNo() { return fopAcM_GetParam(this) >> 0x0C & 0xFF; }
u8 getItemNo() { return orig.angle.z >> 8 & 0xFF; }
void flagOn(u16 flag) { mFlags |= flag; }
void flagOff(u16 flag) { mFlags &= ~flag; }
void flagClr() { mFlags = 0; }
BOOL flagCheck(u16 flag) { return mFlags & flag; }
request_of_phase_process_class* getPhase() { return &mPhs; }
bool action() { return (this->*mActionFunc)(); }
void setAction(ActionFunc func) { mActionFunc = func; }
void deleteProc() {} // Maybe only used in the demo
inline BOOL draw();
BOOL execute();
s32 commonShapeSet();
s32 effectShapeSet();
s32 envShapeSet();
s32 bgCheckSet();
void searchRoomNo();
void lightReady();
BOOL checkEnv();
BOOL checkOpen();
modelInfo& getModelInfo();
void clrDzb();
void setDzb();
void surfaceProc();
BOOL checkRoomDisp(int);
s32 getShapeType();
s32 getFuncType();
BOOL checkNormal();
s32 CreateHeap();
void CreateInit();
s32 boxCheck();
void lightUpProc();
void lightDownProc();
void darkProc();
@@ -37,57 +66,70 @@ public:
void demoInitAppear();
void demoProcAppear_Tact();
void demoProcAppear();
s32 demoProc();
void OpenInit_com();
void OpenInit();
void setCollision();
BOOL actionWait();
BOOL actionDemo();
BOOL actionDemo2();
BOOL actionOpenWait();
BOOL actionSwOnWait();
BOOL actionSwOnWait2();
BOOL actionGenocide();
public:
/* 0x290 */ int mRoomNo;
/* 0x294 */ request_of_phase_process_class mResLoadDalways;
/* 0x29C */ J3DModel* mpModel1;
/* 0x2A0 */ mDoExt_bckAnm mBckAnkm;
/* 0x2B0 */ mDoExt_btkAnm* mpBtkAnm;
/* 0x2B4 */ mDoExt_brkAnm* m2B4;
/* 0x2B8 */ cBgW* m2B8;
/* 0x2BC */ void* m2BC;
/* 0x2C0 */ void* m2C0;
/* 0x2C4 */ void* m2C4;
/* 0x2C8 */ void* m2C8;
/* 0x2CC */ void* m2CC;
/* 0x2D0 */ void* m2D0;
/* 0x2D4 */ void* m2D4;
/* 0x2D8 */ void* m2D8;
/* 0x2DC */ void* m2DC;
/* 0x2E0 */ void* m2E0;
/* 0x2E4 */ void* m2E4;
/* 0x2E8 */ void* m2E8;
/* 0x2EC */ void* m2EC;
/* 0x2F0 */ void* m2F0;
/* 0x2F4 */ void* m2F4;
/* 0x2F8 */ void* m2F8;
/* 0x2FC */ void* m2FC;
/* 0x300 */ void* m300;
/* 0x304 */ void* m304;
/* 0x308 */ void* m308;
/* 0x30C */ u8 m30C[0x324 - 0x30C];
/* 0x324 */ J3DModel* mpModel;
/* 0x328 */ mDoExt_brkAnm m328;
/* 0x340 */ u8 m340[0x350 - 0x340];
/* 0x350 */ int mStaffId;
/* 0x354 */ Mtx m354;
/* 0x290 */ s32 mRoomNo;
/* 0x294 */ request_of_phase_process_class mPhs;
/* 0x29C */ J3DModel* mpChestMdl;
/* 0x2A0 */ mDoExt_bckAnm mOpenAnm;
/* 0x2B0 */ mDoExt_btkAnm* mpAppearTexAnm;
/* 0x2B4 */ mDoExt_brkAnm* mpAppearRegAnm;
/* 0x2B8 */ dBgW* mpBgWClosed;
/* 0x2BC */ dBgW* mpBgWOpen;
/* 0x2C0 */ dBgW* mpBgWVines;
/* 0x2C4 */ dBgW* mpBgWCurrent;
/* 0x2C8 */ J3DModel* mpFlashMdl;
/* 0x2CC */ mDoExt_bckAnm mFlashAnm;
/* 0x2DC */ mDoExt_btkAnm mFlashTexAnm;
/* 0x2F0 */ mDoExt_brkAnm mFlashRegAnm;
/* 0x308 */ u32 m0308;
/* 0x30C */ mDoExt_brkAnm mBrkAnm3;
/* 0x324 */ J3DModel* mpTactPlatformMdl;
/* 0x328 */ mDoExt_brkAnm mTactPlatformBrk;
/* 0x340 */ ActionFunc mActionFunc;
/* 0x34C */ f32 mInvisibleScrollVal;
/* 0x350 */ u32 mStaffId;
/* 0x354 */ Mtx mMtx;
/* 0x384 */ LIGHT_INFLUENCE mPLight;
/* 0x3A4 */ LIGHT_INFLUENCE mEfLight;
/* 0x3C4 */ u8 m3C4[0x3E4 - 0x3C4];
/* 0x3E4 */ JPABaseEmitter* m3E4;
/* 0x3C4 */ dPa_smokeEcallBack mSmokeCB;
/* 0x3E4 */ JPABaseEmitter* mSmokeEmitter;
/* 0x3E8 */ f32 mAllColRatio;
/* 0x3EC */ u8 m3EC[0x3F0 - 0x3EC];
/* 0x3F0 */ u16 m3F0;
/* 0x3F2 */ s16 m3F2;
/* 0x3F4 */ u8 m3F4[0x600 - 0x3F4];
/* 0x600 */ dCcD_Stts mStts;
/* 0x63C */ dCcD_Cyl mCyl;
/* 0x76C */ u8 mChestOpenFlagIndex;
/* 0x76D */ u8 m76D[0x770 - 0x76D];
/* 0x3EC */ f32 m03EC;
/* 0x3F0 */ u16 mFlags;
/* 0x3F2 */ u16 mOpenTimer;
/* 0x3F4 */ bool mHasOpenAnmFinished;
/* 0x3F5 */ bool mIsFlashPlaying;
/* 0x3F6 */ u16 mAppearTimer;
/* 0x3F8 */ u8 mGenocideDelayTimer;
/* 0x3FC */ dBgS_ObjAcch mObjAcch;
/* 0x5C0 */ dBgS_AcchCir mAcchCir;
/* 0x600 */ dCcD_Stts mColStatus;
/* 0x63C */ dCcD_Cyl mColCyl;
/* 0x76C */ u8 mOpenedSwitch;
};
class daTbox_HIO_c {
public:
daTbox_HIO_c();
virtual ~daTbox_HIO_c() { }
/* 0x04 */ s8 mHioId;
/* 0x06 */ s16 m06;
/* 0x08 */ s16 m08;
/* 0x0A */ s16 m0A;
/* 0x0C */ s16 m0C;
};
#endif /* D_A_TBOX_H */
include/m_Do/m_Do_dvd_thread.h
+1 -1
View File
@@ -27,7 +27,7 @@ class mDoDvdThd_param_c {
public:
mDoDvdThd_param_c();
void kick();
s32 waitForKick();
BOOL waitForKick();
mDoDvdThd_command_c* getFirstCommand();
void addition(mDoDvdThd_command_c*);
void cut(mDoDvdThd_command_c*);