From dd03bf861fdc92109c57d58cc7436066a8a02430 Mon Sep 17 00:00:00 2001 From: kipcode66 Date: Mon, 12 Jan 2026 17:48:25 -0500 Subject: [PATCH] standard compiler compatibility changes (#3040) * move math to cmath * replace stdarg to cstdarg * change stdint to stdint.h * minor fixes * change stdio to cstdio * change stdlib to stdlib * renamed ctype to cctype * fix missing argument for UNSET_FLAG --- include/JSystem/J2DGraph/J2DPrint.h | 2 +- include/JSystem/J3DGraphBase/J3DMaterial.h | 2 +- include/JSystem/J3DGraphBase/J3DPacket.h | 2 +- include/JSystem/J3DGraphBase/J3DTexture.h | 2 +- include/JSystem/JAudio2/JAISeqDataMgr.h | 2 +- include/JSystem/JAudio2/JAUStreamAramMgr.h | 2 +- include/JSystem/JGadget/std-vector.h | 2 +- include/JSystem/JHostIO/JORMContext.h | 2 +- include/JSystem/JKernel/JKRExpHeap.h | 2 +- include/JSystem/JMath/JMATrigonometric.h | 2 +- include/JSystem/JMath/JMath.h | 2 +- include/JSystem/JParticle/JPAEmitter.h | 2 +- .../JSystem/JStudio/JStudio/functionvalue.h | 2 +- .../JSystem/JStudio/JStudio/jstudio-math.h | 2 +- .../JSystem/JStudio/JStudio/jstudio-object.h | 2 +- include/JSystem/JSupport/JSupport.h | 2 +- include/JSystem/JUtility/JUTConsole.h | 2 +- include/JSystem/JUtility/JUTDirectPrint.h | 2 +- include/JSystem/JUtility/JUTException.h | 2 +- include/JSystem/JUtility/JUTTexture.h | 2 +- include/SSystem/SComponent/c_m3d.h | 2 +- include/SSystem/SComponent/c_xyz.h | 2 +- include/d/actor/d_a_obj_dust.h | 2 +- include/d/d_menu_dmap_map.h | 2 +- include/d/dolzel_base.pch | 2 +- include/revolution/dvd.h | 3 +- include/revolution/wpad/bte.h | 2 +- src/CaptureScreen.cpp | 1 + src/DynamicLink.cpp | 2 +- src/JSystem/J2DGraph/J2DPrint.cpp | 4 +- src/JSystem/J2DGraph/J2DTevs.cpp | 2 +- src/JSystem/J3DGraphBase/J3DShapeDraw.cpp | 2 +- src/JSystem/J3DU/J3DUClipper.cpp | 2 +- src/JSystem/JAHostIO/JAHioUtil.cpp | 2 +- src/JSystem/JAudio2/JASAiCtrl.cpp | 2 +- src/JSystem/JAudio2/JASAudioThread.cpp | 2 +- src/JSystem/JAudio2/JASBasicWaveBank.cpp | 2 +- src/JSystem/JAudio2/JASCalc.cpp | 2 +- src/JSystem/JAudio2/JASReport.cpp | 2 +- src/JSystem/JAudio2/JASSimpleWaveBank.cpp | 2 +- src/JSystem/JAudio2/JASWaveArcLoader.cpp | 2 +- src/JSystem/JFramework/JFWDisplay.cpp | 2 +- src/JSystem/JGadget/binary.cpp | 2 +- src/JSystem/JGadget/define.cpp | 2 +- src/JSystem/JGadget/std-stream.cpp | 2 +- src/JSystem/JKernel/JKRAramArchive.cpp | 2 +- src/JSystem/JKernel/JKRAramStream.cpp | 2 +- src/JSystem/JKernel/JKRArchivePri.cpp | 2 +- src/JSystem/JKernel/JKRCompArchive.cpp | 4 +- src/JSystem/JKernel/JKRDvdArchive.cpp | 4 +- src/JSystem/JKernel/JKRDvdFile.cpp | 2 +- src/JSystem/JKernel/JKRDvdRipper.cpp | 2 +- src/JSystem/JKernel/JKRExpHeap.cpp | 2 +- src/JSystem/JKernel/JKRFileCache.cpp | 2 +- src/JSystem/JKernel/JKRFileLoader.cpp | 2 +- src/JSystem/JKernel/JKRHeap.cpp | 2 +- src/JSystem/JKernel/JKRMemArchive.cpp | 2 +- src/JSystem/JKernel/JKRSolidHeap.cpp | 4 +- src/JSystem/JKernel/JKRThread.cpp | 4 +- src/JSystem/JMath/JMATrigonometric.cpp | 2 +- src/JSystem/JStudio/JStudio/functionvalue.cpp | 18 +++++- src/JSystem/JStudio/JStudio/jstudio-math.cpp | 2 +- .../JStudio/JStudio/stb-data-parse.cpp | 2 +- src/JSystem/JUtility/JUTAssert.cpp | 2 +- src/JSystem/JUtility/JUTCacheFont.cpp | 2 +- src/JSystem/JUtility/JUTConsole.cpp | 2 +- src/JSystem/JUtility/JUTDbPrint.cpp | 2 +- src/JSystem/JUtility/JUTDirectFile.cpp | 2 +- src/JSystem/JUtility/JUTDirectPrint.cpp | 2 +- src/JSystem/JUtility/JUTException.cpp | 8 +-- src/JSystem/JUtility/JUTGamePad.cpp | 2 +- src/JSystem/JUtility/JUTGraphFifo.cpp | 2 +- src/JSystem/JUtility/JUTProcBar.cpp | 2 +- .../MSL_Common/Include/{stdint => stdint.h} | 0 .../MSL_Common/Include/{ctype => cctype} | 0 .../MSL/MSL_C/MSL_Common/Include/cmath | 56 +++++++++++++++++ .../MSL/MSL_C/MSL_Common/Include/cstdio | 20 ++++++ .../MSL/MSL_C/MSL_Common/Include/cstdlib | 14 +++++ .../MSL/MSL_C/MSL_Common/Include/math | 62 ------------------- .../MSL/MSL_C/MSL_Common/Src/ctype.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/extras.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/file_io.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/locale.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/printf.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/scanf.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/strtold.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/strtoul.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/wctype.c | 2 +- src/SSystem/SComponent/c_m3d.cpp | 5 ++ src/SSystem/SComponent/c_math.cpp | 2 +- src/SSystem/SComponent/c_xyz.cpp | 5 ++ .../embedded/MetroTRK/Portable/mem_TRK.c | 2 +- .../MetroTRK/Processor/ppc/Generic/targimpl.c | 2 +- src/Z2AudioLib/Z2Calc.cpp | 2 +- src/Z2AudioLib/Z2SoundObject.cpp | 5 ++ src/d/actor/d_a_b_bq.cpp | 2 +- src/d/actor/d_a_b_tn.cpp | 2 +- src/d/actor/d_a_b_zant.cpp | 2 +- src/d/actor/d_a_b_zant_magic.cpp | 2 +- src/d/actor/d_a_b_zant_mobile.cpp | 2 +- src/d/actor/d_a_bg_obj.cpp | 2 +- src/d/actor/d_a_cow.cpp | 22 +++---- src/d/actor/d_a_e_dk.cpp | 2 +- src/d/actor/d_a_e_sw.cpp | 2 +- src/d/actor/d_a_e_vt.cpp | 2 +- src/d/actor/d_a_e_ws.cpp | 2 +- src/d/actor/d_a_e_ymb.cpp | 2 +- src/d/actor/d_a_horse.cpp | 2 +- src/d/actor/d_a_kago.cpp | 2 +- src/d/actor/d_a_mg_rod.cpp | 5 +- src/d/actor/d_a_npc_henna.cpp | 2 +- src/d/actor/d_a_obj_bhbridge.cpp | 2 +- src/d/actor/d_a_obj_carry.cpp | 2 +- src/d/actor/d_a_obj_cwall.cpp | 2 +- src/d/actor/d_a_obj_digsnow.cpp | 2 +- src/d/actor/d_a_obj_drop.cpp | 2 +- src/d/actor/d_a_obj_gra2_soldier.inc | 2 +- src/d/actor/d_a_obj_ice_l.cpp | 2 +- src/d/actor/d_a_obj_ice_s.cpp | 2 +- src/d/actor/d_a_obj_kanban2.cpp | 2 +- src/d/actor/d_a_obj_lv4digsand.cpp | 2 +- src/d/actor/d_a_obj_pdoor.cpp | 2 +- src/d/actor/d_a_obj_shield.cpp | 2 +- src/d/actor/d_a_obj_stone.cpp | 2 +- src/d/actor/d_a_obj_swturn.cpp | 2 +- src/d/actor/d_a_obj_wdStick.cpp | 2 +- src/d/actor/d_a_set_bgobj.cpp | 2 +- src/d/actor/d_a_tag_camera.cpp | 2 +- src/d/actor/d_a_tag_chkpoint.cpp | 2 +- src/d/actor/d_a_tag_firewall.cpp | 2 +- src/d/actor/d_a_tag_sppath.cpp | 2 +- src/d/actor/d_a_tbox.cpp | 2 +- src/d/d_bg_w_kcol.cpp | 2 +- src/d/d_camera.cpp | 2 +- src/d/d_com_inf_game.cpp | 2 +- src/d/d_com_static.cpp | 2 +- src/d/d_file_sel_info.cpp | 2 +- src/d/d_kankyo.cpp | 2 +- src/d/d_menu_dmap_map.cpp | 2 +- src/d/d_menu_fmap.cpp | 2 +- src/d/d_menu_insect.cpp | 2 +- src/d/d_menu_item_explain.cpp | 2 +- src/d/d_menu_letter.cpp | 2 +- src/d/d_menu_ring.cpp | 2 +- src/d/d_menu_save.cpp | 2 +- src/d/d_msg_class.cpp | 2 +- src/d/d_msg_object.cpp | 2 +- src/d/d_msg_scrn_explain.cpp | 2 +- src/d/d_msg_unit.cpp | 2 +- src/d/d_name.cpp | 2 +- src/d/d_particle.cpp | 2 +- src/d/d_resorce.cpp | 2 +- src/d/d_s_menu.cpp | 2 +- src/d/d_s_room.cpp | 2 +- src/d/d_save.cpp | 2 +- src/d/d_stage.cpp | 2 +- src/m_Do/m_Do_MemCardRWmng.cpp | 2 +- src/m_Do/m_Do_ext.cpp | 2 +- src/m_Do/m_Do_printf.cpp | 2 +- .../homebuttonLib/nw4hbm/db/assert.h | 2 +- .../homebuttonLib/nw4hbm/math/arithmetic.h | 4 +- .../homebuttonLib/nw4hbm/math/triangular.h | 4 +- .../homebuttonLib/nw4hbm/ut/TextWriterBase.h | 2 +- src/revolution/homebuttonLib/sound/synenv.cpp | 2 +- 164 files changed, 296 insertions(+), 240 deletions(-) rename src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/{stdint => stdint.h} (100%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{ctype => cctype} (100%) delete mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h index be06e01c2..aa0ffbdcf 100644 --- a/include/JSystem/J2DGraph/J2DPrint.h +++ b/include/JSystem/J2DGraph/J2DPrint.h @@ -2,7 +2,7 @@ #define J2DPRINT_H #include "JSystem/J2DGraph/J2DTextBox.h" -#include +#include class JUTFont; class J2DPrint; diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index 462849c84..dcb74c1f4 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -4,7 +4,7 @@ #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "JSystem/J3DGraphBase/J3DPacket.h" #include "JSystem/J3DGraphBase/J3DShape.h" -#include +#include class J3DJoint; class J3DMaterialAnm; diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h index 95ab7f18a..374c41ebd 100644 --- a/include/JSystem/J3DGraphBase/J3DPacket.h +++ b/include/JSystem/J3DGraphBase/J3DPacket.h @@ -6,7 +6,7 @@ #include "JSystem/J3DGraphBase/J3DEnum.h" #include "dolphin/gd/GDBase.h" #include "dolphin/mtx.h" -#include +#include class J3DMatPacket; diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h index 152f552b4..177df65a3 100644 --- a/include/JSystem/J3DGraphBase/J3DTexture.h +++ b/include/JSystem/J3DGraphBase/J3DTexture.h @@ -5,7 +5,7 @@ #include "JSystem/J3DAssert.h" #include "JSystem/JUtility/JUTTexture.h" #include "global.h" -#include +#include /** * @ingroup jsystem-j3d diff --git a/include/JSystem/JAudio2/JAISeqDataMgr.h b/include/JSystem/JAudio2/JAISeqDataMgr.h index c207f0878..510f1f490 100644 --- a/include/JSystem/JAudio2/JAISeqDataMgr.h +++ b/include/JSystem/JAudio2/JAISeqDataMgr.h @@ -2,7 +2,7 @@ #define JAISEQDATAMGR_H #include "JSystem/JAudio2/JAISound.h" -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JAUStreamAramMgr.h b/include/JSystem/JAudio2/JAUStreamAramMgr.h index d33306d32..bf861b495 100644 --- a/include/JSystem/JAudio2/JAUStreamAramMgr.h +++ b/include/JSystem/JAudio2/JAUStreamAramMgr.h @@ -6,7 +6,7 @@ #include "JSystem/JAudio2/JASHeapCtrl.h" #include "JSystem/JUtility/JUTAssert.h" #include -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JGadget/std-vector.h b/include/JSystem/JGadget/std-vector.h index 33cea8a0a..74553888c 100644 --- a/include/JSystem/JGadget/std-vector.h +++ b/include/JSystem/JGadget/std-vector.h @@ -5,7 +5,7 @@ #include "JSystem/JGadget/std-memory.h" #include #include -#include +#include namespace JGadget { namespace vector { diff --git a/include/JSystem/JHostIO/JORMContext.h b/include/JSystem/JHostIO/JORMContext.h index f16ffdd57..0db8cf22a 100644 --- a/include/JSystem/JHostIO/JORMContext.h +++ b/include/JSystem/JHostIO/JORMContext.h @@ -2,7 +2,7 @@ #define JORMCONTEXT_H #include -#include +#include #include "JSystem/JHostIO/JORReflexible.h" #include "JSystem/JSupport/JSUMemoryStream.h" diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h index f7739ada1..1535ba757 100644 --- a/include/JSystem/JKernel/JKRExpHeap.h +++ b/include/JSystem/JKernel/JKRExpHeap.h @@ -2,7 +2,7 @@ #define JKREXPHEAP_H #include "JSystem/JKernel/JKRHeap.h" -#include +#include /** * @ingroup jsystem-jkernel diff --git a/include/JSystem/JMath/JMATrigonometric.h b/include/JSystem/JMath/JMATrigonometric.h index 5337891e3..9e12850a7 100644 --- a/include/JSystem/JMath/JMATrigonometric.h +++ b/include/JSystem/JMath/JMATrigonometric.h @@ -2,7 +2,7 @@ #define JMATRIGONOMETRIC_H #include "dolphin/types.h" -#include +#include #include #ifdef __cplusplus diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h index a4a463acb..df0230149 100644 --- a/include/JSystem/JMath/JMath.h +++ b/include/JSystem/JMath/JMath.h @@ -2,7 +2,7 @@ #define JMATH_H #include "dolphin/mtx.h" -#include +#include void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32); void JMAEulerToQuat(s16 param_0, s16 param_1, s16 param_2, Quaternion* param_3); diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h index 1531bd183..b79e6f902 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/include/JSystem/JParticle/JPAEmitter.h @@ -2,7 +2,7 @@ #define JPAEMITTER_H #include -#include +#include #include "JSystem/JParticle/JPAResource.h" #include "JSystem/JParticle/JPAList.h" #include "JSystem/JParticle/JPARandom.h" diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/include/JSystem/JStudio/JStudio/functionvalue.h index f2f51ae92..3684a66da 100644 --- a/include/JSystem/JStudio/JStudio/functionvalue.h +++ b/include/JSystem/JStudio/JStudio/functionvalue.h @@ -1,7 +1,7 @@ #ifndef FUNCTIONVALUE_H #define FUNCTIONVALUE_H -#include +#include #include "JSystem/JGadget/std-vector.h" #include "JSystem/JGadget/define.h" #include "JSystem/JGadget/search.h" diff --git a/include/JSystem/JStudio/JStudio/jstudio-math.h b/include/JSystem/JStudio/JStudio/jstudio-math.h index f5a41031f..27df37a63 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-math.h +++ b/include/JSystem/JStudio/JStudio/jstudio-math.h @@ -2,7 +2,7 @@ #define JSTUDIO_MATH_H #include "dolphin/mtx.h" -#include +#include #define m_PI_D 3.141592653589793 diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index 653ffc947..10315471b 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -4,7 +4,7 @@ #include "JSystem/JStudio/JStudio/jstudio-control.h" #include "global.h" #include -#include +#include typedef struct _GXColor GXColor; diff --git a/include/JSystem/JSupport/JSupport.h b/include/JSystem/JSupport/JSupport.h index bdd296054..717fd9b7b 100644 --- a/include/JSystem/JSupport/JSupport.h +++ b/include/JSystem/JSupport/JSupport.h @@ -2,7 +2,7 @@ #define JSUPPORT_H #include -#include +#include /** * @ingroup jsystem-jsupport diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index e1708adab..f8d26f8f3 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -4,7 +4,7 @@ #include "JSystem/JGadget/linklist.h" #include "JSystem/JKernel/JKRDisposer.h" #include "JSystem/JUtility/JUTFont.h" -#include +#include /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h index aeff790f5..14ed2c28b 100644 --- a/include/JSystem/JUtility/JUTDirectPrint.h +++ b/include/JSystem/JUtility/JUTDirectPrint.h @@ -2,7 +2,7 @@ #define JUTDIRECTPRINT_H #include "JSystem/JUtility/TColor.h" -#include +#include /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h index 4830ed4f7..522551dd6 100644 --- a/include/JSystem/JUtility/JUTException.h +++ b/include/JSystem/JUtility/JUTException.h @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTGamePad.h" -#include +#include #include #include #include "global.h" diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h index 8294cb994..b5965eb18 100644 --- a/include/JSystem/JUtility/JUTTexture.h +++ b/include/JSystem/JUtility/JUTTexture.h @@ -2,7 +2,7 @@ #define JUTTEXTURE_H #include -#include +#include class JUTPalette; diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h index a8045c74a..1db37b44a 100644 --- a/include/SSystem/SComponent/c_m3d.h +++ b/include/SSystem/SComponent/c_m3d.h @@ -1,7 +1,7 @@ #ifndef C_M3D_H_ #define C_M3D_H_ -#include +#include #include "dolphin/mtx.h" class cM3dGAab; diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index 838949cb1..23b059be9 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -2,7 +2,7 @@ #define C_XYZ_H #include "dolphin/mtx.h" -#include +#include struct cXyz : Vec { static const cXyz Zero; diff --git a/include/d/actor/d_a_obj_dust.h b/include/d/actor/d_a_obj_dust.h index 8f00781e8..4ce26227b 100644 --- a/include/d/actor/d_a_obj_dust.h +++ b/include/d/actor/d_a_obj_dust.h @@ -11,7 +11,7 @@ #include "d/d_resorce.h" #include "d/d_s_play.h" -#include +#include /** * @ingroup actors-objects diff --git a/include/d/d_menu_dmap_map.h b/include/d/d_menu_dmap_map.h index 311448c72..f1a543239 100644 --- a/include/d/d_menu_dmap_map.h +++ b/include/d/d_menu_dmap_map.h @@ -2,7 +2,7 @@ #define D_MENU_D_MENU_DMAP_MAP_H #include "d/d_menu_dmap.h" -#include +#include class dMenu_DmapMap_c { public: diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch index eb6533d44..ac3dbb96d 100644 --- a/include/d/dolzel_base.pch +++ b/include/d/dolzel_base.pch @@ -10,7 +10,7 @@ #include "Z2AudioLib/Z2Calc.h" // IWYU pragma: export // Fixes weak function/RTTI ordering -#include // IWYU pragma: export +#include // IWYU pragma: export #include // IWYU pragma: export #include "Z2AudioLib/Z2AudioArcLoader.h" // IWYU pragma: export #include "JSystem/JAudio2/JAUStreamAramMgr.h" // IWYU pragma: export diff --git a/include/revolution/dvd.h b/include/revolution/dvd.h index 31f6c1bad..967390d49 100644 --- a/include/revolution/dvd.h +++ b/include/revolution/dvd.h @@ -3,6 +3,7 @@ #include #include +#include "global.h" #ifdef __cplusplus extern "C" { @@ -185,8 +186,6 @@ typedef struct DVDGameTOC { DVDPartitionInfo* partitionInfos; } DVDGameTOC; -#define ROUND(n, a) (((u32)(n) + (a)-1) & ~((a)-1)) - typedef struct DVDPartitionParams DVDPartitionParams; struct DVDPartitionParams { diff --git a/include/revolution/wpad/bte.h b/include/revolution/wpad/bte.h index c816fa8ba..1751d8998 100644 --- a/include/revolution/wpad/bte.h +++ b/include/revolution/wpad/bte.h @@ -1,7 +1,7 @@ #ifndef CONTEXT_BTE_H #define CONTEXT_BTE_H -#include +#include // taken from https://github.com/doldecomp/sdk_2009-12-11/blob/main/include/context_bte.h diff --git a/src/CaptureScreen.cpp b/src/CaptureScreen.cpp index f6b24e63b..7c8d55a84 100644 --- a/src/CaptureScreen.cpp +++ b/src/CaptureScreen.cpp @@ -1,4 +1,5 @@ #include "CaptureScreen.h" +#include "global.h" CaptureScreen::CaptureScreen(const JFWDisplay* pDisplay) { mpDisplay = pDisplay; diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index 278a997fe..52cf25797 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -8,7 +8,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRFileCache.h" #include "JSystem/JUtility/JUTConsole.h" -#include +#include #include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_ext.h" diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp index a155a2e62..b6c8876ae 100644 --- a/src/JSystem/J2DGraph/J2DPrint.cpp +++ b/src/JSystem/J2DGraph/J2DPrint.cpp @@ -3,8 +3,8 @@ #include "JSystem/J2DGraph/J2DPrint.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTFont.h" -#include -#include +#include +#include char* J2DPrint::mStrBuff; diff --git a/src/JSystem/J2DGraph/J2DTevs.cpp b/src/JSystem/J2DGraph/J2DTevs.cpp index 68469cc0f..88d1c1c69 100644 --- a/src/JSystem/J2DGraph/J2DTevs.cpp +++ b/src/JSystem/J2DGraph/J2DTevs.cpp @@ -6,7 +6,7 @@ #include "JSystem/J2DGraph/J2DTevs.h" #include "JSystem/J2DGraph/J2DMaterial.h" -#include +#include #include "dolphin/gx.h" void J2DTexMtx::load(u32 mtxIdx) { diff --git a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp index 50bd2ac79..e001a8a8b 100644 --- a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp +++ b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphBase/J3DShapeDraw.h" #include "JSystem/JKernel/JKRHeap.h" #include -#include +#include #include u32 J3DShapeDraw::countVertex(u32 stride) { diff --git a/src/JSystem/J3DU/J3DUClipper.cpp b/src/JSystem/J3DU/J3DUClipper.cpp index 350d67e36..38a27dd8f 100644 --- a/src/JSystem/J3DU/J3DUClipper.cpp +++ b/src/JSystem/J3DU/J3DUClipper.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/J3DU/J3DUClipper.h" -#include +#include void J3DUClipper::init() { mNear = 1.0f; diff --git a/src/JSystem/JAHostIO/JAHioUtil.cpp b/src/JSystem/JAHostIO/JAHioUtil.cpp index 8bc18b763..11c5fd4b5 100644 --- a/src/JSystem/JAHostIO/JAHioUtil.cpp +++ b/src/JSystem/JAHostIO/JAHioUtil.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JAHostIO/JAHioUtil.h" -#include +#include char JAHioUtil::mStringBuffer[256]; diff --git a/src/JSystem/JAudio2/JASAiCtrl.cpp b/src/JSystem/JAudio2/JASAiCtrl.cpp index 9beb08f0b..662e5e6df 100644 --- a/src/JSystem/JAudio2/JASAiCtrl.cpp +++ b/src/JSystem/JAudio2/JASAiCtrl.cpp @@ -16,7 +16,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "dolphin/ai.h" #include -#include +#include s16* JASDriver::sDmaDacBuffer[3]; diff --git a/src/JSystem/JAudio2/JASAudioThread.cpp b/src/JSystem/JAudio2/JASAudioThread.cpp index e74ba52e9..4cf66d5ab 100644 --- a/src/JSystem/JAudio2/JASAudioThread.cpp +++ b/src/JSystem/JAudio2/JASAudioThread.cpp @@ -10,7 +10,7 @@ #include "JSystem/JAudio2/JASReport.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "dolphin/dsp.h" -#include +#include JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority) : diff --git a/src/JSystem/JAudio2/JASBasicWaveBank.cpp b/src/JSystem/JAudio2/JASBasicWaveBank.cpp index ad11ba25d..a6134046b 100644 --- a/src/JSystem/JAudio2/JASBasicWaveBank.cpp +++ b/src/JSystem/JAudio2/JASBasicWaveBank.cpp @@ -4,7 +4,7 @@ #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" -#include +#include JASBasicWaveBank::JASBasicWaveBank() { mWaveTable = NULL; diff --git a/src/JSystem/JAudio2/JASCalc.cpp b/src/JSystem/JAudio2/JASCalc.cpp index b4ef0d66b..9c3d7f141 100644 --- a/src/JSystem/JAudio2/JASCalc.cpp +++ b/src/JSystem/JAudio2/JASCalc.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JAudio2/JASCalc.h" -#include +#include #include void JASCalc::imixcopy(const s16* s1, const s16* s2, s16* dst, u32 n) { diff --git a/src/JSystem/JAudio2/JASReport.cpp b/src/JSystem/JAudio2/JASReport.cpp index 941338ba3..be9713186 100644 --- a/src/JSystem/JAudio2/JASReport.cpp +++ b/src/JSystem/JAudio2/JASReport.cpp @@ -8,7 +8,7 @@ #include "JSystem/JAudio2/JASCalc.h" #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#include static OSMutex sMutex; diff --git a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp index a105fe7c3..9bc0bbf31 100644 --- a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp +++ b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JAudio2/JASSimpleWaveBank.h" -#include +#include JASSimpleWaveBank::JASSimpleWaveBank() { mWaveTable = NULL; diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/src/JSystem/JAudio2/JASWaveArcLoader.cpp index 9672a087a..37086c0d4 100644 --- a/src/JSystem/JAudio2/JASWaveArcLoader.cpp +++ b/src/JSystem/JAudio2/JASWaveArcLoader.cpp @@ -7,7 +7,7 @@ #include "JSystem/JKernel/JKRDvdAramRipper.h" #include #include "dolphin/os.h" -#include +#include JASHeap* JASWaveArcLoader::sAramHeap; diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/src/JSystem/JFramework/JFWDisplay.cpp index e3785d678..0392ffdb0 100644 --- a/src/JSystem/JFramework/JFWDisplay.cpp +++ b/src/JSystem/JFramework/JFWDisplay.cpp @@ -9,7 +9,7 @@ #include "dolphin/gx.h" #include #include "global.h" -#include +#include void JFWDisplay::ctor_subroutine(bool enableAlpha) { mEnableAlpha = enableAlpha; diff --git a/src/JSystem/JGadget/binary.cpp b/src/JSystem/JGadget/binary.cpp index af4919126..cde00093f 100644 --- a/src/JSystem/JGadget/binary.cpp +++ b/src/JSystem/JGadget/binary.cpp @@ -2,7 +2,7 @@ #include "JSystem/JGadget/binary.h" #include "JSystem/JGadget/define.h" -#include +#include #if DEBUG static void dummyString() { diff --git a/src/JSystem/JGadget/define.cpp b/src/JSystem/JGadget/define.cpp index 84b1914f1..a61312649 100644 --- a/src/JSystem/JGadget/define.cpp +++ b/src/JSystem/JGadget/define.cpp @@ -3,7 +3,7 @@ #include "JSystem/JGadget/define.h" #define MSL_USE_INLINES 1 -#include +#include JGadget_outMessage::JGadget_outMessage(MessageFunc fn, const char* file, int line) { mMsgFunc = fn; diff --git a/src/JSystem/JGadget/std-stream.cpp b/src/JSystem/JGadget/std-stream.cpp index 3ce2def24..4fe582f8f 100644 --- a/src/JSystem/JGadget/std-stream.cpp +++ b/src/JSystem/JGadget/std-stream.cpp @@ -2,7 +2,7 @@ #include "JSystem/JGadget/std-stream.h" #include "JSystem/JGadget/define.h" -#include +#include #include namespace JGadget { diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp index 35817fe15..811978caa 100644 --- a/src/JSystem/JKernel/JKRAramArchive.cpp +++ b/src/JSystem/JKernel/JKRAramArchive.cpp @@ -7,7 +7,7 @@ #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include +#include #include JKRAramArchive::JKRAramArchive() {} diff --git a/src/JSystem/JKernel/JKRAramStream.cpp b/src/JSystem/JKernel/JKRAramStream.cpp index d126b08b5..94b9ca91f 100644 --- a/src/JSystem/JKernel/JKRAramStream.cpp +++ b/src/JSystem/JKernel/JKRAramStream.cpp @@ -4,7 +4,7 @@ #include "JSystem/JKernel/JKRAramPiece.h" #include "JSystem/JSupport/JSUFileStream.h" #include "JSystem/JUtility/JUTException.h" -#include +#include #if PLATFORM_GCN const u32 stack_size = 0xc00; diff --git a/src/JSystem/JKernel/JKRArchivePri.cpp b/src/JSystem/JKernel/JKRArchivePri.cpp index 5dff53f00..375e297c3 100644 --- a/src/JSystem/JKernel/JKRArchivePri.cpp +++ b/src/JSystem/JKernel/JKRArchivePri.cpp @@ -2,7 +2,7 @@ #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#include #include u32 JKRArchive::sCurrentDirID; diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp index 5e9eb638e..8a1577f59 100644 --- a/src/JSystem/JKernel/JKRCompArchive.cpp +++ b/src/JSystem/JKernel/JKRCompArchive.cpp @@ -10,9 +10,9 @@ #include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include +#include #include -#include +#include JKRCompArchive::JKRCompArchive(s32 entryNum, JKRArchive::EMountDirection eMountDirection) : JKRArchive(entryNum, MOUNT_COMP) { diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp index 0a74ca8c0..ed88d791e 100644 --- a/src/JSystem/JKernel/JKRDvdArchive.cpp +++ b/src/JSystem/JKernel/JKRDvdArchive.cpp @@ -6,10 +6,10 @@ #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include +#include #include #include "global.h" -#include +#include JKRDvdArchive::JKRDvdArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection) : JKRArchive(entryNum, MOUNT_DVD) { diff --git a/src/JSystem/JKernel/JKRDvdFile.cpp b/src/JSystem/JKernel/JKRDvdFile.cpp index 172827e52..07bd9505a 100644 --- a/src/JSystem/JKernel/JKRDvdFile.cpp +++ b/src/JSystem/JKernel/JKRDvdFile.cpp @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include +#include JSUList JKRDvdFile::sDvdList; diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/src/JSystem/JKernel/JKRDvdRipper.cpp index 877d10d74..fc792c50c 100644 --- a/src/JSystem/JKernel/JKRDvdRipper.cpp +++ b/src/JSystem/JKernel/JKRDvdRipper.cpp @@ -11,7 +11,7 @@ #include #include #include "dolphin/vi.h" -#include +#include static int JKRDecompressFromDVD(JKRDvdFile*, void*, u32, u32, u32, u32, u32*); static int decompSZS_subroutine(u8*, u8*); diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp index 9f1109d12..1c6d16c1a 100644 --- a/src/JSystem/JKernel/JKRExpHeap.cpp +++ b/src/JSystem/JKernel/JKRExpHeap.cpp @@ -9,7 +9,7 @@ #include "JSystem/JSupport/JSupport.h" #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTException.h" -#include +#include JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) { JKRExpHeap* heap = NULL; diff --git a/src/JSystem/JKernel/JKRFileCache.cpp b/src/JSystem/JKernel/JKRFileCache.cpp index 2c764a702..1dc3a719e 100644 --- a/src/JSystem/JKernel/JKRFileCache.cpp +++ b/src/JSystem/JKernel/JKRFileCache.cpp @@ -6,7 +6,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" -#include +#include #include #include "global.h" diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/src/JSystem/JKernel/JKRFileLoader.cpp index cf756ee27..26790f87b 100644 --- a/src/JSystem/JKernel/JKRFileLoader.cpp +++ b/src/JSystem/JKernel/JKRFileLoader.cpp @@ -5,7 +5,7 @@ #define MSL_USE_INLINES 1 // needed to inline tolower call. not inlined elsewhere in the repo #include -#include +#include #include "global.h" JKRFileLoader* JKRFileLoader::sCurrentVolume; diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp index b805901b7..e4337db17 100644 --- a/src/JSystem/JKernel/JKRHeap.cpp +++ b/src/JSystem/JKernel/JKRHeap.cpp @@ -8,7 +8,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include +#include #include #if DEBUG diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/JSystem/JKernel/JKRMemArchive.cpp index 505329847..0c0ef4887 100644 --- a/src/JSystem/JKernel/JKRMemArchive.cpp +++ b/src/JSystem/JKernel/JKRMemArchive.cpp @@ -7,7 +7,7 @@ #include "JSystem/JUtility/JUTException.h" #include #include "global.h" -#include +#include JKRMemArchive::JKRMemArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection) : JKRArchive(entryNum, MOUNT_MEM) { diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp index 593f4b78a..01ead7728 100644 --- a/src/JSystem/JKernel/JKRSolidHeap.cpp +++ b/src/JSystem/JKernel/JKRSolidHeap.cpp @@ -5,8 +5,8 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" #include "global.h" -#include -#include +#include +#include JKRSolidHeap* JKRSolidHeap::create(u32 size, JKRHeap* heap, bool useErrorHandler) { if (!heap) { diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp index 0392beef0..fa38270a2 100644 --- a/src/JSystem/JKernel/JKRThread.cpp +++ b/src/JSystem/JKernel/JKRThread.cpp @@ -3,9 +3,9 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" -#include +#include #include "global.h" -#include +#include JSUList JKRThread::sThreadList(0); diff --git a/src/JSystem/JMath/JMATrigonometric.cpp b/src/JSystem/JMath/JMATrigonometric.cpp index 2fc14cb13..5d394ac9c 100644 --- a/src/JSystem/JMath/JMATrigonometric.cpp +++ b/src/JSystem/JMath/JMATrigonometric.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JMath/JMATrigonometric.h" -#include +#include #include "global.h" static f32 dummy() { diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp index 7d891a47d..174a459b6 100644 --- a/src/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp @@ -5,8 +5,8 @@ #include "JSystem/JUtility/JUTException.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JGadget/linklist.h" -#include -#include +#include +#include #include namespace JStudio { @@ -291,7 +291,11 @@ f64 TFunctionValue_composite::composite_index(TVector_pointer c } break; case 1: { +#ifdef __MWERKS__ div_t dt = div(index, size - 1); +#else + div_t dt = div((int)index, (int)size - 1); +#endif index = dt.rem; if (index < 0) { index = size + index; @@ -304,7 +308,11 @@ f64 TFunctionValue_composite::composite_index(TVector_pointer c index = 0; } else { u32 uVar3 = (u32)(size - 2) * 2; +#ifdef __MWERKS__ div_t dt2 = div(index, uVar3); +#else + div_t dt2 = div((int)index, (int)uVar3); +#endif index = dt2.rem; if (index < 0) { index += uVar3; @@ -315,8 +323,12 @@ f64 TFunctionValue_composite::composite_index(TVector_pointer c } break; } - + +#ifdef __MWERKS__ std::advance_pointer(local_148, index + 1); +#else + std::advance(local_148, index + 1); +#endif pFront = *local_148; return pFront->getValue(param_3); } diff --git a/src/JSystem/JStudio/JStudio/jstudio-math.cpp b/src/JSystem/JStudio/JStudio/jstudio-math.cpp index d6e31f7a9..119cd4c55 100644 --- a/src/JSystem/JStudio/JStudio/jstudio-math.cpp +++ b/src/JSystem/JStudio/JStudio/jstudio-math.cpp @@ -3,7 +3,7 @@ #include "JSystem/JStudio/JStudio/jstudio-math.h" #include "JSystem/JGeometry.h" #include "JSystem/TPosition3.h" -#include +#include void JStudio::math::getRotation_xyz(MtxP param_1, f32 x, f32 y, f32 z) { f32 cosx = cosf(DEG_TO_RAD(x)); diff --git a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp b/src/JSystem/JStudio/JStudio/stb-data-parse.cpp index a5d0136d2..e9ab233d3 100644 --- a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp +++ b/src/JSystem/JStudio/JStudio/stb-data-parse.cpp @@ -3,7 +3,7 @@ #include "JSystem/JStudio/JStudio/stb-data-parse.h" #include "JSystem/JUtility/JUTAssert.h" #include "dolphin/os.h" -#include +#include namespace JStudio { namespace stb { diff --git a/src/JSystem/JUtility/JUTAssert.cpp b/src/JSystem/JUtility/JUTAssert.cpp index 9916b8e4c..bf26d0ae9 100644 --- a/src/JSystem/JUtility/JUTAssert.cpp +++ b/src/JSystem/JUtility/JUTAssert.cpp @@ -4,7 +4,7 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTDirectPrint.h" -#include +#include #include namespace JUTAssertion { diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp index 9054c6ec7..3292adc78 100644 --- a/src/JSystem/JUtility/JUTCacheFont.cpp +++ b/src/JSystem/JUtility/JUTCacheFont.cpp @@ -6,7 +6,7 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JKernel/JKRAram.h" #include "dolphin/gx.h" -#include +#include JUTCacheFont::JUTCacheFont(ResFONT const* p_fontRes, u32 cacheSize, JKRHeap* p_heap) { initialize_state(); diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp index 98f840421..c3389cb95 100644 --- a/src/JSystem/JUtility/JUTConsole.cpp +++ b/src/JSystem/JUtility/JUTConsole.cpp @@ -7,7 +7,7 @@ #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTVideo.h" #include -#include +#include #include "global.h" JUTConsoleManager* JUTConsoleManager::sManager; diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/src/JSystem/JUtility/JUTDbPrint.cpp index f137c13dd..9adab8141 100644 --- a/src/JSystem/JUtility/JUTDbPrint.cpp +++ b/src/JSystem/JUtility/JUTDbPrint.cpp @@ -4,7 +4,7 @@ #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTVideo.h" -#include +#include JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) { mFont = pFont; diff --git a/src/JSystem/JUtility/JUTDirectFile.cpp b/src/JSystem/JUtility/JUTDirectFile.cpp index a60a90c5e..ce2c4354d 100644 --- a/src/JSystem/JUtility/JUTDirectFile.cpp +++ b/src/JSystem/JUtility/JUTDirectFile.cpp @@ -3,7 +3,7 @@ #include "JSystem/JUtility/JUTDirectFile.h" #include #include "global.h" -#include +#include int JUTDirectFile::fetch32byte() { mToRead = mLength - ALIGN_PREV(mPos, DVD_MIN_TRANSFER_SIZE); diff --git a/src/JSystem/JUtility/JUTDirectPrint.cpp b/src/JSystem/JUtility/JUTDirectPrint.cpp index 6a9fa75d1..b317f18ef 100644 --- a/src/JSystem/JUtility/JUTDirectPrint.cpp +++ b/src/JSystem/JUtility/JUTDirectPrint.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTDirectPrint.h" -#include +#include #include #include "global.h" diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp index 5a2c6289a..19c3fafe0 100644 --- a/src/JSystem/JUtility/JUTException.cpp +++ b/src/JSystem/JUtility/JUTException.cpp @@ -4,11 +4,11 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTDirectFile.h" -#include -#include -#include +#include +#include +#include #include -#include +#include OSMessageQueue JUTException::sMessageQueue = {0}; diff --git a/src/JSystem/JUtility/JUTGamePad.cpp b/src/JSystem/JUtility/JUTGamePad.cpp index 2330d538f..1918268af 100644 --- a/src/JSystem/JUtility/JUTGamePad.cpp +++ b/src/JSystem/JUtility/JUTGamePad.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTGamePad.h" -#include +#include u32 JUTGamePad::CRumble::sChannelMask[4] = { PAD_CHAN0_BIT, diff --git a/src/JSystem/JUtility/JUTGraphFifo.cpp b/src/JSystem/JUtility/JUTGraphFifo.cpp index 06d47d6a1..a30a0aeac 100644 --- a/src/JSystem/JUtility/JUTGraphFifo.cpp +++ b/src/JSystem/JUtility/JUTGraphFifo.cpp @@ -2,7 +2,7 @@ #include "JSystem/JUtility/JUTGraphFifo.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#include static bool data_804514B8; diff --git a/src/JSystem/JUtility/JUTProcBar.cpp b/src/JSystem/JUtility/JUTProcBar.cpp index 6de375398..20fb99c82 100644 --- a/src/JSystem/JUtility/JUTProcBar.cpp +++ b/src/JSystem/JUtility/JUTProcBar.cpp @@ -4,7 +4,7 @@ #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTVideo.h" -#include +#include JUTProcBar::JUTProcBar() { mVisible = true; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cctype similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cctype diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath index 78fd14910..3040fbfe6 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath @@ -151,6 +151,62 @@ MSL_INLINE float tanf(float x) { #ifdef __cplusplus }; + +namespace std { +template +inline double fabs(T x) { + return ::fabs(x); +} + +inline float fabs(float num) { + return ::fabsf(num); +} + +inline float fabsf(float num) { + return ::fabsf(num); +} + +inline float sqrt(float x) { + return ::sqrtf(x); +} + +inline float abs(float x) { + return ::fabsf(x); +} + +inline float fmod(float x, float y) { + return ::fmod(x, y); +} + +inline float ceil(float num) { + return ::ceilf(num); +} + +inline float floor(float num) { + return ::floorf(num); +} + +inline float tan(float num) { + return ::tanf(num); +} + +inline float tanf(float num) { + return ::tanf(num); +} + +inline float acos(float num) { + return ::acosf(num); +} + +inline float pow(float x, float y) { + return ::pow(x, y); +} + +inline float pow(float x, int y) { + // FIXME: Needs to use powf + return ::pow(x, y); +} +} // namespace std #endif #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio index 739a62f64..efe9c253b 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio @@ -13,4 +13,24 @@ #define stdout (&__files._stdout) #define stderr (&__files._stderr) +#ifdef __cplusplus +#include + +extern "C" { +namespace std { + using ::fputs; + using ::fflush; + using ::fclose; + using ::fprintf; + using ::printf; + using ::sprintf; + using ::snprintf; + using ::vsnprintf; + using ::vprintf; + using ::vswprintf; + using ::sscanf; +} +}; +#endif + #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib index ae1223229..a98bcf8b6 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib @@ -5,4 +5,18 @@ #include #include +#ifdef __cplusplus +extern "C" { +namespace std { + using ::strtol; + using ::strtoul; + using ::div; + using ::exit; + using ::abort; + using ::atoi; + using ::atof; +} +}; +#endif + #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math deleted file mode 100644 index de9c0a6bc..000000000 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math +++ /dev/null @@ -1,62 +0,0 @@ -#ifndef MSL_MATH_H_ -#define MSL_MATH_H_ - -#include - -namespace std { -template -inline double fabs(T x) { - return ::fabs(x); -} - -inline float fabs(float num) { - return ::fabsf(num); -} - -inline float fabsf(float num) { - return ::fabsf(num); -} - -inline float sqrt(float x) { - return ::sqrtf(x); -} - -inline float abs(float x) { - return ::fabsf(x); -} - -inline float fmod(float x, float y) { - return ::fmod(x, y); -} - -inline float ceil(float num) { - return ::ceilf(num); -} - -inline float floor(float num) { - return ::floorf(num); -} - -inline float tan(float num) { - return ::tanf(num); -} - -inline float tanf(float num) { - return ::tanf(num); -} - -inline float acos(float num) { - return ::acosf(num); -} - -inline float pow(float x, float y) { - return ::pow(x, y); -} - -inline float pow(float x, int y) { - // FIXME: Needs to use powf - return ::pow(x, y); -} -} // namespace std - -#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c index 967879ace..b206e9ab4 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c @@ -7,7 +7,7 @@ #undef MSL_INLINE #define MSL_INLINE __declspec(weak) -#include +#include #if PLATFORM_GCN #define ctrl __control_char diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c index 9d68210dc..1b184d60e 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c @@ -1,5 +1,5 @@ #include "extras.h" -#include +#include int stricmp(const char* str1, const char* str2) { char a_var; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c index 203419d52..32246fbe8 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c @@ -2,7 +2,7 @@ #include "buffer_io.h" #include "file_io.h" #include "FILE_POS.h" -#include +#include int fclose(FILE* file) { int flush_result, close_result; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c index 1917c23b6..565ed380a 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c index f6a587d94..b542d792e 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c @@ -5,7 +5,7 @@ #include "mbstring.h" #include "scanf.h" #include "wchar_io.h" -#include +#include #include #include #include diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c index b60a21131..67e392b0a 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c @@ -1,5 +1,5 @@ #include "scanf.h" -#include +#include #include #include #include diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c index 444ceed80..0f7a2b0f4 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c @@ -2,7 +2,7 @@ #include #include "ansi_fp.h" #include -#include +#include #include "float.h" #include #include diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c index cb6520338..2a93968f6 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c @@ -1,5 +1,5 @@ #include "strtoul.h" -#include +#include #include "errno.h" #include #include "scanf.h" diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c index 7faf351f1..13356b95e 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c @@ -1,4 +1,4 @@ -#include +#include const unsigned short __wctype_mapC[256] = { ctype_cntrl, diff --git a/src/SSystem/SComponent/c_m3d.cpp b/src/SSystem/SComponent/c_m3d.cpp index 1af53e81e..848746822 100644 --- a/src/SSystem/SComponent/c_m3d.cpp +++ b/src/SSystem/SComponent/c_m3d.cpp @@ -12,6 +12,11 @@ #include "SSystem/SComponent/c_math.h" #include "SSystem/SComponent/c_sxyz.h" +#ifndef __MWERKS__ +#include +#define FLT_EPSILON std::numeric_limits::epsilon() +#endif + const f32 G_CM3D_F_ABS_MIN = 32 * FLT_EPSILON; void cM3d_InDivPos1(const Vec* pVecA, const Vec* pVecB, f32 pF, Vec* pOut) { diff --git a/src/SSystem/SComponent/c_math.cpp b/src/SSystem/SComponent/c_math.cpp index f590bc9bb..ba7a63c61 100644 --- a/src/SSystem/SComponent/c_math.cpp +++ b/src/SSystem/SComponent/c_math.cpp @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_math.h" #include "SSystem/SComponent/c_m3d.h" -#include +#include s16 cM_rad2s(f32 rad) { s32 s = (std::fmod(rad, 2 * M_PI) * (0x8000 / M_PI)); diff --git a/src/SSystem/SComponent/c_xyz.cpp b/src/SSystem/SComponent/c_xyz.cpp index 41ff83486..9f05b9e61 100644 --- a/src/SSystem/SComponent/c_xyz.cpp +++ b/src/SSystem/SComponent/c_xyz.cpp @@ -7,6 +7,11 @@ #include "SSystem/SComponent/c_math.h" #include "JSystem/JUtility/JUTAssert.h" +#ifndef __MWERKS__ +#include +#define FLT_EPSILON std::numeric_limits::epsilon() +#endif + cXyz cXyz::operator+(const Vec& vec) const { Vec ret; PSVECAdd(this, &vec, &ret); diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c index 36473080f..a30ab8c7a 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c @@ -4,7 +4,7 @@ */ #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h" -#include +#include #pragma dont_inline on void TRK_fill_mem(void* dst, int val, u32 n) { diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c index becb062ca..b570022d2 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c @@ -1,6 +1,6 @@ #include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" -#include +#include #include typedef struct memRange { diff --git a/src/Z2AudioLib/Z2Calc.cpp b/src/Z2AudioLib/Z2Calc.cpp index a55a14c75..0082ca0e9 100644 --- a/src/Z2AudioLib/Z2Calc.cpp +++ b/src/Z2AudioLib/Z2Calc.cpp @@ -1,6 +1,6 @@ #include "Z2AudioLib/Z2Calc.h" #include "JSystem/JMath/random.h" -#include +#include f32 Z2Calc::linearTransform(f32 inValue, f32 inMin, f32 inMax, f32 outMin, f32 outMax, bool noClamp) { f32 transformed = outMin + ((inValue - inMin) * ((outMax - outMin) / (inMax - inMin))); diff --git a/src/Z2AudioLib/Z2SoundObject.cpp b/src/Z2AudioLib/Z2SoundObject.cpp index bc9247684..d34d0dea1 100644 --- a/src/Z2AudioLib/Z2SoundObject.cpp +++ b/src/Z2AudioLib/Z2SoundObject.cpp @@ -9,6 +9,11 @@ #include "Z2AudioLib/Z2Audience.h" #include "JSystem/JAudio2/JAUSoundAnimator.h" +#ifndef __MWERKS__ +#include +#define FLT_MAX std::numeric_limits::max() +#endif + #if PLATFORM_WII || PLATFORM_SHIELD #include "Z2AudioLib/Z2AudioCS.h" #endif diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index a99c2ea72..eb2d9f024 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -16,7 +16,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" #include "c/c_damagereaction.h" -#include +#include enum B_bq_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index 4600e64c7..6febefa83 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_tn.h" -#include +#include #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_boomerang.h" #include "d/actor/d_a_nbomb.h" diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index ed9383a6e..b38aa09b9 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -17,7 +17,7 @@ #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" #include "JSystem/JAudio2/JAUSectionHeap.h" -#include +#include enum Joint { /* 0x00 */ JNT_CENTER, diff --git a/src/d/actor/d_a_b_zant_magic.cpp b/src/d/actor/d_a_b_zant_magic.cpp index 83482ffd3..f10718742 100644 --- a/src/d/actor/d_a_b_zant_magic.cpp +++ b/src/d/actor/d_a_b_zant_magic.cpp @@ -10,7 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_math.h" -#include +#include int daB_ZANTM_c::draw() { g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index 282bec590..7778dadf8 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -11,7 +11,7 @@ #include "d/d_cc_uty.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_math.h" -#include +#include namespace { dCcD_SrcSph cc_zant_src = { diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index cc3b88375..e8c934afa 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_bg_obj.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" -#include +#include #include "dolphin/os.h" #include "d/actor/d_a_set_bgobj.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp index f74b0b103..f6d7e88ad 100644 --- a/src/d/actor/d_a_cow.cpp +++ b/src/d/actor/d_a_cow.cpp @@ -213,7 +213,7 @@ void daCow_c::setActetcStatus() { bool daCow_c::checkNadeNadeFinish() { if (GET_FLAG(daCow_c::Flag_NaderuFinish)) { - UNSET_FLAG(mFlags, daCow_c::Flag_NaderuFinish); + UNSET_FLAG(mFlags, daCow_c::Flag_NaderuFinish, u16); mNadeNade = false; return true; } @@ -222,7 +222,7 @@ bool daCow_c::checkNadeNadeFinish() { bool daCow_c::checkNadeNade() { if (GET_FLAG(daCow_c::Flag_Naderu)) { - UNSET_FLAG(mFlags, daCow_c::Flag_Naderu); + UNSET_FLAG(mFlags, daCow_c::Flag_Naderu, u16); mNadeNade = true; return 1; } @@ -246,13 +246,13 @@ bool daCow_c::checkThrow() { if (GET_FLAG(daCow_c::Flag_CrazyBeforeCatch)) { setProcess(&daCow_c::action_thrown, false); initCrazyBeforeCatch(0); - UNSET_FLAG(mFlags, daCow_c::Flag_CrazyBeforeCatch); + UNSET_FLAG(mFlags, daCow_c::Flag_CrazyBeforeCatch, u16); return true; } if (GET_FLAG(daCow_c::Flag_CrazyCatch)) { setProcess(&daCow_c::action_thrown, false); initCrazyCatch(0); - UNSET_FLAG(mFlags, daCow_c::Flag_CrazyCatch); + UNSET_FLAG(mFlags, daCow_c::Flag_CrazyCatch, u16); return true; } } @@ -1877,11 +1877,11 @@ void daCow_c::calcCatchPos(f32 distance, BOOL someBool) { void daCow_c::executeCrazyWait() { if (GET_FLAG(daCow_c::Flag_CrazyReady)) { - UNSET_FLAG(mFlags, daCow_c::Flag_CrazyReady); + UNSET_FLAG(mFlags, daCow_c::Flag_CrazyReady, u16); } if (GET_FLAG(daCow_c::Flag_CrazyReadyDrawOn)) { mDrawOff = false; - UNSET_FLAG(mFlags, daCow_c::Flag_CrazyReadyDrawOn); + UNSET_FLAG(mFlags, daCow_c::Flag_CrazyReadyDrawOn, u16); } if (GET_FLAG(daCow_c::Flag_CrazyGo)) { mCrazy = daCow_c::Crazy_Dash; @@ -1914,16 +1914,16 @@ void daCow_c::executeCrazyDash() { if (GET_FLAG(daCow_c::Flag_CrazyBeforeCatch)) { initCrazyBeforeCatch(0); mPointIndex = 6; - UNSET_FLAG(mFlags, daCow_c::Flag_CrazyBeforeCatch); + UNSET_FLAG(mFlags, daCow_c::Flag_CrazyBeforeCatch, u16); } else if (GET_FLAG(daCow_c::Flag_CrazyCatch)) { initCrazyCatch(0); mPointIndex = 6; - UNSET_FLAG(mFlags, daCow_c::Flag_CrazyCatch); + UNSET_FLAG(mFlags, daCow_c::Flag_CrazyCatch, u16); dComIfGp_getVibration().StartShock(VIBMODE_S_POWER8, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); } else if (GET_FLAG(daCow_c::Flag_CrazyDash)) { initCrazyAttack(0); mPointIndex = 6; - UNSET_FLAG(mFlags, daCow_c::Flag_CrazyDash); + UNSET_FLAG(mFlags, daCow_c::Flag_CrazyDash, u16); } } else { if (mPointIndex == 4) { @@ -1993,7 +1993,7 @@ void daCow_c::executeCrazyBeforeCatch() { calcCatchPos(-220.0f, 1); if (GET_FLAG(daCow_c::Flag_CrazyCatch)) { initCrazyCatch(0); - UNSET_FLAG(mFlags, daCow_c::Flag_CrazyCatch); + UNSET_FLAG(mFlags, daCow_c::Flag_CrazyCatch, u16); dComIfGp_getVibration().StartShock(VIBMODE_S_POWER8, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); } else if (GET_FLAG(daCow_c::Flag_CrazyDash)) { if (!daPy_getPlayerActorClass()->speedF) { @@ -2001,7 +2001,7 @@ void daCow_c::executeCrazyBeforeCatch() { } else { initCrazyAttack(1); } - UNSET_FLAG(mFlags, daCow_c::Flag_CrazyDash); + UNSET_FLAG(mFlags, daCow_c::Flag_CrazyDash, u16); } } diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp index b8f5114d6..e97bc0672 100644 --- a/src/d/actor/d_a_e_dk.cpp +++ b/src/d/actor/d_a_e_dk.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" -#include +#include #define ACTION_MODE_WAIT 0 #define ACTION_MODE_CHASE 1 diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index 1a8a58b61..82014649c 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -9,7 +9,7 @@ #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" #include "d/d_bomb.h" -#include +#include #include "Z2AudioLib/Z2Instances.h" class daE_SW_HIO_c { diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index c43e04cb2..ed0c071de 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -9,7 +9,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" #include "c/c_damagereaction.h" -#include +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp index fefe58fd4..4c4d80c24 100644 --- a/src/d/actor/d_a_e_ws.cpp +++ b/src/d/actor/d_a_e_ws.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_e_ws.h" #include "d/actor/d_a_obj_carry.h" -#include +#include #include "f_op/f_op_actor_enemy.h" class daE_WS_HIO_c : public JORReflexible { diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index 956a31bc8..6ec159ca3 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_camera_mng.h" -#include +#include #include "Z2AudioLib/Z2Instances.h" struct daE_YMB_HIO_c { diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index f77b11be6..301245e99 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -17,7 +17,7 @@ #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" #include "JSystem/JAudio2/JAUSectionHeap.h" -#include +#include #define ANM_HS_BACK_WALK 6 #define ANM_HS_WALK_START 7 diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index b9909276b..ed46b10dd 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -10,7 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_msg_object.h" -#include +#include #include "d/actor/d_a_balloon_2D.h" #include "d/actor/d_a_e_ym.h" diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index f46f0c237..3016f58aa 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -22,7 +22,7 @@ #include "c/c_damagereaction.h" #include "SSystem/SComponent/c_counter.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include class dmg_rod_HIO_c : public JORReflexible { public: @@ -5493,7 +5493,7 @@ static void play_camera_u(dmg_rod_class* i_this) { break; } case 20: - case 21: + case 21: { if (!actor->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(actor, 2, 0xFFFF, 0); actor->eventInfo.onCondition(dEvtCnd_CANDEMO_e); @@ -5647,6 +5647,7 @@ static void play_camera_u(dmg_rod_class* i_this) { daAlink_getAlinkActorClass()->changeFishGetFace(0); } break; + } case 90: sp18 = 1; break; diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index e81a8a2b8..cf2ce2f66 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -11,7 +11,7 @@ #include "SSystem/SComponent/c_m3d_g_pla.h" #include "Z2AudioLib/Z2Instances.h" #include "c/c_damagereaction.h" -#include +#include #include "d/actor/d_a_alink.h" #include "d/actor/d_a_canoe.h" #include "d/actor/d_a_mg_fshop.h" diff --git a/src/d/actor/d_a_obj_bhbridge.cpp b/src/d/actor/d_a_obj_bhbridge.cpp index 59e2ed6fd..9ada8dfdc 100644 --- a/src/d/actor/d_a_obj_bhbridge.cpp +++ b/src/d/actor/d_a_obj_bhbridge.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/actor/d_a_player.h" -#include +#include void daObjBhbridge_c::RideOn_Angle(s16& param_1, f32 param_2, s16 param_3, f32 param_4) { cLib_addCalcAngleS(¶m_1, param_3 * (param_2 / param_4), 1, 0x100, 1); diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index e3960aebc..bea467117 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_carry.h" #include "d/actor/d_a_player.h" -#include +#include #include "d/d_com_inf_game.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_obj_swBallA.h" diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index 7a54788e6..b7805ef4a 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -12,7 +12,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" -#include +#include void daObjCwall_c::initBaseMtx() { mWallModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp index 62f3922ee..f474cd471 100644 --- a/src/d/actor/d_a_obj_digsnow.cpp +++ b/src/d/actor/d_a_obj_digsnow.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_digsnow.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include +#include void daObjDigSnow_c::initBaseMtx() { mpModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index 1ee2d2585..eff54e3af 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_drop.h" #include "SSystem/SComponent/c_math.h" -#include +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_camera.h" diff --git a/src/d/actor/d_a_obj_gra2_soldier.inc b/src/d/actor/d_a_obj_gra2_soldier.inc index 879062983..f31da3b0f 100644 --- a/src/d/actor/d_a_obj_gra2_soldier.inc +++ b/src/d/actor/d_a_obj_gra2_soldier.inc @@ -1,7 +1,7 @@ #include "d/actor/d_a_obj_gra2.h" #include "d/d_camera.h" #include "d/actor/d_a_tag_gra.h" -#include +#include f32 daObj_GrA_c::getSrchCircleR() { f32 srchCircleR; diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp index 396e79fcf..34d489308 100644 --- a/src/d/actor/d_a_obj_ice_l.cpp +++ b/src/d/actor/d_a_obj_ice_l.cpp @@ -12,7 +12,7 @@ #include "d/actor/d_a_player.h" #include "d/d_procname.h" #include "d/d_s_play.h" -#include +#include f32 dummyLiteral() { return 0.0f; diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index ba8ad44d1..c829b2c55 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -12,7 +12,7 @@ #include "d/d_s_play.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_math.h" -#include +#include class daOBJ_ICE_S_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp index 9bab3f6ea..b59d130f8 100644 --- a/src/d/actor/d_a_obj_kanban2.cpp +++ b/src/d/actor/d_a_obj_kanban2.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_npc_tk.h" #include "d/d_s_play.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include #define PARTS_ALL 0x3FFFF #define PART_TOP_LEFT_UNDER (1 << 0) diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index 9aab3a119..2cda594ce 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "d/d_item.h" -#include +#include void daObjL4DigSand_c::initBaseMtx() { mpModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp index 91c6f80b4..ba07ba88d 100644 --- a/src/d/actor/d_a_obj_pdoor.cpp +++ b/src/d/actor/d_a_obj_pdoor.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_math.h" -#include +#include #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index c10e53e2b..b7ce69ed5 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_cc_d.h" #include "d/d_item_data.h" -#include +#include const static dCcD_SrcCyl l_cyl_src = { { diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index 852361498..c5ddc061b 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -14,7 +14,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "global.h" #include "SSystem/SComponent/c_math.h" -#include +#include const static int l_bmdIdx[2] = {3, 3}; diff --git a/src/d/actor/d_a_obj_swturn.cpp b/src/d/actor/d_a_obj_swturn.cpp index 909b94da1..4acb54bf0 100644 --- a/src/d/actor/d_a_obj_swturn.cpp +++ b/src/d/actor/d_a_obj_swturn.cpp @@ -11,7 +11,7 @@ #include "SSystem/SComponent/c_lib.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" -#include +#include static u32 const l_bmd[2] = { 4, 4, diff --git a/src/d/actor/d_a_obj_wdStick.cpp b/src/d/actor/d_a_obj_wdStick.cpp index 0e4abd5d4..af9a3d9dc 100644 --- a/src/d/actor/d_a_obj_wdStick.cpp +++ b/src/d/actor/d_a_obj_wdStick.cpp @@ -10,7 +10,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_kankyo_mng.h" -#include +#include static daWdStick_HIO_c l_HIO; diff --git a/src/d/actor/d_a_set_bgobj.cpp b/src/d/actor/d_a_set_bgobj.cpp index f072a3f6a..6beae751c 100644 --- a/src/d/actor/d_a_set_bgobj.cpp +++ b/src/d/actor/d_a_set_bgobj.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_set_bgobj.h" -#include +#include #include "f_op/f_op_actor_mng.h" static const char l_specName[] = "spec.dat"; diff --git a/src/d/actor/d_a_tag_camera.cpp b/src/d/actor/d_a_tag_camera.cpp index ee95c9810..f1b34e808 100644 --- a/src/d/actor/d_a_tag_camera.cpp +++ b/src/d/actor/d_a_tag_camera.cpp @@ -1,7 +1,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_camera.h" -#include +#include #include "d/actor/d_a_alink.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_horse.h" diff --git a/src/d/actor/d_a_tag_chkpoint.cpp b/src/d/actor/d_a_tag_chkpoint.cpp index 06f2a5177..04ca0a80a 100644 --- a/src/d/actor/d_a_tag_chkpoint.cpp +++ b/src/d/actor/d_a_tag_chkpoint.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_chkpoint.h" -#include +#include #include "d/actor/d_a_player.h" int daTag_Chk_c::execute() { diff --git a/src/d/actor/d_a_tag_firewall.cpp b/src/d/actor/d_a_tag_firewall.cpp index fa6470cdd..c9917cc79 100644 --- a/src/d/actor/d_a_tag_firewall.cpp +++ b/src/d/actor/d_a_tag_firewall.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_firewall.h" -#include +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_bomb.h" diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index e736d8d82..c703b5ce6 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_tag_sppath.h" #include "d/actor/d_a_player.h" -#include +#include static dCcD_SrcCyl l_cylSrc = { { diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 0112acac9..47e5803a3 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -9,7 +9,7 @@ #include "f_op/f_op_camera_mng.h" #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include static const f32 l_cull_size_box[6] = { -150.0f, -10.0f, -150.0f, 150.0f, 300.0f, 100.0f }; diff --git a/src/d/d_bg_w_kcol.cpp b/src/d/d_bg_w_kcol.cpp index 8c39fa39a..76d7c8151 100644 --- a/src/d/d_bg_w_kcol.cpp +++ b/src/d/d_bg_w_kcol.cpp @@ -6,7 +6,7 @@ #include "d/d_bg_s_cap_poly.h" #include -#include +#include #include "SSystem/SComponent/c_bg_s_shdw_draw.h" #include "SSystem/SComponent/c_m2d.h" diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 838192f95..61774641f 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -20,7 +20,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" -#include +#include #if DEBUG #include "d/d_debug_pad.h" diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 87708c6dc..50099a9a9 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -22,7 +22,7 @@ #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include +#include void dComIfG_play_c::ct() { mWindowNum = 0; diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp index f3bace368..05ec34453 100644 --- a/src/d/d_com_static.cpp +++ b/src/d/d_com_static.cpp @@ -12,7 +12,7 @@ #include "d/actor/d_a_tag_magne.h" #include "d/actor/d_a_tag_mist.h" #include "d/actor/d_a_tag_stream.h" -#include +#include void daSus_c::data_c::set(s8 i_roomNo, cXyz const& param_1, cXyz const& param_2, u8 param_3, u8 param_4, u8 i_type) { diff --git a/src/d/d_file_sel_info.cpp b/src/d/d_file_sel_info.cpp index 642ccc676..df0bee5aa 100644 --- a/src/d/d_file_sel_info.cpp +++ b/src/d/d_file_sel_info.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" #include "d/d_pane_class_alpha.h" -#include +#include dFile_info_c::dFile_info_c(JKRArchive* i_archive, u8 param_1) { mArchive = i_archive; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 209de4cd5..54752a1bb 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -24,7 +24,7 @@ #include "f_op/f_op_kankyo.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" -#include +#include static void GxXFog_set(); diff --git a/src/d/d_menu_dmap_map.cpp b/src/d/d_menu_dmap_map.cpp index 468b2c2f1..e2f157ff8 100644 --- a/src/d/d_menu_dmap_map.cpp +++ b/src/d/d_menu_dmap_map.cpp @@ -4,7 +4,7 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include +#include #include "d/d_com_inf_game.h" #include "d/d_map_path_dmap.h" #include "d/d_menu_dmap.h" diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index b9b22f841..7e847452c 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -5,7 +5,7 @@ #include "JSystem/JKernel/JKRAramArchive.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include +#include #include "f_op/f_op_msg_mng.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp index 953cd7358..c8f8cc6d5 100644 --- a/src/d/d_menu_insect.cpp +++ b/src/d/d_menu_insect.cpp @@ -19,7 +19,7 @@ #include "d/d_msg_string.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include +#include typedef void (dMenu_Insect_c::*initFunc)(); static initFunc map_init_process[] = { diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp index cc901b9a7..5f3dd5c2d 100644 --- a/src/d/d_menu_item_explain.cpp +++ b/src/d/d_menu_item_explain.cpp @@ -9,7 +9,7 @@ #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTTexture.h" -#include +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp index 57a20807f..95c2d0ae6 100644 --- a/src/d/d_menu_letter.cpp +++ b/src/d/d_menu_letter.cpp @@ -4,7 +4,7 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include +#include #include "d/d_com_inf_game.h" #include "d/d_select_cursor.h" #include "d/d_meter2_info.h" diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index 4785e46bf..49c3e4000 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -27,7 +27,7 @@ #include "m_Do/m_Do_graphic.h" #include -#include +#include typedef void (dMenu_Ring_c::*initFunc)(); static initFunc stick_init[] = { diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index b9737e3a4..823ea577f 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -3,7 +3,7 @@ #include "d/d_menu_save.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include +#include #include "d/d_com_inf_game.h" #include "d/d_lib.h" #include "d/d_select_cursor.h" diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index 683b192bb..64ed96711 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -1,7 +1,7 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_class.h" -#include +#include #include "d/d_meter2_info.h" #include "d/d_msg_object.h" #include "d/d_msg_unit.h" diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index f1a9c6945..534346aa9 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -22,7 +22,7 @@ #include "d/d_meter2.h" #include "d/actor/d_a_midna.h" #include "f_op/f_op_msg_mng.h" -#include +#include #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_lib.h" #include "JSystem/JKernel/JKRExpHeap.h" diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp index a6618cf26..3df29b4e1 100644 --- a/src/d/d_msg_scrn_explain.cpp +++ b/src/d/d_msg_scrn_explain.cpp @@ -11,7 +11,7 @@ #include "d/d_msg_string.h" #include "d/d_pane_class.h" #include "m_Do/m_Do_controller_pad.h" -#include +#include #if VERSION == VERSION_GCN_JPN #define STR_BUF_LEN 528 diff --git a/src/d/d_msg_unit.cpp b/src/d/d_msg_unit.cpp index 0e2447b4b..461997731 100644 --- a/src/d/d_msg_unit.cpp +++ b/src/d/d_msg_unit.cpp @@ -2,7 +2,7 @@ #include "d/d_msg_unit.h" #include "d/d_com_inf_game.h" -#include +#include #include "d/d_kankyo.h" #include "d/d_meter2_info.h" diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index bd2515ecc..e45a9ee0d 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -6,7 +6,7 @@ #include "d/d_lib.h" #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_controller_pad.h" -#include +#include #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "f_op/f_op_msg_mng.h" diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index fec0de589..b0597577b 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -17,7 +17,7 @@ #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JMath/JMATrigonometric.h" #include "d/d_s_play.h" -#include +#include #include "d/d_com_inf_game.h" #include "m_Do/m_Do_lib.h" #include "m_Do/m_Do_graphic.h" diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index be4e71b9f..f47814388 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -14,7 +14,7 @@ #include "d/d_com_inf_game.h" #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_graphic.h" -#include +#include dRes_info_c::dRes_info_c() { mCount = 0; diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index e86cc5f06..bc7414f8e 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -19,7 +19,7 @@ #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTReport.h" -#include +#include #if DEBUG void dScnMenu_setItem(int i_slotNo, u8 i_itemNo); diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index b0b6ad1e1..836a9a1a1 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -10,7 +10,7 @@ #include "d/d_s_play.h" #include "d/d_s_room.h" #include "m_Do/m_Do_Reset.h" -#include +#include static int dScnRoom_Draw(room_of_scene_class* i_this) { return 1; diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 99bcced05..fed8634d8 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -13,7 +13,7 @@ #include "d/d_save.h" #include "d/d_save_init.h" #include "f_op/f_op_scene_mng.h" -#include +#include #if PLATFORM_WII || PLATFORM_SHIELD #include diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 7c6a9dc2c..809afb65f 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -17,7 +17,7 @@ #include "f_op/f_op_scene_mng.h" #include "global.h" #include "m_Do/m_Do_Reset.h" -#include +#include void dStage_nextStage_c::set(const char* i_stage, s8 i_roomId, s16 i_point, s8 i_layer, s8 i_wipe, u8 i_speed) { diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp index 25c4bc529..dacaba3be 100644 --- a/src/m_Do/m_Do_MemCardRWmng.cpp +++ b/src/m_Do/m_Do_MemCardRWmng.cpp @@ -8,7 +8,7 @@ #include "JSystem/JUtility/JUTTexture.h" #include "d/d_com_inf_game.h" #include "d/d_save.h" -#include +#include #if VERSION == VERSION_GCN_JPN #define HEADER_TITLE "ゼルダの伝説 ﾄﾜｲﾗｲﾄﾌﾟﾘﾝｾｽ" diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index c1adb5a8e..07ad32028 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -22,7 +22,7 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_main.h" #include "m_Do/m_Do_mtx.h" -#include +#include namespace m_Do_ext { u8 CurrentHeapAdjustVerbose; diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index fe55ea10c..1cca26b3a 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -4,7 +4,7 @@ */ #include "m_Do/m_Do_printf.h" -#include +#include #include #include "m_Do/m_Do_ext.h" diff --git a/src/revolution/homebuttonLib/nw4hbm/db/assert.h b/src/revolution/homebuttonLib/nw4hbm/db/assert.h index 8a7097e4f..fed9be602 100644 --- a/src/revolution/homebuttonLib/nw4hbm/db/assert.h +++ b/src/revolution/homebuttonLib/nw4hbm/db/assert.h @@ -3,7 +3,7 @@ #include -#include +#include namespace nw4hbm { namespace db { diff --git a/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h b/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h index e0ccf2445..80582db70 100644 --- a/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h +++ b/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h @@ -1,8 +1,8 @@ #ifndef NW4HBM_MATH_ARITHMETIC_H #define NW4HBM_MATH_ARITHMETIC_H -#include -#include +#include +#include #include #include diff --git a/src/revolution/homebuttonLib/nw4hbm/math/triangular.h b/src/revolution/homebuttonLib/nw4hbm/math/triangular.h index 9f175a00c..27be799ff 100644 --- a/src/revolution/homebuttonLib/nw4hbm/math/triangular.h +++ b/src/revolution/homebuttonLib/nw4hbm/math/triangular.h @@ -1,8 +1,8 @@ #ifndef NW4HBM_MATH_TRIANGULAR_H #define NW4HBM_MATH_TRIANGULAR_H -#include -#include +#include +#include #include diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h b/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h index e19778295..4470fad3c 100644 --- a/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h +++ b/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h @@ -7,7 +7,7 @@ #include "Rect.h" #include -#include +#include #include "TagProcessorBase.h" diff --git a/src/revolution/homebuttonLib/sound/synenv.cpp b/src/revolution/homebuttonLib/sound/synenv.cpp index c9057b158..894a74400 100644 --- a/src/revolution/homebuttonLib/sound/synenv.cpp +++ b/src/revolution/homebuttonLib/sound/synenv.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include