From e219bb59147ba791034350e3c8a6e0abb86eb58d Mon Sep 17 00:00:00 2001 From: ItsNiklas Date: Tue, 23 Dec 2025 18:45:22 +0100 Subject: [PATCH] f_op_debug fix build --- include/f_op/f_op_actor_mng.h | 5 ++++- include/m_Do/m_Do_ext.h | 2 +- src/d/d_debug_camera.cpp | 6 ++++-- src/f_op/f_op_actor_mng.cpp | 9 +++------ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 18f19f8bbd3..8f55d692dd4 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -854,7 +854,10 @@ public: static cXyz* getCrossP() { return mLineCheck.GetCrossP(); } static cXyz& getCross() { return mLineCheck.GetCross(); } static bool lineCheck(const cXyz*, const cXyz*, const fopAc_ac_c*); - static bool getTriPla(cM3dGPla* o_tri); + static bool dummyCheck(cM3dGPla* i_plane); + static bool getTriPla(cM3dGPla* i_plane) { + return dComIfG_Bgsp().GetTriPla(mLineCheck, i_plane); + }; static s32 getWallCode() { return dComIfG_Bgsp().GetWallCode(mLineCheck); } static bool checkWallHit() { cM3dGPla poly; diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 00a8144bc34..e2aa21e8112 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -751,7 +751,7 @@ inline void mDoExt_bckAnmRemove(J3DModelData* i_modelData) { i_modelData->getJointNodePointer(0)->setMtxCalc(NULL); } -JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_parent, u32 i_alignment); +static JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_parent, u32 i_alignment); JKRSolidHeap* mDoExt_createSolidHeapFromGame(u32 i_size, u32 i_alignment); void mDoExt_destroySolidHeap(JKRSolidHeap* i_heap); u32 mDoExt_adjustSolidHeap(JKRSolidHeap* i_heap); diff --git a/src/d/d_debug_camera.cpp b/src/d/d_debug_camera.cpp index be40eadb3bd..d88b2f23b67 100644 --- a/src/d/d_debug_camera.cpp +++ b/src/d/d_debug_camera.cpp @@ -557,6 +557,8 @@ int dDbgCamera_c::moveTool() { field_0x44.Val(*sp30 - *var_r28); switch (field_0xc00) { + f32 temp_f26; + f32 temp_f1_2; case 2: *var_r28 = *var_r28 + (field_0x44.Norm() * mCamSetup.Turbo(field_0xc10 * var_f30)); @@ -571,8 +573,8 @@ int dDbgCamera_c::moveTool() { *var_r28 = *var_r28 - (field_0x44.Norm() * mCamSetup.Translate(field_0xc10 * var_f30)); break; case 3: { - f32 temp_f26 = fabsf(substick_x); - f32 temp_f1_2 = fabsf(substick_y); + temp_f26 = fabsf(substick_x); + temp_f1_2 = fabsf(substick_y); if (field_0xc0c == 0 || temp_f26 < temp_f1_2) { cXyz sp1B0(0.0f, 1.0f, 0.0f); diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 99436ac056b..2c82554890c 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -368,9 +368,7 @@ struct DummyCheckHeap { static DummyCheckHeap* dch; bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback, u32 i_size) { - s16 profName = fopAcM_GetProfName(i_actor); - char* procNameString; - fopAcM_getNameString(i_actor, procNameString); + const char* procNameString = fopAcM_getProcNameString(i_actor); JKRSolidHeap* heap00 = NULL; #if DEBUG @@ -381,7 +379,6 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback JUT_ASSERT(1211, heap); } } - #endif if (fopAcM::HeapAdjustVerbose) { @@ -2076,8 +2073,8 @@ bool fopAcM_lc_c::lineCheck(cXyz const* i_start, cXyz const* i_end, fopAc_ac_c c return dComIfG_Bgsp().LineCross(&mLineCheck); } -bool fopAcM_lc_c::getTriPla(cM3dGPla* i_plane) { - return dComIfG_Bgsp().GetTriPla(mLineCheck, i_plane); +bool fopAcM_lc_c::dummyCheck(cM3dGPla* i_plane) { + return getTriPla(i_plane); } bool fopAcM_gc_c::gndCheck(cXyz const* i_pos) {