implement various inlined functions

This commit is contained in:
Jcw87
2023-12-18 23:42:25 -08:00
parent 6af2f3a6cf
commit 02d375361d
7 changed files with 21 additions and 15 deletions
@@ -331,7 +331,7 @@ public:
virtual void calcTransform(f32, u16, J3DTransformInfo*) const;
virtual ~J3DAnmTransformKey() {}
virtual void getTransform(u16, J3DTransformInfo*) const;
virtual void getTransform(u16 param_1, J3DTransformInfo* param_2) const { calcTransform(getFrame(), param_1, param_2); }
private:
/* 0x24 */ int field_0x24;
@@ -461,7 +461,7 @@ public:
void searchUpdateMaterialID(J3DMaterialTable*);
void searchUpdateMaterialID(J3DModelData*);
virtual ~J3DAnmTevRegKey();
virtual ~J3DAnmTevRegKey() {}
virtual s32 getKind() const;
u16 getCRegUpdateMaterialNum() const { return mCRegUpdateMaterialNum; }
+5 -1
View File
@@ -1,6 +1,7 @@
#ifndef J3DPACKET_H
#define J3DPACKET_H
#include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
#include "JSystem/J3DGraphBase/J3DSys.h"
#include "dolphin/gd/GDBase.h"
#include "dolphin/types.h"
@@ -207,7 +208,10 @@ public:
bool isEnabled_Diff() const { return mpInitShapePacket->getDisplayListObj() != NULL; }
virtual ~J3DMatPacket();
virtual int entry(J3DDrawBuffer*);
virtual int entry(J3DDrawBuffer* param_1) {
J3DDrawBuffer::sortFunc func = J3DDrawBuffer::sortFuncTable[param_1->mSortType];
return (param_1->*func)(this);
}
virtual void draw();
virtual bool isSame(J3DMatPacket*) const;
+1 -1
View File
@@ -30,7 +30,7 @@ class dMsgCtrl_c {
public:
int init(u16);
int execute();
~dMsgCtrl_c();
~dMsgCtrl_c() {}
/* 0x00 */ u16 field_0x0;
/* 0x04 */ u32 mMsgID;
+3 -2
View File
@@ -40,7 +40,7 @@ STATIC_ASSERT(sizeof(daPy_mtxFollowEcallBack_c) == 0x0C);
class daPy_HIO_c {
public:
daPy_HIO_c();
daPy_HIO_c() {}
public:
/* 0x00 */ u8 temp[0x3F - 0x00];
@@ -82,6 +82,7 @@ class daPy_py_c : public fopAc_ac_c {
public:
enum daPy_FLG0 {
daPyFlg0_UNK4 = 0x00000004,
daPyFlg0_UNK8 = 0x00000008,
daPyFlg0_DEKU_SP_RETURN_FLG = 0x00000010,
daPyFlg0_CUT_AT_FLG = 0x00000040,
daPyFlg0_UNK100 = 0x00000100,
@@ -277,7 +278,7 @@ public:
virtual BOOL checkTactWait() const { return FALSE; }
virtual void setTactZev(unsigned int, int, char*) {}
virtual void onDekuSpReturnFlg(u8) {}
virtual bool checkComboCutTurn() const { return false; }
virtual BOOL checkComboCutTurn() const { return false; }
virtual f32 getBaseAnimeFrameRate() = 0;
virtual f32 getBaseAnimeFrame() = 0;
virtual u32 getItemID() const { return -1; }
+7 -6
View File
@@ -5,6 +5,7 @@
#include "d/d_attention.h"
#include "d/d_bg_s_acch.h"
#include "d/d_bg_s_lin_chk.h"
#include "d/d_com_inf_game.h"
#include "d/d_drawlist.h"
#include "d/d_bg_w.h"
#include "d/actor/d_a_player.h"
@@ -2178,28 +2179,28 @@ public:
virtual BOOL checkTactWait() const { return mCurProc == PROC_TACT_WAIT_e; }
virtual void setTactZev(unsigned int, int, char*);
virtual void onDekuSpReturnFlg(u8 i_point);
virtual bool checkComboCutTurn() const;
virtual BOOL checkComboCutTurn() const { return mCurProc == 0x55 && m3570 != 0; }
virtual f32 getBaseAnimeFrameRate() { return mFrameCtrlUnder[0].getRate(); }
virtual f32 getBaseAnimeFrame() { return mFrameCtrlUnder[0].getFrame(); }
virtual u32 getItemID() const { return mActorKeepEquip.getID(); }
virtual u32 getThrowBoomerangID() const { return mActorKeepThrow.getID(); }
virtual u32 getGrabActorID() const { return mActorKeepGrab.getID(); }
virtual BOOL checkGrabBarrel() { return checkGrabBarrelSearch(1); }
virtual BOOL checkPlayerNoDraw();
virtual BOOL checkPlayerNoDraw() { return dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 2) || checkNoResetFlg0(daPyFlg0_NO_DRAW); }
virtual BOOL checkRopeTag() { return mActorKeepEquip.getActor() == NULL; }
virtual BOOL checkRopeReadyAnime() const;
virtual BOOL checkRopeReadyAnime() const { return m_anm_heap_upper[2].mIdx == LKANM_BCK_ROPETHROWWAIT; }
virtual void voiceStart(u32);
virtual void setOutPower(f32, s16, int);
virtual void onFrollCrashFlg(u32);
virtual void onFrollCrashFlg(u32 param_1) { m3620 = param_1; onNoResetFlg0(daPyFlg0_UNK8); }
virtual MtxP getModelJointMtx(u16 idx) { return mpCLModel->getAnmMtx(idx); }
virtual f32 getOldSpeedY();
virtual f32 getOldSpeedY() { return mOldSpeed.y; }
virtual BOOL setHookshotCarryOffset(unsigned int, const cXyz*);
virtual void setPlayerPosAndAngle(cXyz*, s16);
virtual void setPlayerPosAndAngle(cXyz*, csXyz*);
virtual void setPlayerPosAndAngle(MtxP);
virtual BOOL setThrowDamage(cXyz*, s16, f32, f32, int);
virtual void changeTextureAnime(u16, u16, int);
virtual void cancelChangeTextureAnime();
virtual void cancelChangeTextureAnime() { resetDemoTextureAnime(); }
/* 0x0320 */ request_of_phase_process_class mPhsLoad;
/* 0x0328 */ J3DModelData* mpCLModelData;
+2 -2
View File
@@ -52,7 +52,7 @@ public:
OnSpl();
}
virtual ~dBgS_ObjGndChk_Spl();
virtual ~dBgS_ObjGndChk_Spl() {}
};
class dBgS_ObjGndChk_All : public dBgS_ObjGndChk {
@@ -76,4 +76,4 @@ public:
virtual ~dBgS_CamGndChk_Wtr();
};
#endif /* D_BG_D_BG_S_GND_CHK_H */
#endif /* D_BG_D_BG_S_GND_CHK_H */
+1 -1
View File
@@ -38,7 +38,7 @@ class dBgS_BoomerangLinChk : public dBgS_LinChk {
public:
dBgS_BoomerangLinChk() { SetBoomerang(); }
virtual ~dBgS_BoomerangLinChk();
virtual ~dBgS_BoomerangLinChk() {}
};
class dBgS_ArrowLinChk : public dBgS_LinChk {