From 9e29fd3c68e471560b8910dcde3028b2a4d487cd Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 18 Oct 2024 11:33:08 -0400 Subject: [PATCH] More warning cleanup --- include/JSystem/JAudio/JASTrack.h | 2 +- include/d/actor/d_a_npc_ji1.h | 3 --- .../MSL/MSL_C/MSL_Common/Include/stdio.h | 8 ++++---- src/PowerPC_EABI_Support/Runtime/Inc/__va_arg.h | 2 +- src/d/actor/d_a_bomb2.cpp | 12 ++++++------ src/d/actor/d_a_bomb3.inc | 2 +- src/d/actor/d_a_deku_item.cpp | 8 ++++---- src/d/actor/d_a_item.cpp | 2 +- src/d/actor/d_a_lod_bg.cpp | 2 +- src/d/actor/d_a_npc_ji1.cpp | 1 + src/d/actor/d_a_npc_people.cpp | 7 +++---- src/d/actor/d_a_obj_gryw00.cpp | 12 ++++++------ src/d/actor/d_a_obj_hole.cpp | 2 +- src/d/actor/d_a_obj_ladder.cpp | 10 +++++----- src/d/actor/d_a_obj_movebox.cpp | 6 +++--- src/d/actor/d_a_obj_paper.cpp | 1 - src/d/actor/d_a_obj_timer.cpp | 4 ++-- src/d/actor/d_a_wall.cpp | 3 ++- src/d/d_2dnumber.cpp | 2 +- src/d/d_kankyo_wether.cpp | 3 +-- src/d/d_ovlp_fade2.cpp | 2 +- src/d/d_s_play.cpp | 9 ++++----- src/d/d_s_title.cpp | 4 ++-- src/f_op/f_op_msg_mng.cpp | 2 +- 24 files changed, 52 insertions(+), 57 deletions(-) diff --git a/include/JSystem/JAudio/JASTrack.h b/include/JSystem/JAudio/JASTrack.h index f1812b308..9a518f16f 100644 --- a/include/JSystem/JAudio/JASTrack.h +++ b/include/JSystem/JAudio/JASTrack.h @@ -129,7 +129,7 @@ namespace JASystem { /* 0x0C0 */ MoveParam_ mIIRs[4]; /* 0x100 */ MoveParam_ _100; /* 0x110 */ MoveParam_ _110; - }; + }; // Size: 0x120 class TimedParam_ { public: diff --git a/include/d/actor/d_a_npc_ji1.h b/include/d/actor/d_a_npc_ji1.h index 1b911f325..8ee272abf 100644 --- a/include/d/actor/d_a_npc_ji1.h +++ b/include/d/actor/d_a_npc_ji1.h @@ -4,11 +4,8 @@ #include "f_op/f_op_actor.h" #include "m_Do/m_Do_hostIO.h" #include "d/d_cc_d.h" -#include "d/d_lib.h" #include "d/d_npc.h" #include "d/d_particle.h" -#include "SSystem/SComponent/c_angle.h" -#include "JSystem/J3DGraphAnimator/J3DNode.h" class mDoExt_McaMorf; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h index e8f88ac8f..bc0cd4ada 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h @@ -1,10 +1,10 @@ #ifndef MSL_STDIO_H_ #define MSL_STDIO_H_ -#include "char_io.h" -#include "file_io.h" -#include "printf.h" -#include "extras.h" +#include "char_io.h" // IWYU pragma: export +#include "file_io.h" // IWYU pragma: export +#include "printf.h" // IWYU pragma: export +#include "extras.h" // IWYU pragma: export #define stdin (&__files._stdin) #define stdout (&__files._stdout) diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/__va_arg.h b/src/PowerPC_EABI_Support/Runtime/Inc/__va_arg.h index a2e7a45fe..229756402 100644 --- a/src/PowerPC_EABI_Support/Runtime/Inc/__va_arg.h +++ b/src/PowerPC_EABI_Support/Runtime/Inc/__va_arg.h @@ -19,7 +19,7 @@ extern "C" void* __va_arg(_va_list_struct*, int); void* __va_arg(_va_list_struct*, int); #endif -#if defined __INTELLISENSE__ +#ifndef __MWERKS__ #define __builtin_va_info(...) #define _var_arg_typeof(...) #endif diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index 004f554b9..65dc5ac5e 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -4,15 +4,15 @@ */ #include "d/actor/d_a_bomb2.h" -#include "d/d_procname.h" -#include "d/d_kankyo_wether.h" -#include "f_op/f_op_camera_mng.h" -#include "f_op/f_op_kankyo_mng.h" -#include "m_Do/m_Do_mtx.h" -#include "d/d_com_inf_game.h" #include "d/actor/d_a_sea.h" #include "d/actor/d_a_player.h" +#include "d/d_procname.h" +#include "d/d_kankyo_wether.h" +#include "d/d_com_inf_game.h" #include "d/res/res_vbakh.h" +#include "f_op/f_op_camera.h" +#include "f_op/f_op_kankyo_mng.h" +#include "m_Do/m_Do_mtx.h" // Needed for the .data section to match. static f32 dummy1[3] = {1.0f, 1.0f, 1.0f}; diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index 6f1b20a48..addc816e9 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -9,7 +9,7 @@ #include "d/actor/d_a_player_main.h" #include "d/actor/d_a_sea.h" #include "d/d_kankyo_wether.h" -#include "f_op/f_op_camera_mng.h" +#include "f_op/f_op_camera.h" #include "f_op/f_op_kankyo_mng.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_lib.h" diff --git a/src/d/actor/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp index 929551f18..0d778b64d 100644 --- a/src/d/actor/d_a_deku_item.cpp +++ b/src/d/actor/d_a_deku_item.cpp @@ -163,10 +163,10 @@ bool daDekuItem_c::_execute() { /* 00000A74-00000B30 .text mode_proc_call__12daDekuItem_cFv */ void daDekuItem_c::mode_proc_call() { static ModeFunc mode_proc[] = { - &mode_wait, - &mode_getdemo_init, - &mode_getdemo_wait, - &mode_getdemo, + &daDekuItem_c::mode_wait, + &daDekuItem_c::mode_getdemo_init, + &daDekuItem_c::mode_getdemo_wait, + &daDekuItem_c::mode_getdemo, }; (this->*mode_proc[mMode])(); diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index 11b4b78b0..0f9862532 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -10,8 +10,8 @@ #include "d/actor/d_a_sea.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include "f_op/f_op_camera.h" #include "m_Do/m_Do_mtx.h" -#include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_controller_pad.h" // Needed for the .data section to match. diff --git a/src/d/actor/d_a_lod_bg.cpp b/src/d/actor/d_a_lod_bg.cpp index f8fbe3e69..c063b9f19 100644 --- a/src/d/actor/d_a_lod_bg.cpp +++ b/src/d/actor/d_a_lod_bg.cpp @@ -12,7 +12,7 @@ #include "m_Do/m_Do_printf.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/J3DGraphLoader/J3DModelLoader.h" -#include "printf.h" +#include static Vec dummy1 = { 1.0f, 1.0f, 1.0f }; static Vec dummy2 = { 1.0f, 1.0f, 1.0f }; diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index 425579b0a..cf371f076 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -10,6 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "d/d_snap.h" +#include "d/d_lib.h" #include "f_op/f_op_msg.h" static void daNpc_Ji1_setHairAngle(daNpc_Ji1_c*); diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp index ad270ba70..843516828 100644 --- a/src/d/actor/d_a_npc_people.cpp +++ b/src/d/actor/d_a_npc_people.cpp @@ -5,18 +5,17 @@ #include "d/actor/d_a_npc_people.h" #include "d/actor/d_a_kb.h" -#include "d/actor/d_a_player_main.h" +#include "d/actor/d_a_player.h" #include "d/actor/d_a_ship.h" +#include "d/actor/d_a_dai.h" #include "d/d_procname.h" #include "d/d_com_lib_game.h" -#include "JSystem/JKernel/JKRHeap.h" -#include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" #include "d/d_camera.h" #include "d/d_a_obj.h" #include "d/d_snap.h" #include "d/d_kankyo_wether.h" -#include "d/actor/d_a_dai.h" +#include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_lib.h" extern dCcD_SrcCyl dNpc_cyl_src; diff --git a/src/d/actor/d_a_obj_gryw00.cpp b/src/d/actor/d_a_obj_gryw00.cpp index b56152e57..97aecbc22 100644 --- a/src/d/actor/d_a_obj_gryw00.cpp +++ b/src/d/actor/d_a_obj_gryw00.cpp @@ -122,7 +122,7 @@ int daObjGryw00_c::Create() { mBck.setFrame(RISE_PHASE_ANIM_LEN); mIsHidden = FALSE; - modeFunc = &high_water_level_act_proc; + modeFunc = &daObjGryw00_c::high_water_level_act_proc; mWaterLv = HIGH_WATER_LEVEL; mWaterMaxLv = HIGH_WATER_LEVEL; @@ -133,7 +133,7 @@ int daObjGryw00_c::Create() { /* Waiting state until puzzle is solved */ mIsHidden = TRUE; - modeFunc = &switch_wait_act_proc; + modeFunc = &daObjGryw00_c::switch_wait_act_proc; mWaterLv = -5; mWaterMaxLv = -5; @@ -193,13 +193,13 @@ void daObjGryw00_c::switch_wait_act_proc() { mGeyserSeRemaining = GEYSER_SOUND_LEN; mShouldPlaySe = TRUE; mIsHidden = FALSE; - modeFunc = &spread_water_face_act_proc; + modeFunc = &daObjGryw00_c::spread_water_face_act_proc; } /* 00000B50-00000BB0 .text spread_water_face_act_proc__13daObjGryw00_cFv */ void daObjGryw00_c::spread_water_face_act_proc() { if (mBtk.checkFrame(SPREAD_PHASE_ANIM_LEN)) { - modeFunc = &water_level_move_wait_act_proc; + modeFunc = &daObjGryw00_c::water_level_move_wait_act_proc; } } @@ -208,7 +208,7 @@ void daObjGryw00_c::water_level_move_wait_act_proc() { if (mBtk.checkFrame(RISE_PHASE_ANIM_LEN)) { mWaterLvIncrement = WATER_RISE_SPEED; mWaterMaxLv = HIGH_WATER_LEVEL; - modeFunc = &anime_loop_start_wait_act_proc; + modeFunc = &daObjGryw00_c::anime_loop_start_wait_act_proc; mBck.setPlaySpeed(0); mBck.setFrame(RISE_PHASE_ANIM_LEN); } @@ -219,7 +219,7 @@ void daObjGryw00_c::anime_loop_start_wait_act_proc() { if (mBtk.isStop()) { particle_delete(); setup_high_water_level_btk_anm(); - modeFunc = &high_water_level_act_proc; + modeFunc = &daObjGryw00_c::high_water_level_act_proc; } } diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp index b2b294c3b..5ff939fef 100644 --- a/src/d/actor/d_a_obj_hole.cpp +++ b/src/d/actor/d_a_obj_hole.cpp @@ -239,7 +239,7 @@ BOOL daObj_Hole_c::_createHeap() { /* 00000928-0000096C .text getArg__12daObj_Hole_cFv */ void daObj_Hole_c::getArg() { - u32 param = fopAcM_GetParamBit(fopAcM_GetParam(this), 0, 0xFFFF); + u16 param = fopAcM_GetParamBit(fopAcM_GetParam(this), 0, 16); mExitIdx = param & 0xFF; mHasModel = param >> 8; diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index 06e1a989a..3fc0be8a2 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -277,11 +277,11 @@ void daObjLadder::Act_c::init_mtx() { int daObjLadder::Act_c::Execute(Mtx** ppMtx) { typedef void (Act_c::*ModeFunc)(); static const ModeFunc mode_proc[] = { - &daObjLadder::Act_c::mode_wait, - &daObjLadder::Act_c::mode_demoreq, - &daObjLadder::Act_c::mode_vib, - &daObjLadder::Act_c::mode_drop, - &daObjLadder::Act_c::mode_fell, + &Act_c::mode_wait, + &Act_c::mode_demoreq, + &Act_c::mode_vib, + &Act_c::mode_drop, + &Act_c::mode_fell, }; demo_end_reset(); diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 961daac9b..6e15d5636 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -1013,9 +1013,9 @@ namespace daObjMovebox { void Act_c::mode_proc_call() { static ModeFunc mode_proc[] = { - &mode_wait, - &mode_walk, - &mode_afl, + &Act_c::mode_wait, + &Act_c::mode_walk, + &Act_c::mode_afl, }; (this->*mode_proc[mMode])(); } diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp index d421deaf6..1a1745b7b 100644 --- a/src/d/actor/d_a_obj_paper.cpp +++ b/src/d/actor/d_a_obj_paper.cpp @@ -17,7 +17,6 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_a_obj.h" -#include "d/d_npc.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" diff --git a/src/d/actor/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp index 92c796f10..03066701b 100644 --- a/src/d/actor/d_a_obj_timer.cpp +++ b/src/d/actor/d_a_obj_timer.cpp @@ -84,8 +84,8 @@ void daObjTimer::Act_c::mode_count() { /* 00000304-00000394 .text _execute__Q210daObjTimer5Act_cFv */ bool daObjTimer::Act_c::_execute() { static ModeFunc mode_proc[] = { - &mode_wait, - &mode_count, + &Act_c::mode_wait, + &Act_c::mode_count, }; (this->*mode_proc[mMode])(); diff --git a/src/d/actor/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp index bcd783f53..49e78c42c 100644 --- a/src/d/actor/d_a_wall.cpp +++ b/src/d/actor/d_a_wall.cpp @@ -217,7 +217,7 @@ void daWall_c::mode_break() { switch (mType) { case 0: case 1: - case 2: + case 2: { if ((mBreakCounter > 10) && cLib_chaseF(&mDst, 0.0f, 2.2222223f)) { fopAcM_delete(this); } @@ -227,6 +227,7 @@ void daWall_c::mode_break() { pEmitter->setGlobalAlpha(mDst); } break; + } default: fopAcM_delete(this); break; diff --git a/src/d/d_2dnumber.cpp b/src/d/d_2dnumber.cpp index b817df104..1af74917c 100644 --- a/src/d/d_2dnumber.cpp +++ b/src/d/d_2dnumber.cpp @@ -6,7 +6,7 @@ #include "d/d_2dnumber.h" #include "d/d_com_inf_game.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" -#include "printf.h" +#include /* 800C8498-800C84B4 .text __ct__16dDlst_2DNumber_cFv */ dDlst_2DNumber_c::dDlst_2DNumber_c() { diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index c284ffbfe..82156e5ce 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -4,11 +4,10 @@ // #include "d/d_kankyo_wether.h" -#include "JSystem/JKernel/JKRHeap.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_kankyo_rain.h" -#include "f_op/f_op_camera_mng.h" +#include "f_op/f_op_camera.h" #include "m_Do/m_Do_audio.h" /* 80086F74-80086FC4 .text dKyw_setDrawPacketList__FP9J3DPacketi */ diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index da9c8334b..47532de8e 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -118,7 +118,7 @@ void dOvlpFd2_c::execFirstSnap() { if (!cLib_calcTimer(&mTimer)) { mProc = &dOvlpFd2_c::execFadeOut; fopOvlpM_Done(this); - mTimer = 244; + mTimer = -12; } dComIfGp_setWindowNum(0); diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 17684ccc2..aff9ac167 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -37,8 +37,7 @@ #include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" -#include "printf.h" -#include "string.h" +#include static Vec dummy_3569; @@ -1505,7 +1504,7 @@ static scene_method_class l_dScnPly_Method = { (process_method_func)dScnPly_Draw, }; -extern scene_process_profile_definition g_profile_PLAY_SCENE = { +scene_process_profile_definition g_profile_PLAY_SCENE = { fpcLy_ROOT_e, 1, fpcPi_CURRENT_e, @@ -1518,7 +1517,7 @@ extern scene_process_profile_definition g_profile_PLAY_SCENE = { &l_dScnPly_Method, }; -extern scene_process_profile_definition g_profile_OPENING_SCENE = { +scene_process_profile_definition g_profile_OPENING_SCENE = { fpcLy_ROOT_e, 1, fpcPi_CURRENT_e, @@ -1531,7 +1530,7 @@ extern scene_process_profile_definition g_profile_OPENING_SCENE = { &l_dScnPly_Method, }; -extern scene_process_profile_definition g_profile_OPENING2_SCENE = { +scene_process_profile_definition g_profile_OPENING2_SCENE = { fpcLy_ROOT_e, 1, fpcPi_CURRENT_e, diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index 8f6264afc..680bff650 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -133,7 +133,7 @@ static scene_method_class l_dScnTitle_Method = { (process_method_func)dScnTitle_Draw, }; -extern scene_process_profile_definition g_profile_TITLE_SCENE = { +scene_process_profile_definition g_profile_TITLE_SCENE = { fpcLy_ROOT_e, 1, fpcPi_CURRENT_e, @@ -146,7 +146,7 @@ extern scene_process_profile_definition g_profile_TITLE_SCENE = { &l_dScnTitle_Method, }; -extern scene_process_profile_definition g_profile_ENDING_SCENE = { +scene_process_profile_definition g_profile_ENDING_SCENE = { fpcLy_ROOT_e, 1, fpcPi_CURRENT_e, diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 2820c7eae..7ee6ef201 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -13,7 +13,7 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "SSystem/SComponent/c_malloc.h" -#include "printf.h" +#include static bool pushButton; static bool pushButton2;