diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-12-23 18:53:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-23 15:53:10 -0800 |
| commit | 877889c5105e59ee3aa4e57e53d3b0c5ffcfca77 (patch) | |
| tree | 154eddaea39971210e088cb828f80d38b998f998 /src/d/actor/d_a_e_mk.cpp | |
| parent | 6ef13c620a46aed5fea525699a4832a1ad6e4d1f (diff) | |
Clean up code, remove fakematches, add UNUSED, enable warnings (#2992)
* Remove NDEBUG_DEFINED fakematch, clean up getName temps
* Fix ifdef
* Fix bad JSystem pch ifdef breaking decomp.me
* Remove Acch Chk fakematches
* Private Acch fields
* Fix some clangd errors in headers
* Add UNUSED macro for matching debug parameters
* Enable clangd unused-parameter warning
* Remove extern from initializers
Probably added by dol2asm?
* Fix process profile definitions
* Remove leftover dol2asm address comments
* Remove some unnecessary double casts
* Enable some more clangd warnings
* Fix missing usages of fopAcM_ct
* Fix wrong enum usage
* Fix more fakematches
Diffstat (limited to 'src/d/actor/d_a_e_mk.cpp')
| -rw-r--r-- | src/d/actor/d_a_e_mk.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index 342145b851..50a598f172 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -115,7 +115,7 @@ static int daE_MK_Draw(e_mk_class* i_this) { } static void* s_obj_delete(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if (fopAcM_IsActor(i_actor)) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; @@ -137,10 +137,8 @@ static cXyz demo_jump_pos_3(2400.0f, 1115.0f, -1850.0f); static cXyz STAGE_CENTER_POS; -/* 8071CB08 0002+00 data_8071CB08 STAGE_ANGLE_Y */ static s16 STAGE_ANGLE_Y; -/* 8071CB0A 0001+00 .bss */ u8 hio_set; static daE_MK_HIO_c l_HIO; @@ -150,7 +148,7 @@ static void* target_info[20]; static int target_info_count; static void* s_h_sub(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Pillar) && target_info_count < 20) { target_info[target_info_count] = (daPillar_c*)i_actor; @@ -219,7 +217,7 @@ static daPillar_c* search_hasira(e_mk_class* i_this) { } static void* s_d_sub(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DB)) { e_db_class* actor = (e_db_class*)i_actor; @@ -1942,7 +1940,7 @@ static void demo_camera_end(e_mk_class* i_this) { } static void* s_ks_sub(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) && static_cast<npc_ks_class*>(i_actor)->set_id == 0) { return i_actor; @@ -1952,7 +1950,7 @@ static void* s_ks_sub(void* i_actor, void* i_data) { } static void* s_brg_sub(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_BRG) { static_cast<obj_brg_class*>(i_actor)->field_0xaef4 = VREG_F(11) + 500.0f; @@ -1963,7 +1961,7 @@ static void* s_brg_sub(void* i_actor, void* i_data) { } static void* s_brg_sub2(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_BRG) { static_cast<obj_brg_class*>(i_actor)->mType &= ~0x4 & 0xFFFFFFFB; @@ -2952,7 +2950,7 @@ static actor_method_class l_daE_MK_Method = { (process_method_func)daE_MK_Draw, }; -extern actor_process_profile_definition g_profile_E_MK = { +actor_process_profile_definition g_profile_E_MK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio |