mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-04 01:03:00 -04:00
clean up some inlines
This commit is contained in:
@@ -698,7 +698,6 @@ public:
|
||||
|
||||
virtual ~J3DAnmVtxColor();
|
||||
virtual void getColor(u8, u16, GXColor*) const {}
|
||||
inline J3DAnmVtxColorIndexData* getAnmVtxColorIndexData(u8 idx, u16 frame) { return &mAnmVtxColorIndexData[idx][frame]; }
|
||||
|
||||
protected:
|
||||
/* 0x10 */ u16 mAnmTableNum[2];
|
||||
|
||||
@@ -155,11 +155,11 @@ public:
|
||||
J3DMaterialAnm() { initialize(); }
|
||||
|
||||
void initialize();
|
||||
inline void setMatColorAnm(int i, J3DMatColorAnm* pAnm) { mMatColorAnm[i] = pAnm; }
|
||||
inline void setTexMtxAnm(int i, J3DTexMtxAnm* pAnm) { mTexMtxAnm[i] = pAnm; }
|
||||
inline void setTexNoAnm(int i, J3DTexNoAnm* pAnm) { mTexNoAnm[i] = pAnm; }
|
||||
inline void setTevColorAnm(int i, J3DTevColorAnm* pAnm) { mTevColorAnm[i] = pAnm; }
|
||||
inline void setTevKColorAnm(int i, J3DTevKColorAnm* pAnm) { mTevKColorAnm[i] = pAnm; }
|
||||
void setMatColorAnm(int i, J3DMatColorAnm* pAnm) { mMatColorAnm[i] = pAnm; }
|
||||
void setTexMtxAnm(int i, J3DTexMtxAnm* pAnm) { mTexMtxAnm[i] = pAnm; }
|
||||
void setTexNoAnm(int i, J3DTexNoAnm* pAnm) { mTexNoAnm[i] = pAnm; }
|
||||
void setTevColorAnm(int i, J3DTevColorAnm* pAnm) { mTevColorAnm[i] = pAnm; }
|
||||
void setTevKColorAnm(int i, J3DTevKColorAnm* pAnm) { mTevKColorAnm[i] = pAnm; }
|
||||
|
||||
virtual ~J3DMaterialAnm() {}
|
||||
virtual void calc(J3DMaterial*) const;
|
||||
|
||||
@@ -122,7 +122,7 @@ public:
|
||||
return isPushingReset;
|
||||
}
|
||||
|
||||
inline void stopMotorWave() { mRumble.stopPatternedRumbleAtThePeriod(); }
|
||||
void stopMotorWave() { mRumble.stopPatternedRumbleAtThePeriod(); }
|
||||
void stopMotor() { mRumble.stopMotor(mPortNum); }
|
||||
void stopMotorHard() { mRumble.stopMotorHard(mPortNum); }
|
||||
|
||||
|
||||
@@ -129,10 +129,22 @@ inline s16 fopAcM_GetProfName(void* pActor) {
|
||||
return fpcM_GetProfName(pActor);
|
||||
}
|
||||
|
||||
inline actor_process_profile_definition* fopAcM_GetProfile(void* pActor) {
|
||||
return (actor_process_profile_definition*)fpcM_GetProfile(pActor);
|
||||
}
|
||||
|
||||
inline void fopAcM_SetPriority(void* pActor, int priority) {
|
||||
fpcM_SetPriority(pActor, priority);
|
||||
}
|
||||
|
||||
inline u8 fopAcM_GetGroup(fopAc_ac_c* p_actor) {
|
||||
return p_actor->mGroup;
|
||||
}
|
||||
|
||||
inline void fopAcM_SetGroup(fopAc_ac_c* pActor, u8 group) {
|
||||
pActor->mGroup = group;
|
||||
}
|
||||
|
||||
inline void fopAcM_OnStatus(fopAc_ac_c* pActor, u32 flag) {
|
||||
pActor->mStatus |= flag;
|
||||
}
|
||||
@@ -154,28 +166,32 @@ inline fopAc_ac_c* fopAcM_Search(fopAcIt_JudgeFunc func, void* param) {
|
||||
return (fopAc_ac_c*)fopAcIt_Judge(func, param);
|
||||
}
|
||||
|
||||
inline cXyz& fopAcM_GetPosition_p(fopAc_ac_c* pActor) {
|
||||
return pActor->current.pos;
|
||||
inline cXyz* fopAcM_GetPosition_p(fopAc_ac_c* pActor) {
|
||||
return &pActor->current.pos;
|
||||
}
|
||||
|
||||
inline cXyz& fopAcM_GetPosition(fopAc_ac_c* pActor) {
|
||||
return pActor->current.pos;
|
||||
}
|
||||
|
||||
inline cXyz& fopAcM_GetOldPosition_p(fopAc_ac_c* pActor) {
|
||||
return pActor->old.pos;
|
||||
inline cXyz* fopAcM_GetOldPosition_p(fopAc_ac_c* pActor) {
|
||||
return &pActor->old.pos;
|
||||
}
|
||||
|
||||
inline cXyz& fopAcM_GetSpeed_p(fopAc_ac_c* pActor) {
|
||||
inline cXyz* fopAcM_GetSpeed_p(fopAc_ac_c* pActor) {
|
||||
return &pActor->speed;
|
||||
}
|
||||
|
||||
inline cXyz& fopAcM_GetSpeed(fopAc_ac_c* pActor) {
|
||||
return pActor->speed;
|
||||
}
|
||||
|
||||
inline csXyz& fopAcM_GetAngle_p(fopAc_ac_c* pActor) {
|
||||
return pActor->current.angle;
|
||||
inline csXyz* fopAcM_GetAngle_p(fopAc_ac_c* pActor) {
|
||||
return &pActor->current.angle;
|
||||
}
|
||||
|
||||
inline csXyz& fopAcM_GetShapeAngle_p(fopAc_ac_c* pActor) {
|
||||
return pActor->shape_angle;
|
||||
inline csXyz* fopAcM_GetShapeAngle_p(fopAc_ac_c* pActor) {
|
||||
return &pActor->shape_angle;
|
||||
}
|
||||
|
||||
inline bool fopAcM_CheckCondition(fopAc_ac_c* p_actor, u32 flag) {
|
||||
@@ -278,6 +294,10 @@ inline f32 fopAcM_getCullSizeFar(fopAc_ac_c* i_actor) {
|
||||
return i_actor->mCullSizeFar;
|
||||
}
|
||||
|
||||
inline void fopAcM_SetCullSize(fopAc_ac_c* i_actor, int i_culltype) {
|
||||
i_actor->mCullType = i_culltype;
|
||||
}
|
||||
|
||||
inline int fopAcM_GetCullSize(fopAc_ac_c* i_actor) {
|
||||
return i_actor->mCullType;
|
||||
}
|
||||
@@ -589,4 +609,10 @@ inline void fopAcM_offDraw(fopAc_ac_c* actor) {
|
||||
fopDwTg_DrawQTo(&actor->mDwTg);
|
||||
}
|
||||
|
||||
inline void fopAcM_getCullSizeBoxMax(fopAc_ac_c*) {}
|
||||
inline void fopAcM_getCullSizeBoxMin(fopAc_ac_c*) {}
|
||||
inline void fopAcM_monsSeStart(fopAc_ac_c*, unsigned long, Vec*, unsigned long) {}
|
||||
inline void fopAcM_getNameString(fopAc_ac_c*, char*) {}
|
||||
inline void fopAcM_orderOtherEvent(fopAc_ac_c*, char*, unsigned short) {}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -46,6 +46,10 @@ inline s32 fpcM_ChangeLayerID(void* proc, int layerID) {
|
||||
return fpcPi_Change(&((base_process_class*)proc)->mPi, layerID, fpcPi_CURRENT_e, fpcPi_CURRENT_e);
|
||||
}
|
||||
|
||||
inline void fpcM_SetPriority(void* proc, int priority) {
|
||||
fpcPi_Change(&((base_process_class*)proc)->mPi, fpcLy_CURRENT_e, priority, fpcPi_CURRENT_e);
|
||||
}
|
||||
|
||||
inline s32 fpcM_IsJustType(int type1, int type2) {
|
||||
return fpcBs_Is_JustOfType(type1, type2);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user