mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-07 11:01:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up f_op_actor_mng inlines even more

Browse Source
This commit is contained in:
LagoLunatic
2024-01-24 00:59:36 -05:00
parent 59c571a4b3
commit 319cedce22
2 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/f_op/f_op_actor_mng.h
+22 -9
View File
@@ -62,10 +62,9 @@ struct fopAcM_search4ev_prm {
};
struct fopAcM_search_prm {
/* 0x00 */ u32 mParam0;
/* 0x04 */ u32 mParam1;
/* 0x08 */ s16 mProcName;
/* 0x0A */ s8 mSubType;
/* 0x00 */ const char * mpProcName;
/* 0x04 */ u32 mParamMask;
/* 0x08 */ u32 mParameter;
};
class l_HIO {
@@ -306,17 +305,33 @@ inline int fopAcM_GetCullSize(fopAc_ac_c* i_actor) {
}
inline BOOL fopAcM_CULLSIZE_IS_BOX(int i_culltype) {
return (i_culltype >= 0 && i_culltype < 14) || i_culltype == 14;
return (i_culltype >= fopAc_CULLBOX_0_e && i_culltype < fopAc_CULLBOX_CUSTOM_e) || i_culltype == fopAc_CULLBOX_CUSTOM_e;
}
inline Vec fopAcM_getCullSizeSphereCenter(fopAc_ac_c* i_actor) {
return i_actor->mCull.mSphere.mCenter;
inline int fopAcM_CULLSIZE_IDX(int i_culltype) {
return i_culltype - fopAc_CULLBOX_0_e;
}
inline int fopAcM_CULLSIZE_Q_IDX(int i_culltype) {
return i_culltype - fopAc_CULLSPHERE_0_e;
}
inline cXyz* fopAcM_getCullSizeSphereCenter(fopAc_ac_c* i_actor) {
return (cXyz*)&i_actor->mCull.mSphere.mCenter;
}
inline f32 fopAcM_getCullSizeSphereR(fopAc_ac_c* i_actor) {
return i_actor->mCull.mSphere.mRadius;
}
inline cXyz* fopAcM_getCullSizeBoxMax(fopAc_ac_c* actor) {
return (cXyz*)&actor->mCull.mBox.mMax;
}
inline cXyz* fopAcM_getCullSizeBoxMin(fopAc_ac_c* actor) {
return (cXyz*)&actor->mCull.mBox.mMin;
}
inline void dComIfGs_onSwitch(int i_no, int i_roomNo);
inline void dComIfGs_offSwitch(int i_no, int i_roomNo);
inline BOOL dComIfGs_isSwitch(int i_no, int i_roomNo);
@@ -614,8 +629,6 @@ 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) {}