encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

more misc. cleanup (#2232)

Browse Source
This commit is contained in:
Caroline Madsen
2024-10-31 17:36:11 -07:00
committed by GitHub
parent 30777a85b5
commit 09423b6fa0
121 changed files with 2254 additions and 17343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_do.h
+1 -1
View File
@@ -63,7 +63,7 @@ struct daDo_HIO_tmp {
class daDo_HIO_c {
public:
/* 80667D4C */ daDo_HIO_c();
/* 8066ED40 */ virtual ~daDo_HIO_c(); // should be inlined
/* 8066ED40 */ virtual ~daDo_HIO_c() {}
/* 0x04 */ s8 field_0x04;
/* 0x08 */ f32 mBaseSize;
include/d/actor/d_a_dshutter.h
+11 -11
View File
@@ -18,10 +18,10 @@ public:
public:
typedef int (daDsh_c::*actionFunc)();
/* action_c(actionFunc i_initFunc, actionFunc i_execFunc) {
action_c(actionFunc i_initFunc, actionFunc i_execFunc) {
mInitFunc = i_initFunc;
mExecuteFunc = i_execFunc;
} */
}
actionFunc& getInit() { return mInitFunc; }
actionFunc& getExecute() { return mExecuteFunc; }
@@ -65,15 +65,15 @@ public:
f32 getCloseBoundSpeed() { return CLOSE_BOUND_SPEED; }
f32 getCloseBoundRatio() { return CLOSE_BOUND_RATIO; }
static f32 OPEN_SIZE;
static f32 OPEN_ACCEL;
static f32 OPEN_SPEED;
static f32 OPEN_BOUND_SPEED;
static f32 OPEN_BOUND_RATIO;
static f32 CLOSE_ACCEL;
static f32 CLOSE_SPEED;
static f32 CLOSE_BOUND_SPEED;
static f32 CLOSE_BOUND_RATIO;
static f32 const OPEN_SIZE;
static f32 const OPEN_ACCEL;
static f32 const OPEN_SPEED;
static f32 const OPEN_BOUND_SPEED;
static f32 const OPEN_BOUND_RATIO;
static f32 const CLOSE_ACCEL;
static f32 const CLOSE_SPEED;
static f32 const CLOSE_BOUND_SPEED;
static f32 const CLOSE_BOUND_RATIO;
/* 0x5A0 */ dComIfG_resLoader_c mResLoader;
/* 0x5B0 */ J3DModel* mpModel;
include/d/actor/d_a_e_ba.h
+1 -1
View File
@@ -79,7 +79,7 @@ public:
/* 0x698 */ f32 mKnockbackSpeed;
/* 0x69C */ s16 mKnockbackAngle;
/* 0x69E */ csXyz mChanceAngle;
/* 0x6A4 */ bool mIsDying;
/* 0x6A4 */ s8 mIsDying;
/* 0x6A6 */ s16 mTimer[4];
/* 0x6AE */ s16 mIFrames;
/* 0x6B0 */ cXyz field_0x6b0;
include/d/actor/d_a_nbomb.h
+6 -3
View File
@@ -76,9 +76,12 @@ public:
/* 804CAEE8 */ int execute();
/* 804CBC60 */ int draw();
virtual BOOL checkExplodeNow();
virtual void deleteBombAndEffect();
virtual void setCargoBombExplode();
virtual BOOL checkExplodeNow() { return field_0xb51 != 0; }
virtual void deleteBombAndEffect() {
fopAcM_delete(this);
onStateFlg0(FLG0_UNK_40);
}
virtual void setCargoBombExplode() { onStateFlg0(FLG0_BOMB_HIT); }
void onStateFlg0(daNbomb_FLG0 i_flag) { mStateFlg0 |= i_flag; }
void offStateFlg0(daNbomb_FLG0 i_flag) { mStateFlg0 &= ~i_flag; }
include/d/actor/d_a_obj_carry.h
+1 -1
View File
@@ -208,7 +208,7 @@ public:
}
static u8 const mData[2072];
static Vec mPos[5];
static cXyz mPos[5];
static u8 mSttsFlag[5];
static s8 mRoomNo[5];
static bool mSaveFlag;
include/d/actor/d_a_obj_movebox.h
+1 -1
View File
@@ -191,7 +191,7 @@ namespace daObjMovebox {
void off_switch1() const { fopAcM_offSwitch(this, prm_get_swSave1()); }
void off_switch2() const { fopAcM_offSwitch(this, prmZ_get_swSave2()); }
static s16 M_dir_base[4];
static const s16 M_dir_base[4];
static const char* const M_arcname[8];
static const dCcD_SrcCyl M_cyl_src;
static const daObjMovebox::Hio_c::Attr_c M_attr[8];
include/d/actor/d_a_player.h
+1 -1
View File
@@ -945,7 +945,7 @@ public:
inline BOOL i_checkSwordGet();
inline bool i_checkShieldGet() const;
inline static BOOL checkNowWolf();
inline static u32 i_checkNowWolf() { return dComIfGp_getLinkPlayer()->checkWolf(); }
inline static u32 i_checkNowWolf() { return ((daPy_py_c*)dComIfGp_getLinkPlayer())->checkWolf(); }
inline bool checkZoraWearFlg() const;
inline bool checkMagicArmorWearFlg() const;
inline static BOOL i_checkFirstMidnaDemo() { return dComIfGs_isEventBit(0xc10); }
include/d/actor/d_a_suspend.h
+5 -5
View File
@@ -21,8 +21,8 @@ public:
/* 800310C8 */ u8 check(fopAc_ac_c*);
/* 80031038 */ bool check(cXyz const&);
/* 80031150 */ void execute();
/* 80031F28 */ ~data_c();
/* 80031F64 */ data_c();
/* 80031F28 */ ~data_c() {}
/* 80031F64 */ data_c() { reset(); }
void setNext(data_c* i_next) { mpNext = i_next; }
data_c* getNext() { return mpNext; }
@@ -44,7 +44,7 @@ public:
public:
/* 80031190 */ void add(daSus_c::data_c*);
/* 800311FC */ void reset();
/* 80031EE4 */ room_c();
/* 80031EE4 */ room_c() { init(); }
void init() { mpData = NULL; }
/* 0x0 */ data_c* mpData;
@@ -68,8 +68,8 @@ public:
u8 getSw() { return fopAcM_GetParam(this) & 0xFF; }
u8 getRoom() { return fopAcM_GetParam(this) >> 10; }
static u8 mData[1152];
static u8 mRoom[256];
static data_c mData[0x20];
static room_c mRoom[0x40];
static s16 mSetTop;
};
include/d/actor/d_a_ykgr.h
+20 -18
View File
@@ -8,21 +8,27 @@
#include "d/d_com_inf_game.h"
#include "d/d_particle.h"
struct daYkgr_HIO_c {
/* 805A8D98 */ ~daYkgr_HIO_c();
struct daYkgr_HIO_c : mDoHIO_entry_c {
daYkgr_HIO_c();
/* 805A8D98 */ virtual ~daYkgr_HIO_c();
u32 vtable;
u8 field_0x4[0x20 - 0x4];
f32 field_0x20;
f32 field_0x24;
/* 0x04 */ u8 field_0x4;
/* 0x08 */ s32 field_0x8;
/* 0x0C */ s32 field_0xc;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
};
struct dPa_YkgrPcallBack /*: public JPAParticleCallBack */ {
/* 805A8E3C */ ~dPa_YkgrPcallBack();
struct dPa_YkgrPcallBack : public JPAParticleCallBack {
dPa_YkgrPcallBack();
/* 805A8E3C */ ~dPa_YkgrPcallBack() {}
/* 805A848C */ void draw(JPABaseEmitter*, JPABaseParticle*);
/* 805A84D4 */ void setParam(f32);
u32 vtable;
/* 0x04 */ f32 field_0x4;
/* 0x08 */ f32 field_0x8;
/* 0x0C */ f32 field_0xc;
@@ -32,10 +38,6 @@ struct dPa_YkgrPcallBack /*: public JPAParticleCallBack */ {
/* 0x1C */ s8 field_0x1c;
};
extern "C" u8 m_flag__8daYkgr_c;
extern "C" u8 m_alpha_flag__8daYkgr_c;
extern "C" u8 m_alpha__8daYkgr_c;
/**
* @ingroup actors-unsorted
* @class daYkgr_c
@@ -94,11 +96,11 @@ public:
static f32 m_aim_rate;
static dPath* m_path;
u8 field_0x568[0x570 - 0x568];
Mtx field_0x570;
u32 field_0x5a0;
f32 field_0x5a4;
f32 field_0x5a8;
/* 0x568 */ u8 field_0x568[0x570 - 0x568];
/* 0x570 */ Mtx field_0x570;
/* 0x5A0 */ u32 field_0x5a0;
/* 0x5A4 */ f32 field_0x5a4;
/* 0x5A8 */ f32 field_0x5a8;
};
STATIC_ASSERT(sizeof(daYkgr_c) == 0x5AC);