diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-03-11 18:12:15 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-03-11 18:12:15 -0400 |
| commit | 029ddf6bb978f76c55fc98ef9079abd5fc0bbdf2 (patch) | |
| tree | b076203d7a1552e6f63aebb6478c737c12b470fd /include | |
| parent | 44761305b99127ee12c72c01030a750c9c77de0b (diff) | |
minor inline cleanup
Diffstat (limited to 'include')
| -rw-r--r-- | include/f_op/f_op_actor_mng.h | 14 | ||||
| -rw-r--r-- | include/f_pc/f_pc_manager.h | 14 | ||||
| -rw-r--r-- | include/m_Do/m_Do_lib.h | 4 |
3 files changed, 12 insertions, 20 deletions
diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index aa9d38b8..8b9ce737 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -16,9 +16,7 @@ fopAcM_OnCondition(ptr, fopAcCnd_INIT_e); \ } -class J3DModelData; // placeholder -class JKRHeap; -class cM3dGPla; +class J3DModelData; class daItem_c; struct fopAcM_prmBase_class { @@ -79,10 +77,6 @@ class dKy_tevstr_c; typedef int (*heapCallbackFunc)(fopAc_ac_c*); typedef int (*createFunc)(void*); -// struct DOUBLE_POS { -// double x, y, z; -// }; - inline s8 fopAcM_GetRoomNo(fopAc_ac_c* pActor) { return pActor->current.roomNo; } @@ -99,7 +93,7 @@ inline MtxP fopAcM_GetMtx(fopAc_ac_c* pActor) { return pActor->cullMtx; } -inline bool fopAcM_checkStatus(fopAc_ac_c* pActor, u32 status) { +inline bool fopAcM_CheckStatus(fopAc_ac_c* pActor, u32 status) { return pActor->actor_status & status; } @@ -108,7 +102,7 @@ inline u32 fopAcM_checkCarryNow(fopAc_ac_c* pActor) { } inline u32 fopAcM_checkHookCarryNow(fopAc_ac_c* pActor) { - return fopAcM_checkStatus(pActor, fopAcStts_HOOK_CARRY_e); + return fopAcM_CheckStatus(pActor, fopAcStts_HOOK_CARRY_e); } inline u32 fopAcM_GetParam(void* pActor) { @@ -566,8 +560,6 @@ void fopAcM_cancelCarryNow(fopAc_ac_c* i_this); s32 fopAcM_otoCheck(fopAc_ac_c*, f32); BOOL fopAcM_viewCutoffCheck(fopAc_ac_c* actor, f32 param_2); BOOL fopAcM_getGroundAngle(fopAc_ac_c* actor, csXyz* p_angle); -// void vectle_calc(DOUBLE_POS*, cXyz*); -// void get_vectle_calc(cXyz*, cXyz*, cXyz*); static const char* fopAcM_getProcNameString(fopAc_ac_c* p_actor); diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h index 97876450..e62a5db3 100644 --- a/include/f_pc/f_pc_manager.h +++ b/include/f_pc/f_pc_manager.h @@ -15,13 +15,13 @@ typedef int (*FastCreateReqFunc)(void*); typedef void (*fpcM_ManagementFunc)(void); typedef int (*fpcM_DrawIteraterFunc)(void*, void*); -inline u32 fpcM_GetID(const void* pProc) { +inline u32 fpcM_GetID(void* pProc) { return pProc != NULL ? ((base_process_class*)pProc)->mBsPcId : fpcM_ERROR_PROCESS_ID_e; } -inline s16 fpcM_GetName(const void* pActor) { +inline s16 fpcM_GetName(void* pActor) { return ((base_process_class*)pActor)->mProcName; } -inline u32 fpcM_GetParam(const void* pActor) { +inline u32 fpcM_GetParam(void* pActor) { return ((base_process_class*)pActor)->mParameters; } @@ -29,7 +29,7 @@ inline void fpcM_SetParam(void* p_actor, u32 param) { ((base_process_class*)p_actor)->mParameters = param; } -inline s16 fpcM_GetProfName(const void* pActor) { +inline s16 fpcM_GetProfName(void* pActor) { return ((base_process_class*)pActor)->mProfName; } @@ -38,7 +38,7 @@ inline int fpcM_Create(s16 procName, FastCreateReqFunc createFunc, void* process process); } -inline s16 fpcM_DrawPriority(const void* param_0) { +inline s16 fpcM_DrawPriority(void* param_0) { return fpcLf_GetPriority((leafdraw_class*)param_0); } @@ -62,7 +62,7 @@ inline process_profile_definition* fpcM_GetProfile(void* proc) { return (process_profile_definition*)((base_process_class*)proc)->mpProf; } -inline void* fpcM_GetAppend(const void* proc) { +inline void* fpcM_GetAppend(void* proc) { return ((base_process_class*)proc)->mpUserData; } @@ -74,7 +74,7 @@ inline void* fpcM_LyJudge(process_node_class* i_node, fpcLyIt_JudgeFunc i_func, return fpcLyIt_Judge(&i_node->mLayer, i_func, i_data); } -inline s8 fpcM_CreateResult(const void* pActor) { +inline s8 fpcM_CreateResult(void* pActor) { return ((base_process_class*)pActor)->mCreateResult; } diff --git a/include/m_Do/m_Do_lib.h b/include/m_Do/m_Do_lib.h index 436208f9..c083a60f 100644 --- a/include/m_Do/m_Do_lib.h +++ b/include/m_Do/m_Do_lib.h @@ -14,8 +14,8 @@ struct mDoLib_clipper { mClipper.calcViewFrustum(); } - static s32 clip(const Mtx m, const Vec* max, const Vec* min) { - return mClipper.clip(m, (Vec*)max, (Vec*)min); + static s32 clip(const Mtx m, Vec* max, Vec* min) { + return mClipper.clip(m, max, min); } static s32 clip(const Mtx m, Vec center, f32 radius) { |
