From bb09df7948cd879ec8646af001f03c1ef8485604 Mon Sep 17 00:00:00 2001 From: Irastris Date: Fri, 4 Sep 2026 20:48:36 -0400 Subject: [PATCH] Tidy includes, drop PC STATIC_ASSERTs, and more macro usage --- include/SSystem/SComponent/c_bg_s_chk.h | 1 - include/SSystem/SComponent/c_m3d_g_tri.h | 1 - include/d/actor/d_a_mant.h | 5 +- include/d/actor/d_a_obj_gb.h | 1 - include/d/actor/d_a_obj_kita.h | 1 - include/d/actor/d_a_obj_sm_door.h | 1 - include/d/d_bg_w.h | 5 +- include/d/d_bg_w_kcol.h | 3 + include/d/d_drawlist.h | 7 +- include/d/d_event_data.h | 3 + include/d/d_file_select.h | 23 ++-- include/d/d_msg_class.h | 3 +- include/d/d_msg_flow.h | 3 + include/d/d_save.h | 3 + include/d/d_stage.h | 6 +- include/d/d_tresure.h | 3 + include/f_op/f_op_actor_mng.h | 4 +- include/m_Do/m_Do_lib.h | 5 +- include/m_Do/m_Do_mtx.h | 5 +- include/m_Do/m_Do_printf.h | 1 - .../src/J3DGraphBase/J3DDrawBuffer.cpp | 5 +- libs/JSystem/src/J3DGraphBase/J3DGD.cpp | 5 +- libs/JSystem/src/J3DGraphBase/J3DPacket.cpp | 11 +- libs/JSystem/src/J3DGraphBase/J3DShape.cpp | 14 +- libs/JSystem/src/J3DGraphBase/J3DShapeMtx.cpp | 5 +- libs/JSystem/src/J3DGraphBase/J3DSys.cpp | 7 +- libs/JSystem/src/JAudio2/JASAiCtrl.cpp | 4 +- libs/JSystem/src/JFramework/JFWDisplay.cpp | 9 +- libs/JSystem/src/JParticle/JPABaseShape.cpp | 3 +- .../src/JParticle/JPAEmitterManager.cpp | 2 + libs/JSystem/src/JParticle/JPAResource.cpp | 8 +- src/d/actor/d_a_alink_effect.inc | 3 + src/d/actor/d_a_alink_hook.inc | 49 +++---- src/d/actor/d_a_bg.cpp | 4 +- src/d/actor/d_a_bg_obj.cpp | 13 +- src/d/actor/d_a_door_shutter.cpp | 5 +- src/d/actor/d_a_e_wb.cpp | 8 +- src/d/actor/d_a_mant.cpp | 3 +- src/d/actor/d_a_midna.cpp | 3 + src/d/actor/d_a_mirror.cpp | 7 +- src/d/actor/d_a_movie_player.cpp | 31 ++--- src/d/actor/d_a_npc_gra.cpp | 3 +- src/d/actor/d_a_npc_grc.cpp | 3 +- src/d/actor/d_a_npc_hanjo.cpp | 2 + src/d/actor/d_a_npc_kkri.cpp | 3 +- src/d/actor/d_a_npc_ne.cpp | 29 ++--- src/d/actor/d_a_npc_saru.cpp | 2 + src/d/actor/d_a_npc_shop0.cpp | 2 + src/d/actor/d_a_npc_toby.cpp | 7 +- src/d/actor/d_a_npc_yelia.cpp | 2 + src/d/actor/d_a_npc_ykw.cpp | 2 + src/d/actor/d_a_obj_gra2.cpp | 9 +- src/d/actor/d_a_obj_lv4chandelier.cpp | 4 - src/d/actor/d_a_obj_master_sword.cpp | 3 +- src/d/actor/d_a_obj_sekizoa.cpp | 5 +- src/d/actor/d_a_tag_evt.cpp | 2 + src/d/actor/d_a_tag_msg.cpp | 2 + src/d/actor/d_a_title.cpp | 11 +- src/d/actor/d_flower.inc | 2 + src/d/actor/d_grass.inc | 14 +- src/d/d_bg_parts.cpp | 2 + src/d/d_bg_s.cpp | 5 +- src/d/d_bright_check.cpp | 7 +- src/d/d_camera.cpp | 5 +- src/d/d_com_inf_game.cpp | 9 +- src/d/d_drawlist.cpp | 15 ++- src/d/d_ev_camera.cpp | 6 +- src/d/d_event.cpp | 2 + src/d/d_event_manager.cpp | 2 + src/d/d_file_sel_info.cpp | 4 +- src/d/d_file_sel_warning.cpp | 3 + src/d/d_file_select.cpp | 15 +-- src/d/d_gameover.cpp | 2 + src/d/d_kankyo.cpp | 4 +- src/d/d_menu_calibration.cpp | 4 +- src/d/d_menu_dmap.cpp | 7 +- src/d/d_menu_dmap_map.cpp | 1 + src/d/d_menu_fishing.cpp | 4 +- src/d/d_menu_fmap.cpp | 25 ++-- src/d/d_menu_fmap2D.cpp | 6 +- src/d/d_menu_fmap_map.cpp | 3 +- src/d/d_menu_insect.cpp | 3 +- src/d/d_menu_item_explain.cpp | 17 ++- src/d/d_menu_option.cpp | 2 +- src/d/d_menu_ring.cpp | 3 +- src/d/d_menu_save.cpp | 4 +- src/d/d_menu_window.cpp | 2 +- src/d/d_meter2_draw.cpp | 6 +- src/d/d_meter2_info.cpp | 2 + src/d/d_meter_button.cpp | 38 ++---- src/d/d_msg_class.cpp | 14 +- src/d/d_msg_out_font.cpp | 23 ++-- src/d/d_msg_scrn_3select.cpp | 10 +- src/d/d_msg_scrn_explain.cpp | 2 + src/d/d_msg_scrn_item.cpp | 2 + src/d/d_msg_scrn_kanban.cpp | 2 +- src/d/d_msg_scrn_light.cpp | 3 + src/d/d_msg_scrn_talk.cpp | 3 +- src/d/d_msg_scrn_tree.cpp | 2 +- src/d/d_name.cpp | 16 +-- src/d/d_particle.cpp | 25 ++-- src/d/d_s_name.cpp | 12 +- src/d/d_save.cpp | 6 +- src/d/d_stage.cpp | 10 +- src/dusk/achievements.h | 5 +- src/dusk/action_bindings.cpp | 3 +- src/dusk/audio/DuskAudioSystem.cpp | 19 +-- src/dusk/audio/DuskDsp.cpp | 22 ++-- src/dusk/audio/DuskDsp.hpp | 9 +- src/dusk/audio/JASCriticalSection.cpp | 4 +- src/dusk/autosave.cpp | 5 + src/dusk/autosave.h | 4 - src/dusk/commands.cpp | 18 +-- src/dusk/config.cpp | 16 +-- src/dusk/discord_presence.cpp | 13 +- src/dusk/dusk.h | 3 +- src/dusk/dvd_asset.cpp | 5 +- src/dusk/game_clock.cpp | 7 +- src/dusk/game_mode.cpp | 8 +- src/dusk/game_mode.hpp | 3 +- src/dusk/gamepad_color.cpp | 15 ++- src/dusk/globals.cpp | 2 +- src/dusk/hq_minimap.cpp | 5 +- src/dusk/imgui/ImGuiActorSpawner.cpp | 7 +- src/dusk/imgui/ImGuiBloomWindow.cpp | 10 +- src/dusk/imgui/ImGuiCameraOverlay.cpp | 13 +- src/dusk/imgui/ImGuiConfig.hpp | 3 +- src/dusk/imgui/ImGuiConsole.cpp | 26 ++-- src/dusk/imgui/ImGuiConsole.hpp | 11 +- src/dusk/imgui/ImGuiControllerOverlay.cpp | 9 +- src/dusk/imgui/ImGuiEngine.cpp | 14 +- src/dusk/imgui/ImGuiEngine.hpp | 4 +- src/dusk/imgui/ImGuiHeapOverlay.cpp | 12 +- src/dusk/imgui/ImGuiMenuTools.cpp | 27 ++-- src/dusk/imgui/ImGuiMenuTools.hpp | 8 +- src/dusk/imgui/ImGuiProcessOverlay.cpp | 12 +- src/dusk/imgui/ImGuiSaveEditor.cpp | 10 +- src/dusk/imgui/ImGuiSaveEditor.hpp | 5 - src/dusk/imgui/ImGuiStateShare.cpp | 24 ++-- src/dusk/imgui/ImGuiStubLog.cpp | 10 +- src/dusk/logging.cpp | 4 +- src/dusk/mod_loader.hpp | 10 +- src/dusk/mods/item_checks.cpp | 9 +- src/dusk/mods/item_gives.cpp | 2 +- src/dusk/mods/loader/bundle_zip.cpp | 3 +- src/dusk/mods/loader/loader.cpp | 42 +++--- src/dusk/mods/log_buffer.hpp | 9 +- src/dusk/mods/manifest.hpp | 4 +- src/dusk/mods/svc/actor.cpp | 9 +- src/dusk/mods/svc/game_mode.cpp | 8 +- src/dusk/mods/svc/host.cpp | 5 +- src/dusk/mods/svc/overlay.cpp | 9 +- src/dusk/mods/svc/save.cpp | 6 +- src/dusk/mods/svc/stage.cpp | 5 +- src/dusk/mods/svc/ui.cpp | 8 +- src/dusk/stubs.cpp | 17 +-- src/dusk/time.h | 4 +- src/dusk/ui/achievements.cpp | 10 +- src/dusk/ui/document.cpp | 3 +- src/dusk/ui/menu_bar.cpp | 32 +++-- src/dusk/ui/mods_window.cpp | 11 +- src/dusk/ui/overlay.cpp | 17 ++- src/dusk/ui/settings.cpp | 39 +++--- src/dusk/ui/ui.cpp | 36 +++--- src/dusk/ui/warp.cpp | 3 +- src/dusk/ui/window.cpp | 10 +- src/f_ap/f_ap_game.cpp | 46 +++---- src/f_pc/f_pc_draw.cpp | 5 +- src/f_pc/f_pc_leaf.cpp | 4 +- src/f_pc/f_pc_manager.cpp | 4 +- src/f_pc/f_pc_node.cpp | 4 +- src/helpers/batch.cpp | 1 + src/helpers/endian.cpp | 5 +- src/helpers/string.cpp | 3 +- src/m_Do/m_Do_audio.cpp | 3 +- src/m_Do/m_Do_controller_pad.cpp | 3 +- src/m_Do/m_Do_ext.cpp | 10 +- src/m_Do/m_Do_graphic.cpp | 14 +- src/m_Do/m_Do_main.cpp | 121 ++++++++---------- 179 files changed, 838 insertions(+), 799 deletions(-) diff --git a/include/SSystem/SComponent/c_bg_s_chk.h b/include/SSystem/SComponent/c_bg_s_chk.h index 6908ef80ed..badc04679a 100644 --- a/include/SSystem/SComponent/c_bg_s_chk.h +++ b/include/SSystem/SComponent/c_bg_s_chk.h @@ -5,7 +5,6 @@ #include "f_pc/f_pc_base.h" #include "SSystem/SComponent/c_bg_s_grp_pass_chk.h" #include "SSystem/SComponent/c_bg_s_poly_pass_chk.h" -#include "helpers/endian.h" struct cBgD_Vtx_t : public Vec {}; diff --git a/include/SSystem/SComponent/c_m3d_g_tri.h b/include/SSystem/SComponent/c_m3d_g_tri.h index 9947616d54..cd535d66c3 100644 --- a/include/SSystem/SComponent/c_m3d_g_tri.h +++ b/include/SSystem/SComponent/c_m3d_g_tri.h @@ -2,7 +2,6 @@ #define C_M3D_G_TRI_H_ #include "SSystem/SComponent/c_m3d_g_pla.h" -#include "helpers/endian.h" class cM3dGCyl; diff --git a/include/d/actor/d_a_mant.h b/include/d/actor/d_a_mant.h index 6d5b173d1a..e6f3d71a9c 100644 --- a/include/d/actor/d_a_mant.h +++ b/include/d/actor/d_a_mant.h @@ -92,10 +92,7 @@ public: /* 0x39A4 */ cM_rnd_c mMantRng; #endif }; -#if TARGET_PC -STATIC_ASSERT(sizeof(mant_class) == 0x39ac); -#else + STATIC_ASSERT(sizeof(mant_class) == 0x39a4); -#endif #endif /* D_A_MANT_H */ diff --git a/include/d/actor/d_a_obj_gb.h b/include/d/actor/d_a_obj_gb.h index 3f5a354f5e..2bc435b2df 100644 --- a/include/d/actor/d_a_obj_gb.h +++ b/include/d/actor/d_a_obj_gb.h @@ -36,5 +36,4 @@ public: STATIC_ASSERT(sizeof(obj_gb_class) == 0x6bc); - #endif /* D_A_OBJ_GB_H */ diff --git a/include/d/actor/d_a_obj_kita.h b/include/d/actor/d_a_obj_kita.h index 1e343c78ce..09eff51298 100644 --- a/include/d/actor/d_a_obj_kita.h +++ b/include/d/actor/d_a_obj_kita.h @@ -17,7 +17,6 @@ public: STATIC_ASSERT(sizeof(kita_s) == 0x60); - /** * @ingroup actors-objects * @class obj_kita_class diff --git a/include/d/actor/d_a_obj_sm_door.h b/include/d/actor/d_a_obj_sm_door.h index 7622ee0fa3..bd6553c0d2 100644 --- a/include/d/actor/d_a_obj_sm_door.h +++ b/include/d/actor/d_a_obj_sm_door.h @@ -53,5 +53,4 @@ public: STATIC_ASSERT(sizeof(daObjSM_DOOR_c) == 0x858); - #endif /* D_A_OBJ_SM_DOOR_H */ diff --git a/include/d/d_bg_w.h b/include/d/d_bg_w.h index a9d61822b8..c9692a7c61 100644 --- a/include/d/d_bg_w.h +++ b/include/d/d_bg_w.h @@ -6,9 +6,12 @@ #include "d/d_bg_w_base.h" #include #include -#include "helpers/offset_ptr.h" + +#if TARGET_PC #include "helpers/endian.h" #include "helpers/endian_ssystem.h" +#include "helpers/offset_ptr.h" +#endif class cBgS_GrpPassChk; class cBgS_PolyPassChk; diff --git a/include/d/d_bg_w_kcol.h b/include/d/d_bg_w_kcol.h index 42a33b197e..b0abe32102 100644 --- a/include/d/d_bg_w_kcol.h +++ b/include/d/d_bg_w_kcol.h @@ -6,7 +6,10 @@ #include "d/d_bg_plc.h" #include "d/d_bg_s_sph_chk.h" #include "d/d_bg_w_base.h" + +#if TARGET_PC #include "helpers/offset_ptr.h" +#endif class cBgS_GrpPassChk; class cBgS_PolyPassChk; diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 7965793dcf..f792f544cc 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -5,10 +5,13 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J3DGraphBase/J3DSys.h" #include "SSystem/SComponent/c_m3d_g_pla.h" -#include "helpers/gx_helper.h" #include "f_op/f_op_view.h" -#include "global.h" #include "m_Do/m_Do_ext.h" +#include "global.h" + +#if TARGET_PC +#include "helpers/gx_helper.h" +#endif class J3DDrawBuffer; class J3DModel; diff --git a/include/d/d_event_data.h b/include/d/d_event_data.h index 809ab93eef..786088250f 100644 --- a/include/d/d_event_data.h +++ b/include/d/d_event_data.h @@ -3,7 +3,10 @@ #include "global.h" #include "f_pc/f_pc_base.h" + +#if TARGET_PC #include "helpers/endian.h" +#endif struct msg_class; diff --git a/include/d/d_file_select.h b/include/d/d_file_select.h index 48d81d9ad5..dd4d5a3aae 100644 --- a/include/d/d_file_select.h +++ b/include/d/d_file_select.h @@ -706,26 +706,23 @@ public: /* 0x2374 */ u8 mFadeFlag; /* 0x2375 */ bool mHasDrawn; - #if PLATFORM_GCN +#if PLATFORM_GCN /* 0x2378 */ J2DPicture* mpFadePict; - #endif -#ifdef TARGET_PC +#endif + +#if PLATFORM_WII || PLATFORM_SHIELD + /* 0x2376 */ u8 field_0x2376[SAVEFILE_SIZE]; + /* 0x4332 */ u8 field_0x4332; + /* 0x4333 */ u8 field_0x4333; +#endif + +#if TARGET_PC dDlst_FileSelFade_c mFadeDlst; bool mGameModeSaveStartBuildUi = true; GameModeNewSaveState mGameModeNewSaveState = GAME_MODE_STATE_PENDING; #endif - - #if PLATFORM_WII || PLATFORM_SHIELD - /* 0x2376 */ u8 field_0x2376[SAVEFILE_SIZE]; - /* 0x4332 */ u8 field_0x4332; - /* 0x4333 */ u8 field_0x4333; - #endif }; -#ifdef TARGET_PC -STATIC_ASSERT(sizeof(dFile_select_c) == 0x237C + sizeof(dDlst_FileSelFade_c)); -#else STATIC_ASSERT(sizeof(dFile_select_c) == 0x237C); -#endif #endif /* D_FILE_D_FILE_SELECT_H */ diff --git a/include/d/d_msg_class.h b/include/d/d_msg_class.h index c70345ca92..49a99a6ef1 100644 --- a/include/d/d_msg_class.h +++ b/include/d/d_msg_class.h @@ -4,10 +4,11 @@ #include "JSystem/JMessage/control.h" #include "JSystem/JMessage/JMessage.h" #include "SSystem/SComponent/c_xyz.h" + +#if TARGET_PC #include "helpers/endian.h" #include "helpers/string.hpp" -#if TARGET_PC #define D_MSG_CLASS_PAGE_CNT_MAX 40 #define D_MSG_CLASS_CHAR_CNT_MAX 0x210 #define D_MSG_CLASS_LINE_MAX 12 diff --git a/include/d/d_msg_flow.h b/include/d/d_msg_flow.h index eeece6f4fa..b7ffb11fc7 100644 --- a/include/d/d_msg_flow.h +++ b/include/d/d_msg_flow.h @@ -2,7 +2,10 @@ #define D_MSG_D_MSG_FLOW_H #include + +#if TARGET_PC #include "helpers/endian.h" +#endif enum { NODETYPE_MESSAGE_e = 1, diff --git a/include/d/d_save.h b/include/d/d_save.h index 7fdbccf1df..ec10360034 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -8,7 +8,10 @@ #include "d/d_item_data.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JHostIO/JORReflexible.h" + +#if TARGET_PC #include "helpers/endian.h" +#endif static const int DEFAULT_SELECT_ITEM_INDEX = 0; static const int MAX_SELECT_ITEM = 4; diff --git a/include/d/d_stage.h b/include/d/d_stage.h index cb2ed0b513..fb8fd3124b 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -4,10 +4,14 @@ #include "SSystem/SComponent/c_lib.h" #include "d/d_kankyo.h" #include "d/d_kankyo_data.h" -#include "helpers/offset_ptr.h" #include "f_op/f_op_actor_mng.h" #include "global.h" + +#if TARGET_PC +#include "helpers/offset_ptr.h" + #include "os_report.h" +#endif enum StageType { /* 0x0 */ ST_FIELD, diff --git a/include/d/d_tresure.h b/include/d/d_tresure.h index e043dd94fb..4335a6a215 100644 --- a/include/d/d_tresure.h +++ b/include/d/d_tresure.h @@ -2,7 +2,10 @@ #define D_D_TRESURE_H #include + +#if TARGET_PC #include "helpers/offset_ptr.h" +#endif class dTres_c { public: diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 5cf357b778..29dfac1389 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -12,9 +12,10 @@ #include "f_pc/f_pc_manager.h" #include "m_Do/m_Do_hostIO.h" #include "SSystem/SComponent/c_phase.h" + +#if TARGET_PC #include "helpers/endian_ssystem.h" -#if !__MWERKS__ // mwerks compiler makes value initialization act like default initialization so we need // to be explicit about default initialization in modern compilers #define fopAcM_ct_placement(ptr, ClassName) JKR_NEW_ARGS (ptr) ClassName @@ -28,7 +29,6 @@ fopAcM_OnCondition(ptr, fopAcCnd_INIT_e); \ } - #define fopAcM_RegisterDeleteID(i_this, actor_name_str) \ ("Delete -> " actor_name_str "(id=%d)\n", fopAcM_GetID(i_this)) diff --git a/include/m_Do/m_Do_lib.h b/include/m_Do/m_Do_lib.h index 6b85cc0660..9ceaa9c137 100644 --- a/include/m_Do/m_Do_lib.h +++ b/include/m_Do/m_Do_lib.h @@ -2,13 +2,10 @@ #define M_DO_M_DO_LIB_H #include "JSystem/J3DU/J3DUClipper.h" -#include #if TARGET_PC -#include "JSystem/JGeometry.h" -#endif - #include "helpers/gx_helper.h" +#endif typedef struct Vec Vec; struct ResTIMG; diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index 89e7e8b7cf..fdf5b66fed 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -5,9 +5,12 @@ #include "SSystem/SComponent/c_xyz.h" #include -#include "JSystem/JMath/JMath.h" +#if TARGET_PC #include "helpers/endian.h" +#include "JSystem/JMath/JMath.h" +#endif + extern u8 g_printCurrentHeapDebug; DUSK_GAME_EXTERN u8 g_printOtherHeapDebug; diff --git a/include/m_Do/m_Do_printf.h b/include/m_Do/m_Do_printf.h index a71669f432..dc30b1c720 100644 --- a/include/m_Do/m_Do_printf.h +++ b/include/m_Do/m_Do_printf.h @@ -2,7 +2,6 @@ #define M_DO_M_DO_PRINTF_H #include -#include "helpers/endian.h" void my_PutString(const char*); void mDoPrintf_vprintf_Interrupt(char const*, va_list); diff --git a/libs/JSystem/src/J3DGraphBase/J3DDrawBuffer.cpp b/libs/JSystem/src/J3DGraphBase/J3DDrawBuffer.cpp index 40c523643e..2d175ff871 100644 --- a/libs/JSystem/src/J3DGraphBase/J3DDrawBuffer.cpp +++ b/libs/JSystem/src/J3DGraphBase/J3DDrawBuffer.cpp @@ -8,7 +8,10 @@ #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/JKernel/JKRHeap.h" -#include "tracy/Tracy.hpp" + +#if TARGET_PC +#include +#endif void J3DDrawBuffer::calcZRatio() { mZRatio = (mZFar - mZNear) / (f32)mEntryTableSize; diff --git a/libs/JSystem/src/J3DGraphBase/J3DGD.cpp b/libs/JSystem/src/J3DGraphBase/J3DGD.cpp index eb89fc3b81..74e5c2c759 100644 --- a/libs/JSystem/src/J3DGraphBase/J3DGD.cpp +++ b/libs/JSystem/src/J3DGraphBase/J3DGD.cpp @@ -6,7 +6,10 @@ #include "JSystem/J3DGraphBase/J3DGD.h" #include "JSystem/J3DGraphBase/J3DFifo.h" -#include + +#if TARGET_PC +#include "dusk/logging.h" +#endif void J3DGDSetGenMode(u8 nTexGens, u8 nChans, u8 nTevs, u8 nInds, GXCullMode cm) { diff --git a/libs/JSystem/src/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/src/J3DGraphBase/J3DPacket.cpp index f87283df47..38cfddd260 100644 --- a/libs/JSystem/src/J3DGraphBase/J3DPacket.cpp +++ b/libs/JSystem/src/J3DGraphBase/J3DPacket.cpp @@ -1,15 +1,18 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep -#include -#include +#include "JSystem/J3DGraphBase/J3DPacket.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" -#include "JSystem/J3DGraphBase/J3DPacket.h" #include "JSystem/J3DGraphBase/J3DShapeMtx.h" #include "JSystem/JKernel/JKRHeap.h" +#include +#include #include "global.h" -#include "tracy/Tracy.hpp" + +#if TARGET_PC +#include +#endif J3DError J3DDisplayListObj::newDisplayList(u32 maxSize) { mMaxSize = ALIGN_NEXT(maxSize, 0x20); diff --git a/libs/JSystem/src/J3DGraphBase/J3DShape.cpp b/libs/JSystem/src/J3DGraphBase/J3DShape.cpp index 22eb76a533..07ed23ed4a 100644 --- a/libs/JSystem/src/J3DGraphBase/J3DShape.cpp +++ b/libs/JSystem/src/J3DGraphBase/J3DShape.cpp @@ -1,15 +1,17 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/J3DGraphBase/J3DShape.h" - -#include -#include -#include -#include "JSystem/J3DGraphBase/J3DFifo.h" #include "JSystem/J3DGraphBase/J3DPacket.h" #include "JSystem/J3DGraphBase/J3DVertex.h" +#include "JSystem/J3DGraphBase/J3DFifo.h" +#include + +#if TARGET_PC #include "JSystem/JKernel/JKRHeap.h" -#include "tracy/Tracy.hpp" + +#include +#include +#endif void J3DGDSetVtxAttrFmtv(GXVtxFmt, GXVtxAttrFmtList const*, bool); void J3DFifoLoadPosMtxImm(Mtx, u32); diff --git a/libs/JSystem/src/J3DGraphBase/J3DShapeMtx.cpp b/libs/JSystem/src/J3DGraphBase/J3DShapeMtx.cpp index 41d2e96ef0..cedc451cb4 100644 --- a/libs/JSystem/src/J3DGraphBase/J3DShapeMtx.cpp +++ b/libs/JSystem/src/J3DGraphBase/J3DShapeMtx.cpp @@ -6,11 +6,14 @@ #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/J3DGraphBase/J3DTexture.h" + +#if TARGET_PC #include "dusk/frame_interpolation.h" +#endif DUSK_GAME_DATA u16 J3DShapeMtx::sMtxLoadCache[10]; -#ifdef TARGET_PC +#if TARGET_PC static void J3DFrameInterpConcat(MtxP lhs, MtxP rhs, Mtx out) { if (!dusk::frame_interp::lookup_concat_replacement(lhs, rhs, out)) { MTXConcat(lhs, rhs, out); diff --git a/libs/JSystem/src/J3DGraphBase/J3DSys.cpp b/libs/JSystem/src/J3DGraphBase/J3DSys.cpp index bdacff4276..f1810ca158 100644 --- a/libs/JSystem/src/J3DGraphBase/J3DSys.cpp +++ b/libs/JSystem/src/J3DGraphBase/J3DSys.cpp @@ -1,15 +1,16 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep -#include "JSystem/J3DGraphBase/J3DFifo.h" #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/J3DGraphBase/J3DTevs.h" #include "JSystem/J3DGraphBase/J3DTexture.h" -#include "helpers/gx_helper.h" +#include "JSystem/J3DGraphBase/J3DFifo.h" #include "global.h" -#include "tracy/Tracy.hpp" #if TARGET_PC #include "dusk/frame_interpolation.h" +#include "helpers/gx_helper.h" + +#include #endif DUSK_GAME_DATA J3DSys j3dSys; diff --git a/libs/JSystem/src/JAudio2/JASAiCtrl.cpp b/libs/JSystem/src/JAudio2/JASAiCtrl.cpp index 545b0d41dc..e59c9d45fe 100644 --- a/libs/JSystem/src/JAudio2/JASAiCtrl.cpp +++ b/libs/JSystem/src/JAudio2/JASAiCtrl.cpp @@ -18,7 +18,9 @@ #include #include -#include "tracy/Tracy.hpp" +#if TARGET_PC +#include +#endif DUSK_GAME_DATA s16* JASDriver::sDmaDacBuffer[3]; diff --git a/libs/JSystem/src/JFramework/JFWDisplay.cpp b/libs/JSystem/src/JFramework/JFWDisplay.cpp index 466335eae9..8d6f4eb868 100644 --- a/libs/JSystem/src/JFramework/JFWDisplay.cpp +++ b/libs/JSystem/src/JFramework/JFWDisplay.cpp @@ -12,17 +12,18 @@ #include "global.h" #include -#ifdef TARGET_PC +#if TARGET_PC #include "dusk/dusk.h" #include "dusk/frame_interpolation.h" #include "dusk/logging.h" #include "dusk/settings.h" #include "dusk/time.h" -#include "f_op/f_op_overlap_mng.h" #include "helpers/gx_helper.h" -#include "SDL3/SDL_timer.h" -#include "tracy/Tracy.hpp" +#include "f_op/f_op_overlap_mng.h" + +#include +#include #include #endif diff --git a/libs/JSystem/src/JParticle/JPABaseShape.cpp b/libs/JSystem/src/JParticle/JPABaseShape.cpp index c47d978b00..bab7e89646 100644 --- a/libs/JSystem/src/JParticle/JPABaseShape.cpp +++ b/libs/JSystem/src/JParticle/JPABaseShape.cpp @@ -11,8 +11,9 @@ #if TARGET_PC #include "dusk/frame_interpolation.h" + +#include #endif -#include "tracy/Tracy.hpp" #if TARGET_PC #define JPA_DRAW_CTX_PARAM , ParticleDrawCtx* ctx diff --git a/libs/JSystem/src/JParticle/JPAEmitterManager.cpp b/libs/JSystem/src/JParticle/JPAEmitterManager.cpp index 3a793000ed..0dcaa3b8b5 100644 --- a/libs/JSystem/src/JParticle/JPAEmitterManager.cpp +++ b/libs/JSystem/src/JParticle/JPAEmitterManager.cpp @@ -8,7 +8,9 @@ #include "JSystem/JUtility/JUTAssert.h" #include +#if TARGET_PC #include "tracy/Tracy.hpp" +#endif JPAEmitterManager::JPAEmitterManager(u32 i_ptclNum, u32 i_emtrNum, JKRHeap* pHeap, u8 i_gidMax, u8 i_ridMax) { diff --git a/libs/JSystem/src/JParticle/JPAResource.cpp b/libs/JSystem/src/JParticle/JPAResource.cpp index b67ac47489..1eef1b08a5 100644 --- a/libs/JSystem/src/JParticle/JPAResource.cpp +++ b/libs/JSystem/src/JParticle/JPAResource.cpp @@ -1,10 +1,6 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JParticle/JPAResource.h" - -#include - -#include #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JParticle/JPABaseShape.h" #include "JSystem/JParticle/JPAChildShape.h" @@ -15,12 +11,14 @@ #include "JSystem/JParticle/JPAKeyBlock.h" #include "JSystem/JParticle/JPAParticle.h" #include "JSystem/JParticle/JPAResourceManager.h" +#include #include "global.h" -#include "tracy/Tracy.hpp" #if TARGET_PC #include "dusk/frame_interpolation.h" +#include + #define JPA_DRAW_CTX_ARG , &ctx #else #define JPA_DRAW_CTX_ARG diff --git a/src/d/actor/d_a_alink_effect.inc b/src/d/actor/d_a_alink_effect.inc index db64d25b81..b3a9d7bdc4 100644 --- a/src/d/actor/d_a_alink_effect.inc +++ b/src/d/actor/d_a_alink_effect.inc @@ -8,7 +8,10 @@ #include "d/actor/d_a_alink.h" #include "d/d_com_inf_game.h" #include "d/d_k_wmark.h" + +#if TARGET_PC #include "helpers/gx_helper.h" +#endif DUSK_GAME_DATA const EffParamProc daAlink_c::m_fEffParamProc[] = { &daAlink_c::setEffectFrontRollParam, diff --git a/src/d/actor/d_a_alink_hook.inc b/src/d/actor/d_a_alink_hook.inc index 660cf3b2ce..cbc8bdc664 100644 --- a/src/d/actor/d_a_alink_hook.inc +++ b/src/d/actor/d_a_alink_hook.inc @@ -8,9 +8,14 @@ #include "d/actor/d_a_obj_swhang.h" #include "d/actor/d_a_obj_chandelier.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" + +#if TARGET_PC #include "dusk/frame_interpolation.h" #include "dusk/settings.h" +static const int HS_CHAIN_MAX_LINKS = 600; +#endif + enum { HS_MODE_NONE_e, HS_MODE_READY_e, @@ -19,10 +24,6 @@ enum { HS_MODE_RETURN_e = 6, }; -#if TARGET_PC -static const int HS_CHAIN_MAX_LINKS = 600; -#endif - void daAlink_c::hsChainShape_c::draw() { static const int dummy = 0; @@ -34,9 +35,7 @@ void daAlink_c::hsChainShape_c::draw() { j3dSys.setVtxPos(modelData->getVtxPosArray(), modelData->getVtxNum()); j3dSys.setVtxNrm(modelData->getVtxNrmArray(), modelData->getNrmNum()); j3dSys.setVtxCol(modelData->getVtxColorArray(0), modelData->getColNum()); -#if TARGET_PC - j3dSys.setTexture(modelData->getTexture()); -#endif + IF_DUSK(j3dSys.setTexture(modelData->getTexture())); J3DShape::resetVcdVatCache(); material->loadSharedDL(); @@ -150,12 +149,9 @@ void daAlink_c::hsChainShape_c::draw() { hsInterpSubRoot = alink->getHsSubChainRootPos(); hsInterpSubTop = alink->getHsSubChainTopPos(); } - const cXyz& chainRootPos = hsInterpRoot; - const cXyz& chainTopPos = hsInterpTop; -#else - const cXyz& chainRootPos = alink->getHsChainRootPos(); - const cXyz& chainTopPos = alink->getHsChainTopPos(); #endif + const cXyz& chainRootPos = DUSK_IF_ELSE(hsInterpRoot, alink->getHsChainRootPos()); + const cXyz& chainTopPos = DUSK_IF_ELSE(hsInterpTop, alink->getHsChainTopPos()); cXyz maxDistance = chainRootPos - chainTopPos; f32 maxDistanceF = maxDistance.abs(); @@ -185,11 +181,9 @@ void daAlink_c::hsChainShape_c::draw() { } (void)0; -#if TARGET_PC - int chainLinks = 0; -#endif + IF_DUSK(int chainLinks = 0); - while (maxDistanceF > var_f30 IF_DUSK(&&chainLinks < HS_CHAIN_MAX_LINKS)) { + while (maxDistanceF > var_f30 IF_DUSK(&& chainLinks < HS_CHAIN_MAX_LINKS)) { temp_f27 = var_f28 * cM_fsin(sp34 * var_f30); s16 spC = cM_atan2s(temp_f27 - var_f26, 5.0f); sp64.x = sp6C.x + spC; @@ -212,19 +206,12 @@ void daAlink_c::hsChainShape_c::draw() { var_f26 = temp_f27; var_f30 += fabsf(cM_scos(spC)) * 5.0f; -#if TARGET_PC - chainLinks++; -#endif + IF_DUSK(chainLinks++); } } -#if TARGET_PC - const cXyz& subChainRootPos = hsInterpSubRoot; - const cXyz& subChainTopPos = hsInterpSubTop; -#else - const cXyz& subChainRootPos = alink->getHsSubChainRootPos(); - const cXyz& subChainTopPos = alink->getHsSubChainTopPos(); -#endif + const cXyz& subChainRootPos = DUSK_IF_ELSE(hsInterpSubRoot, alink->getHsSubChainRootPos()); + const cXyz& subChainTopPos = DUSK_IF_ELSE(hsInterpSubTop, alink->getHsSubChainTopPos()); maxDistance = subChainRootPos - subChainTopPos; maxDistanceF = maxDistance.abs(); @@ -235,11 +222,9 @@ void daAlink_c::hsChainShape_c::draw() { sp98 = subChainTopPos; sp6C.set(maxDistance.atan2sY_XZ(), maxDistance.atan2sX_Z(), 0); -#if TARGET_PC - int subChainLinks = 0; -#endif + IF_DUSK(int subChainLinks = 0); - while (maxDistanceF > var_f30 IF_DUSK(&&subChainLinks < HS_CHAIN_MAX_LINKS)) { + while (maxDistanceF > var_f30 IF_DUSK(&& subChainLinks < HS_CHAIN_MAX_LINKS)) { mDoMtx_stack_c::copy(j3dSys.getViewMtx()); mDoMtx_stack_c::transM(sp98); mDoMtx_stack_c::ZXYrotM(sp6C); @@ -252,9 +237,7 @@ void daAlink_c::hsChainShape_c::draw() { sp98 += maxDistance * 5.0f; ANGLE_ADD_2(sp6C.z, 0x3000); var_f30 += 5.0f; -#if TARGET_PC - subChainLinks++; -#endif + IF_DUSK(subChainLinks++); } } } diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 110e2aef15..051abc4172 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -624,9 +624,7 @@ int daBg_c::create() { dComIfGp_roomControl_onStatusFlag(roomNo, 0x10); OS_REPORT(" room%d\n", roomNo); -#if TARGET_PC - draw_interp_frame = true; -#endif + IF_DUSK(draw_interp_frame = true); return cPhs_COMPLEATE_e; } diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index da18ce4501..84a8995cb8 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -5,15 +5,18 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep -#include -#include -#include -#include "JSystem/J3DGraphBase/J3DMaterial.h" -#include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_bg_obj.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include +#include +#include #include "d/actor/d_a_set_bgobj.h" #include "d/d_s_play.h" +#include "SSystem/SComponent/c_math.h" + +#if TARGET_PC #include "helpers/string.hpp" +#endif static const char* getBmdName(int param_0, int param_1) { static char l_bmdName[16]; diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index 3b7cdcc5f2..b7a7286903 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -18,8 +18,9 @@ #include #if TARGET_PC -#include -#include +#include "dusk/autosave.h" + +#include "f_ap/f_ap_game.h" #endif char DUSK_CONST* daDoor20_c::getStopBmdName() { diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index b5a38eff65..a7f2e4f7b3 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -4542,9 +4542,7 @@ static void demo_camera(e_wb_class* i_this) { i_this->demo_cam_way_spd.z = fabsf(i_this->demo_cam_way.z - i_this->demo_cam_ctr.z); i_this->demo_cam_morf = 0; pla->setPlayerPosAndAngle(&pla->current.pos, pla->shape_angle.y - 4000, 0); -#if TARGET_PC - dusk::frame_interp::request_presentation_sync(); -#endif + IF_DUSK(dusk::frame_interp::request_presentation_sync()); } if (i_this->demo_timer == 345) { daPy_getPlayerActorClass()->setThrowDamage(boss->enemy.shape_angle.y - 8000 + TREG_S(8), @@ -4791,9 +4789,7 @@ static void demo_camera(e_wb_class* i_this) { i_this->demo_cam_eye.x += 300.0f + VREG_F(8); i_this->demo_cam_eye.y += 150.0f + VREG_F(9); i_this->demo_cam_eye.z -= 1400.0f + VREG_F(10); -#if TARGET_PC - dusk::frame_interp::request_presentation_sync(); -#endif + IF_DUSK(dusk::frame_interp::request_presentation_sync()); } } else { i_this->demo_cam_eye = enemy->current.pos; diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp index cc83028b9c..3f9c2deae1 100644 --- a/src/d/actor/d_a_mant.cpp +++ b/src/d/actor/d_a_mant.cpp @@ -11,10 +11,11 @@ #include "d/d_com_inf_game.h" #if TARGET_PC -#include #include "dusk/dvd_asset.hpp" #include "dusk/frame_interpolation.h" +#include + #include using namespace dusk::version; diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp index 0be48b3794..47d3da98c8 100644 --- a/src/d/actor/d_a_midna.cpp +++ b/src/d/actor/d_a_midna.cpp @@ -14,7 +14,10 @@ #include "d/d_msg_object.h" #include "d/d_s_play.h" #include "d/d_debug_viewer.h" + +#if TARGET_PC #include "dusk/frame_interpolation.h" +#endif static f32 dummy_lit_3777(int idx, u8 foo) { Vec dummy_vec = {0.0f, 0.0f, 0.0f}; diff --git a/src/d/actor/d_a_mirror.cpp b/src/d/actor/d_a_mirror.cpp index 486a035590..d02d81d834 100644 --- a/src/d/actor/d_a_mirror.cpp +++ b/src/d/actor/d_a_mirror.cpp @@ -13,14 +13,11 @@ #include #include #include "m_Do/m_Do_lib.h" + #if TARGET_PC #include "dusk/frame_interpolation.h" #endif -#ifndef __MWERKS__ -#include "helpers/math.h" -#endif - static BOOL daMirror_c_createHeap(fopAc_ac_c* i_this) { return ((daMirror_c*)i_this)->createHeap(); } @@ -30,7 +27,7 @@ static DUSK_CONSTEXPR char DUSK_CONST* l_arcName = "Mirror"; static DUSK_CONSTEXPR char DUSK_CONST* l_arcName2 = "MR-Table"; dMirror_packet_c::dMirror_packet_c() { -#ifdef TARGET_PC +#if TARGET_PC GXInitTexObj(&mTexObj, nullptr, 0, 0, static_cast(-1), GX_MAX_TEXWRAPMODE, GX_MAX_TEXWRAPMODE, GX_FALSE); #endif diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index 5d076b759e..aabe220578 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -14,28 +14,21 @@ #pragma optimization_level 4 #pragma optimize_for_size off -#include +#include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JAudio2/JASAiCtrl.h" #include "JSystem/JAudio2/JASDriverIF.h" -#include "JSystem/JKernel/JKRExpHeap.h" -#include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_movie_player.h" - +#include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_overlap_mng.h" +#include + +#if TARGET_PC +#include "dusk/layout.hpp" +#include "dusk/os.h" +#include "helpers/gx_helper.h" #include "JSystem/JAudio2/JASCriticalSection.h" -#if TARGET_PC -#include "helpers/gx_helper.h" -#include "dusk/os.h" -#include "dusk/layout.hpp" -#endif - -inline s32 daMP_NEXT_READ_SIZE(daMP_THPReadBuffer* readBuf) { - return *(BE(s32)*)readBuf->ptr; -} - -#if TARGET_PC // idk what OS_THREAD_ATTR_DETACH does, and it stops OSThreadJoin() // probably the difference doesn't matter since we are using OS threads anyways. #define OS_THREAD_ATTR 0 @@ -43,6 +36,10 @@ inline s32 daMP_NEXT_READ_SIZE(daMP_THPReadBuffer* readBuf) { #define OS_THREAD_ATTR OS_THREAD_ATTR_DETACH #endif +inline s32 daMP_NEXT_READ_SIZE(daMP_THPReadBuffer* readBuf) { + return *(BE(s32)*)readBuf->ptr; +} + #if !TARGET_PC #if defined(__cplusplus) extern "C" { @@ -4242,10 +4239,6 @@ static void daMP_ActivePlayer_Main() { } } -#if TARGET_PC && 0 -#include "imgui.h" -#endif - static void daMP_ActivePlayer_Draw() { #if TARGET_PC u16 width = JUTVideo::getManager()->getFbWidth(); diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index d57ce3ab2b..6f6293bed7 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -12,10 +12,11 @@ #include "d/actor/d_a_npc_gra.h" #include "d/actor/d_a_tag_gra.h" #include "Z2AudioLib/Z2Instances.h" +#include + #if TARGET_PC #include "mods/items.h" #endif -#include DUSK_GAME_DATA const daNpc_grA_HIOParam daNpc_grA_Param_c::m = { {90.0f, -4.0f, 1.0f, 850.0f, 255.0f, 280.0f, 40.0f, 100.0f, 0.0f, 0.0f, 20.0f, diff --git a/src/d/actor/d_a_npc_grc.cpp b/src/d/actor/d_a_npc_grc.cpp index 47ea7490c0..77aeb8016d 100644 --- a/src/d/actor/d_a_npc_grc.cpp +++ b/src/d/actor/d_a_npc_grc.cpp @@ -8,10 +8,11 @@ #include "d/actor/d_a_npc_grc.h" #include "d/actor/d_a_npc.h" #include "Z2AudioLib/Z2Instances.h" +#include + #if TARGET_PC #include "mods/items.h" #endif -#include enum grC_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp index cbd3d9dcf9..2b5284e69d 100644 --- a/src/d/actor/d_a_npc_hanjo.cpp +++ b/src/d/actor/d_a_npc_hanjo.cpp @@ -15,7 +15,9 @@ #include "Z2AudioLib/Z2Instances.h" #include +#if TARGET_PC #include "helpers/string.hpp" +#endif static DUSK_CONSTEXPR int l_bmdData[4][2] = { {14, 1}, {26, 2}, diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp index 97e375e4ec..9082c9c473 100644 --- a/src/d/actor/d_a_npc_kkri.cpp +++ b/src/d/actor/d_a_npc_kkri.cpp @@ -7,10 +7,11 @@ #include "d/actor/d_a_npc_kkri.h" #include "d/actor/d_a_e_ym.h" +#include + #if TARGET_PC #include "mods/items.h" #endif -#include static DUSK_CONSTEXPR int l_bmdData[2][2] = { {35, 1}, diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index edce270a2c..de48a76851 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -18,9 +18,12 @@ #include "f_op/f_op_kankyo_mng.h" #include "c/c_damagereaction.h" #include "Z2AudioLib/Z2Instances.h" -#include "dusk/frame_interpolation.h" #include +#if TARGET_PC +#include "dusk/frame_interpolation.h" +#endif + static home_path_pnt home_path[38] = { {0, {561.0f, 87.0f, -1110.0f}}, {1, {306.0f, 87.0f, -849.0f}}, @@ -2656,9 +2659,7 @@ static void demo_camera(npc_ne_class* i_this) { i_this->mCameraFovY = 55.0f; camera->mCamera.SetTrimSize(3); daPy_getPlayerActorClass()->changeOriginalDemo(); -#ifdef TARGET_PC - dusk::frame_interp::request_presentation_sync(); -#endif + IF_DUSK(dusk::frame_interp::request_presentation_sync()); // fallthrough case 2: @@ -2687,9 +2688,7 @@ static void demo_camera(npc_ne_class* i_this) { if (i_this->mDemoCounter == 0) { i_this->mCameraCenter1.set(387.0f, 133.0f, -866.0f); i_this->mCameraEye1.set(284.0f, 208.0f, -585.0f); -#ifdef TARGET_PC - dusk::frame_interp::request_presentation_sync(); -#endif + IF_DUSK(dusk::frame_interp::request_presentation_sync()); } if (i_this->mDemoCounter == 12) { @@ -2726,9 +2725,7 @@ static void demo_camera(npc_ne_class* i_this) { i_this->mCameraFovY = 45.0f; camera->mCamera.SetTrimSize(3); daPy_getPlayerActorClass()->changeOriginalDemo(); -#ifdef TARGET_PC - dusk::frame_interp::request_presentation_sync(); -#endif + IF_DUSK(dusk::frame_interp::request_presentation_sync()); // fallthrough case 11: @@ -2809,14 +2806,10 @@ static void demo_camera(npc_ne_class* i_this) { MtxPosition(&vec, &i_this->mCameraEye2); i_this->mCameraEye2 += player->current.pos; player->changeDemoParam2(2); -#ifdef TARGET_PC - dusk::frame_interp::request_presentation_sync(); -#endif + IF_DUSK(dusk::frame_interp::request_presentation_sync()); } else if (i_this->mDemoCounter == 120) { player->changeDemoParam2(0); -#ifdef TARGET_PC - dusk::frame_interp::request_presentation_sync(); -#endif + IF_DUSK(dusk::frame_interp::request_presentation_sync()); } } } @@ -2869,9 +2862,7 @@ static void demo_camera(npc_ne_class* i_this) { i_this->mCameraCenter1 = _this->current.pos; i_this->mCameraCenter1.y += 20.0f; i_this->mCameraFovY = 55.0f; -#ifdef TARGET_PC - dusk::frame_interp::request_presentation_sync(); -#endif + IF_DUSK(dusk::frame_interp::request_presentation_sync()); } camera->mCamera.Set(i_this->mCameraCenter1, i_this->mCameraEye1, diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp index 7f3f9e1126..4f98b7f6e9 100644 --- a/src/d/actor/d_a_npc_saru.cpp +++ b/src/d/actor/d_a_npc_saru.cpp @@ -11,7 +11,9 @@ #include "d/actor/d_a_e_ym.h" #include +#if TARGET_PC #include "helpers/string.hpp" +#endif enum saru_TW_RES_File_ID { /* BMDR */ diff --git a/src/d/actor/d_a_npc_shop0.cpp b/src/d/actor/d_a_npc_shop0.cpp index e61ea44f4e..eaa0b1d603 100644 --- a/src/d/actor/d_a_npc_shop0.cpp +++ b/src/d/actor/d_a_npc_shop0.cpp @@ -8,7 +8,9 @@ #include "d/actor/d_a_npc_shop0.h" #include +#if TARGET_PC #include "helpers/string.hpp" +#endif static int createHeapCallBack(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index 53a39a3e91..120cfac318 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -14,9 +14,12 @@ #include "d/actor/d_a_obj_automata.h" #include "d/d_msg_object.h" #include "d/actor/d_a_obj_scannon.h" -#include "dusk/frame_interpolation.h" #include +#if TARGET_PC +#include "dusk/frame_interpolation.h" +#endif + DUSK_GAME_DATA const daNpc_Toby_HIOParam daNpc_Toby_Param_c::m = { 160.0f, -3.0f, @@ -1399,7 +1402,7 @@ int daNpc_Toby_c::cutRepairSCannon(int arg0) { old.pos = current.pos; setAngle(cM_deg2s(5.0f * f32(mPath.getArg0()))); mEventTimer = mPath.getArg2(); - dusk::frame_interp::request_presentation_sync(); + IF_DUSK(dusk::frame_interp::request_presentation_sync()); } } else if (!mHide) { mHide = 1; diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp index 44b408b35c..d826abd947 100644 --- a/src/d/actor/d_a_npc_yelia.cpp +++ b/src/d/actor/d_a_npc_yelia.cpp @@ -9,7 +9,9 @@ #include "d/actor/d_a_demo_item.h" #include +#if TARGET_PC #include "helpers/string.hpp" +#endif static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdData[3] = { {3, 1}, diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index 7b84e1a1bb..f79b71b7e2 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -20,7 +20,9 @@ #include "m_Do/m_Do_ext.h" #include +#if TARGET_PC #include "helpers/string.hpp" +#endif #if DEBUG class daNpc_ykW_HIO_c : public mDoHIO_entry_c { diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index a5fa226ee7..97036418fc 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -5,14 +5,13 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep -#include "d/actor/d_a_npc4.h" #include "d/actor/d_a_obj_gra2.h" +#include "d/actor/d_a_npc4.h" #include "d/actor/d_a_tag_gra.h" #include "d/d_bg_w.h" #include "d/d_cc_uty.h" -#include "d/d_com_inf_actor.h" #include "d/d_com_inf_game.h" -#include "helpers/string.hpp" +#include "d/d_com_inf_actor.h" #if DEBUG #include "d/d_debug_viewer.h" #endif @@ -21,6 +20,10 @@ #include "Z2AudioLib/Z2Instances.h" #include +#if TARGET_PC +#include "helpers/string.hpp" +#endif + class daObj_GrA_Param_c { public: virtual ~daObj_GrA_Param_c() {} diff --git a/src/d/actor/d_a_obj_lv4chandelier.cpp b/src/d/actor/d_a_obj_lv4chandelier.cpp index 7847b37358..56f9aa93c1 100644 --- a/src/d/actor/d_a_obj_lv4chandelier.cpp +++ b/src/d/actor/d_a_obj_lv4chandelier.cpp @@ -12,10 +12,6 @@ #include "d/d_cc_d.h" #include "d/d_cc_uty.h" -#ifndef __MWERKS__ -#include "helpers/math.h" -#endif - #if DEBUG class daObjLv4Chan_HIO_c : public mDoHIO_entry_c { public: diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp index a1ef6b1709..444b7356e3 100644 --- a/src/d/actor/d_a_obj_master_sword.cpp +++ b/src/d/actor/d_a_obj_master_sword.cpp @@ -11,9 +11,10 @@ #include "d/d_meter2_info.h" #if TARGET_PC -#include "d/d_item.h" #include "dusk/mods/item.hpp" #include "mods/items.h" + +#include "d/d_item.h" #endif DUSK_GAME_DATA daObjMasterSword_Attr_c const daObjMasterSword_c::mAttr = {1.0f}; diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index f8493ec385..fece4d9773 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -8,11 +8,12 @@ #include "d/actor/d_a_tag_kmsg.h" #include #include - -#include "helpers/string.hpp" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_msg.h" +#if TARGET_PC +#include "helpers/string.hpp" +#endif static DUSK_CONSTEXPR daNpc_GetParam1 l_bmdData[9] = { {36, 1}, {36, 1}, {35, 1}, {37, 1}, {38, 1}, {3, 2}, {3, 2}, {4, 2}, {5, 2}, diff --git a/src/d/actor/d_a_tag_evt.cpp b/src/d/actor/d_a_tag_evt.cpp index 780fc1d38c..92bc7b2494 100644 --- a/src/d/actor/d_a_tag_evt.cpp +++ b/src/d/actor/d_a_tag_evt.cpp @@ -8,7 +8,9 @@ #include "f_op/f_op_actor_mng.h" #include +#if TARGET_PC #include "helpers/string.hpp" +#endif static DUSK_CONST char* l_evtNameList[] = { NULL, diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index e023319a9f..2f5ccd2761 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -11,7 +11,9 @@ #include "d/d_debug_viewer.h" #include +#if TARGET_PC #include "helpers/string.hpp" +#endif static int createHeapCallBack(fopAc_ac_c* i_this) { daTag_Msg_c* msg = (daTag_Msg_c*)i_this; diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index b9edd72fa1..fd550070f3 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -11,7 +11,6 @@ #include "d/d_pane_class_alpha.h" #include "d/d_s_logo.h" #include "d/d_s_play.h" -#include "dusk/version.hpp" #include "f_op/f_op_msg_mng.h" #include "f_op/f_op_overlap_mng.h" #include "f_op/f_op_scene_mng.h" @@ -19,9 +18,9 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#ifdef TARGET_PC +#if TARGET_PC #include "dusk/frame_interpolation.h" -#include "dusk/settings.h" +#include "dusk/version.hpp" #endif class daTit_HIO_c : public JORReflexible { @@ -353,11 +352,7 @@ void daTitle_c::fastLogoDispInit() { mWaitTimer = 30; mProcID = 5; -#ifdef TARGET_PC - if (dusk::frame_interp::is_enabled()) { - dusk::frame_interp::request_presentation_sync(); - } -#endif + IF_DUSK(dusk::frame_interp::request_presentation_sync()); } void daTitle_c::fastLogoDisp() { diff --git a/src/d/actor/d_flower.inc b/src/d/actor/d_flower.inc index 9e3d77efd0..91eba47906 100644 --- a/src/d/actor/d_flower.inc +++ b/src/d/actor/d_flower.inc @@ -5,7 +5,9 @@ #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "SSystem/SComponent/c_counter.h" +#if TARGET_PC #include "dusk/frame_interpolation.h" +#endif const u16 l_J_Ohana00_64TEX__width = 63; const u16 l_J_Ohana00_64TEX__height = 63; diff --git a/src/d/actor/d_grass.inc b/src/d/actor/d_grass.inc index 6c7a898c56..780a7a052d 100644 --- a/src/d/actor/d_grass.inc +++ b/src/d/actor/d_grass.inc @@ -11,15 +11,10 @@ #include "d/d_camera.h" #include "f_op/f_op_camera_mng.h" -#include "dusk/frame_interpolation.h" - -const u16 l_M_Hijiki00TEX__width = 31; -const u16 l_M_Hijiki00TEX__height = 31; -const u16 l_M_kusa05_RGBATEX__width = 31; -const u16 l_M_kusa05_RGBATEX__height = 31; - #if TARGET_PC #include "dusk/dvd_asset.hpp" +#include "dusk/frame_interpolation.h" + using GameVersion = dusk::version::GameVersion; template @@ -61,6 +56,11 @@ DEFINE_GRASS_ASSET(l_M_Hijiki00TEX, u8, 0x800, { #include "assets/l_M_Hijiki00TEX.h" // ALIGN 32 #endif +const u16 l_M_Hijiki00TEX__width = 31; +const u16 l_M_Hijiki00TEX__height = 31; +const u16 l_M_kusa05_RGBATEX__width = 31; +const u16 l_M_kusa05_RGBATEX__height = 31; + static u8 l_pos[960] = { 0x3F, 0x4A, 0x56, 0xEF, 0xC2, 0x20, 0x00, 0x00, 0x41, 0xFB, 0x17, 0xE4, 0x41, 0xAA, 0xBB, 0xEA, 0xC2, 0x20, 0x00, 0x00, 0xC1, 0xB7, 0x03, 0x7A, 0x42, 0x55, 0x8D, 0x6F, 0x43, 0x13, 0x16, 0x3F, diff --git a/src/d/d_bg_parts.cpp b/src/d/d_bg_parts.cpp index 07c91f8807..50eb634c25 100644 --- a/src/d/d_bg_parts.cpp +++ b/src/d/d_bg_parts.cpp @@ -8,7 +8,9 @@ #include "JSystem/JKernel/JKRSolidHeap.h" #include +#if TARGET_PC #include "helpers/string.hpp" +#endif void dBgp_c::material_c::draw() { material_c* material = this; diff --git a/src/d/d_bg_s.cpp b/src/d/d_bg_s.cpp index 51811d9538..23f87e4e4c 100644 --- a/src/d/d_bg_s.cpp +++ b/src/d/d_bg_s.cpp @@ -11,12 +11,14 @@ #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" +#if TARGET_PC || DEBUG #include "d/d_debug_viewer.h" #include "d/d_bg_s_capt_poly.h" +#endif #if TARGET_PC -#include "helpers/offset_ptr.h" #include "dusk/settings.h" +#include "helpers/offset_ptr.h" #endif #if DEBUG @@ -30,7 +32,6 @@ int g_sph_counter; int g_capt_poly_counter; #endif - void dBgS_HIO::genMessage(JORMContext* mctx) { #if DEBUG mctx->genLabel("zelda地形チェック", 0); diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp index b9ea46e58e..17c6f77267 100644 --- a/src/d/d_bright_check.cpp +++ b/src/d/d_bright_check.cpp @@ -11,15 +11,14 @@ #include "d/d_msg_string.h" #include "m_Do/m_Do_controller_pad.h" -#ifdef TARGET_PC -#include +#if TARGET_PC +#include "dusk/autosave.h" #include "dusk/game_mode.hpp" #include "dusk/imgui/ImGuiConsole.hpp" #include "dusk/livesplit.h" #include "dusk/speedrun.h" -#endif - #include "dusk/version.hpp" +#endif dBrightCheck_c::dBrightCheck_c(JKRArchive* i_archive) { mArchive = i_archive; diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index b38a336e02..9bb5b6f383 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -29,15 +29,16 @@ #endif #if TARGET_PC +#include "dusk/action_bindings.h" #include "dusk/camera_operators.hpp" #include "dusk/commands.hpp" #include "dusk/frame_interpolation.h" #include "dusk/logging.h" -#include "dusk/action_bindings.h" #include "dusk/mouse.h" #include "dusk/settings.h" #include "dusk/touch_camera.h" -#include "imgui.h" + +#include #endif namespace { diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index ecd0b796a0..8b3f0bde1d 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -19,17 +19,18 @@ #include "d/d_timer.h" #include "f_op/f_op_msg_mng.h" #include "f_op/f_op_scene_mng.h" -#include "m_Do/m_Do_MemCard.h" #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include #include -#include "helpers/string.hpp" #if TARGET_PC #include "dusk/settings.h" +#include "helpers/string.hpp" + +#include "m_Do/m_Do_MemCard.h" #endif void dComIfG_play_c::ct() { @@ -1245,12 +1246,12 @@ BOOL dComIfG_resetToOpening(scene_class* i_scene) { } #endif - #ifdef TARGET_PC +#if TARGET_PC if (!mDoMemCd_isCardCommNone()) { return 0; } g_mDoMemCd_control.SaveSync(); - #endif +#endif dComIfG_changeOpeningScene(i_scene, fpcNm_OPENING_SCENE_e); mDoAud_bgmStop(30); diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index cf4a830799..fd1a82ba2f 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -14,14 +14,17 @@ #include "m_Do/m_Do_mtx.h" #if TARGET_PC +#include "dusk/frame_interpolation.h" +#include "dusk/logging.h" +#include "helpers/gx_helper.h" + +#include "JSystem/JKernel/JKRHeap.h" + +#include +#include + #include #include -#include "JSystem/JKernel/JKRHeap.h" -#include "absl/container/flat_hash_map.h" -#include "tracy/Tracy.hpp" -#include "dusk/frame_interpolation.h" -#include "helpers/gx_helper.h" -#include "dusk/logging.h" static const void* getInterpKey(const void* base, int idx) { return reinterpret_cast(reinterpret_cast(base) ^ idx); diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index 2650c2d05e..78a2d0b657 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -13,12 +13,12 @@ #include "d/actor/d_a_alink.h" #include +#if TARGET_PC #include "helpers/string.hpp" -#ifdef __MWERKS__ -#define LOAD_4BYTE_STRING_LITERAL(x) (*(u32*)(x)) -#else #define LOAD_4BYTE_STRING_LITERAL(x) read_big_endian_u32(x) +#else +#define LOAD_4BYTE_STRING_LITERAL(x) (*(u32*)(x)) #endif namespace { diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index b17ebf61f0..4200b1ed75 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -13,7 +13,9 @@ #include "SSystem/SComponent/c_counter.h" #include +#if TARGET_PC #include "helpers/string.hpp" +#endif namespace { static u8 event_debug_evnt() { diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index da50ec7d96..8de429c701 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -15,7 +15,9 @@ #include "SSystem/SComponent/c_counter.h" #include +#if TARGET_PC #include "helpers/string.hpp" +#endif #if DEBUG static dEvM_HIO_c l_HIO; diff --git a/src/d/d_file_sel_info.cpp b/src/d/d_file_sel_info.cpp index 70bd101aa0..377754b834 100644 --- a/src/d/d_file_sel_info.cpp +++ b/src/d/d_file_sel_info.cpp @@ -14,8 +14,10 @@ #include #include -#include "helpers/string.hpp" +#if TARGET_PC #include "dusk/version.hpp" +#include "helpers/string.hpp" +#endif dFile_info_c::dFile_info_c(JKRArchive* i_archive, u8 param_1) { mArchive = i_archive; diff --git a/src/d/d_file_sel_warning.cpp b/src/d/d_file_sel_warning.cpp index fc17e05a0d..97b667bb45 100644 --- a/src/d/d_file_sel_warning.cpp +++ b/src/d/d_file_sel_warning.cpp @@ -11,7 +11,10 @@ #include "d/d_file_sel_warning.h" #include "d/d_msg_string.h" #include "d/d_pane_class.h" + +#if TARGET_PC #include "dusk/version.hpp" +#endif typedef void (dFile_warning_c::*procFunc)(); static procFunc fileWarningProc[] = {&dFile_warning_c::modeWait, &dFile_warning_c::modeMove}; diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index 3f64b8b239..ed73d5f9cf 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -23,13 +23,12 @@ #include "m_Do/m_Do_graphic.h" #include -#include "dusk/utilities.hpp" -#include "dusk/version.hpp" - #if TARGET_PC #include "dusk/game_mode.hpp" #include "dusk/menu_pointer.h" #include "dusk/mods/svc/save.hpp" +#include "dusk/utilities.hpp" +#include "dusk/version.hpp" #include "helpers/string.hpp" namespace { @@ -4432,15 +4431,15 @@ void dFile_select_c::_draw() { dComIfGd_set2DOpa(mSelIcon); dComIfGd_set2DOpa(mSelIcon2); - #if PLATFORM_GCN - #if TARGET_PC +#if PLATFORM_GCN +#if TARGET_PC dComIfGd_set2DOpaTop(&mFadeDlst); - #else +#else mpFadePict->draw(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), false, false, false); - #endif - #endif +#endif +#endif } } diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index c7dcde357c..ac85b5d2b4 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -14,7 +14,9 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include +#if TARGET_PC #include "helpers/gx_helper.h" +#endif class dGov_HIO_c : public mDoHIO_entry_c { public: diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index f9d77837f9..1201da30e9 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -8275,9 +8275,7 @@ static int dKy_Create(void* i_this) { kankyo_class* kankyo = (kankyo_class*)i_this; BOOL next_time_set = false; -#if TARGET_PC - kankyo->base.draw_interp_frame = true; -#endif + IF_DUSK(kankyo->base.draw_interp_frame = true); stage_envr_info_class* stage_envr_p = dComIfGp_getStageEnvrInfo(); if (stage_envr_p != NULL && dComIfGp_getStartStageRoomNo() != -1) { diff --git a/src/d/d_menu_calibration.cpp b/src/d/d_menu_calibration.cpp index 23f81121bc..e596609292 100644 --- a/src/d/d_menu_calibration.cpp +++ b/src/d/d_menu_calibration.cpp @@ -14,7 +14,9 @@ #include "m_Do/m_Do_controller_pad.h" #include +#if TARGET_PC #include "helpers/string.hpp" +#endif // Need 0xC bytes of padding with no symbol between dMenu_Calibration_c::__vtable and the end of // .data @@ -25,7 +27,7 @@ public: virtual void virt_func_0() = 0; }; class dummy_child_class : dummy_abstract_class { -#ifdef TARGET_PC +#if TARGET_PC virtual void virt_func_0() {} #else virtual void virt_func_0(); diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp index 4557edfb4c..b84b596aff 100644 --- a/src/d/d_menu_dmap.cpp +++ b/src/d/d_menu_dmap.cpp @@ -21,16 +21,15 @@ #include "d/d_msg_string.h" #include "d/d_meter_haihai.h" #include "d/d_menu_window.h" -#include "dusk/settings.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_graphic.h" #include -#include "dusk/version.hpp" -#include "helpers/string.hpp" - #if TARGET_PC #include "dusk/frame_interpolation.h" +#include "dusk/settings.h" +#include "dusk/version.hpp" +#include "helpers/string.hpp" #endif #if (PLATFORM_WII || PLATFORM_SHIELD) diff --git a/src/d/d_menu_dmap_map.cpp b/src/d/d_menu_dmap_map.cpp index bc63706617..b0be1dbf4b 100644 --- a/src/d/d_menu_dmap_map.cpp +++ b/src/d/d_menu_dmap_map.cpp @@ -11,6 +11,7 @@ #include "d/d_menu_dmap_map.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_graphic.h" + #if TARGET_PC #include #endif diff --git a/src/d/d_menu_fishing.cpp b/src/d/d_menu_fishing.cpp index 2579d328fb..84e62b2385 100644 --- a/src/d/d_menu_fishing.cpp +++ b/src/d/d_menu_fishing.cpp @@ -16,8 +16,10 @@ #include "m_Do/m_Do_graphic.h" #include -#include "helpers/string.hpp" +#if TARGET_PC #include "dusk/version.hpp" +#include "helpers/string.hpp" +#endif typedef void (dMenu_Fishing_c::*initFunc)(); DUSK_GAME_DATA initFunc map_init_process[] = { diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index c2d642a6d4..c2809c4e43 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -1,33 +1,33 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include -#include +#include "d/d_menu_fmap.h" +#include "SSystem/SComponent/c_math.h" #include "JSystem/JKernel/JKRAramArchive.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include "SSystem/SComponent/c_math.h" -#include "d/actor/d_a_midna.h" -#include "d/actor/d_a_player.h" +#include +#include +#include "f_op/f_op_msg_mng.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" -#include "d/d_menu_fmap.h" #include "d/d_menu_fmap2D.h" #include "d/d_menu_fmap_map.h" #include "d/d_menu_window.h" -#include "d/d_meter2_draw.h" -#include "d/d_meter2_info.h" #include "d/d_meter_HIO.h" #include "d/d_meter_map.h" +#include "d/d_meter2_draw.h" +#include "d/d_meter2_info.h" #include "d/d_msg_object.h" #include "d/d_msg_scrn_explain.h" #include "d/d_stage.h" -#include "dusk/version.hpp" -#include "f_op/f_op_msg_mng.h" -#include "helpers/string.hpp" +#include "d/actor/d_a_player.h" +#include "d/actor/d_a_midna.h" #if TARGET_PC #include "dusk/frame_interpolation.h" #include "dusk/memory.h" +#include "dusk/version.hpp" +#include "helpers/string.hpp" #endif static dMf_HIO_c g_fmHIO; @@ -783,7 +783,6 @@ void dMenu_Fmap_c::all_map_proc() { { setAreaName(mTitleName[mpDraw2DBack->getSelectRegion()]); mpDraw2DBack->setSpotCursor(0); - } else { setAreaNameZero(); } @@ -1273,7 +1272,7 @@ void dMenu_Fmap_c::spot_map_proc() { f32 pos_y = mpDraw2DBack->getMapAreaGlobalCenterPosY() - mDoGph_gInf_c::getHeightF() * 0.5f; mpMenuFmapMap->getPointStagePathInnerNo(getNowFmapRegionData(), pos_x, pos_y, mStayStageNo, &stage_no, &room_no); - + if (mStageCursor != stage_no || mResetAreaName) { mStageCursor = stage_no; mRoomCursor = room_no; diff --git a/src/d/d_menu_fmap2D.cpp b/src/d/d_menu_fmap2D.cpp index cd2e09c6d7..125bd91f39 100644 --- a/src/d/d_menu_fmap2D.cpp +++ b/src/d/d_menu_fmap2D.cpp @@ -17,15 +17,13 @@ #include "d/d_msg_scrn_explain.h" #include "m_Do/m_Do_graphic.h" #include "d/actor/d_a_midna.h" +#include + #if TARGET_PC #include "dusk/frame_interpolation.h" #include "dusk/ui/touch_controls.hpp" -#endif -#include - #include "dusk/version.hpp" -#if TARGET_PC void dMenu_Fmap2DBack_c::fMapBackWide() { mpBaseScreen->scale(mDoGph_gInf_c::hudAspectScaleUp, 1.0f); mpBaseScreen->translate(mDoGph_gInf_c::getSafeMinXF(), 0.0f); diff --git a/src/d/d_menu_fmap_map.cpp b/src/d/d_menu_fmap_map.cpp index b2477b8b06..8a3c34fbde 100644 --- a/src/d/d_menu_fmap_map.cpp +++ b/src/d/d_menu_fmap_map.cpp @@ -8,10 +8,11 @@ #include "d/d_debug_viewer.h" #include "d/d_menu_fmap_map.h" #include "m_Do/m_Do_graphic.h" +#include + #if TARGET_PC #include #endif -#include static u8 twoValueLineInterpolation(u8 i_value1, u8 i_value2, f32 i_param) { return (u8)((f32)i_value1 + i_param * ((f32)i_value2 - (f32)i_value1)); diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp index e7917532a2..684dd1235c 100644 --- a/src/d/d_menu_insect.cpp +++ b/src/d/d_menu_insect.cpp @@ -22,10 +22,9 @@ #include #include -#include "dusk/version.hpp" - #if TARGET_PC #include "dusk/menu_pointer.h" +#include "dusk/version.hpp" #endif typedef void (dMenu_Insect_c::*initFunc)(); diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp index 9ef85ed32e..e6134e6c8b 100644 --- a/src/d/d_menu_item_explain.cpp +++ b/src/d/d_menu_item_explain.cpp @@ -5,26 +5,29 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include -#include +#include "d/d_menu_item_explain.h" #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" #include "d/d_kantera_icon_meter.h" #include "d/d_lib.h" -#include "d/d_menu_item_explain.h" +#include "d/d_select_cursor.h" #include "d/d_meter2_info.h" #include "d/d_meter_HIO.h" -#include "d/d_msg_scrn_3select.h" -#include "d/d_msg_scrn_arrow.h" #include "d/d_msg_string.h" -#include "d/d_select_cursor.h" -#include "dusk/version.hpp" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" +#include "d/d_msg_scrn_3select.h" +#include "d/d_msg_scrn_arrow.h" + +#if TARGET_PC +#include "dusk/version.hpp" +#endif typedef void (dMenu_ItemExplain_c::*initFunc)(); static initFunc init_process[] = { diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp index 9d6f0816e2..7f18fa426b 100644 --- a/src/d/d_menu_option.cpp +++ b/src/d/d_menu_option.cpp @@ -25,11 +25,11 @@ #include #include "JSystem/JAudio2/JASDriverIF.h" -#include "dusk/version.hpp" #if TARGET_PC #include "dusk/menu_pointer.h" #include "dusk/ui/touch_controls.hpp" +#include "dusk/version.hpp" #endif typedef void (dMenu_Option_c::*initFunc)(); diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index ed79d40524..2b05a46fae 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -29,14 +29,13 @@ #include -#include "dusk/version.hpp" - #if TARGET_PC #include "dusk/frame_interpolation.h" #include "dusk/game_clock.h" #include "dusk/menu_pointer.h" #include "dusk/settings.h" #include "dusk/ui/touch_controls.hpp" +#include "dusk/version.hpp" #endif typedef void (dMenu_Ring_c::*initFunc)(); diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index a9c4e8f908..aaa5fe622b 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -14,7 +14,6 @@ #include "d/d_msg_scrn_explain.h" #include "d/d_msg_string.h" #include "d/d_select_cursor.h" -#include "dusk/version.hpp" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_MemCard.h" #include "m_Do/m_Do_MemCardRWmng.h" @@ -25,8 +24,9 @@ #if TARGET_PC #include "dusk/frame_interpolation.h" #include "dusk/menu_pointer.h" -#include "dusk/settings.h" #include "dusk/mods/svc/save.hpp" +#include "dusk/settings.h" +#include "dusk/version.hpp" #endif static int SelStartFrameTbl[3] = { diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp index eb67822899..0e05e8ac4e 100644 --- a/src/d/d_menu_window.cpp +++ b/src/d/d_menu_window.cpp @@ -26,7 +26,7 @@ #include "f_op/f_op_overlap_mng.h" #include "m_Do/m_Do_controller_pad.h" -#ifdef TARGET_PC +#if TARGET_PC #include "dusk/frame_interpolation.h" #endif diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index a1425355ab..bcefa0a3dc 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -20,14 +20,14 @@ #include "d/d_msg_class.h" #include "d/d_msg_object.h" #include "d/d_pane_class.h" -#include "dusk/frame_interpolation.h" #include -#include "dusk/version.hpp" - #if TARGET_PC +#include "dusk/frame_interpolation.h" #include "dusk/settings.h" #include "dusk/ui/icon_provider.hpp" +#include "dusk/version.hpp" + #include namespace { diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp index 15569a72d8..3bb9ffdcd3 100644 --- a/src/d/d_meter2_info.cpp +++ b/src/d/d_meter2_info.cpp @@ -15,8 +15,10 @@ #include +#if TARGET_PC #include "dusk/version.hpp" #include "helpers/string.hpp" +#endif enum ITEMICON_RES_FILE_ID { ITEMICON_BTI_ARI_MESU_00=0x3, diff --git a/src/d/d_meter_button.cpp b/src/d/d_meter_button.cpp index 56d756ef44..ac11d183ce 100644 --- a/src/d/d_meter_button.cpp +++ b/src/d/d_meter_button.cpp @@ -16,18 +16,15 @@ #include "d/d_msg_out_font.h" #include "d/d_msg_string.h" #include "d/d_pane_class.h" -#include "dusk/frame_interpolation.h" #include -#include "dusk/version.hpp" - #if TARGET_PC +#include "dusk/frame_interpolation.h" +#include "dusk/version.hpp" #include "helpers/string.hpp" #endif -#if TARGET_PC -#define STR_BUF_LEN 528 -#elif VERSION == VERSION_GCN_JPN +#if TARGET_PC || VERSION == VERSION_GCN_JPN #define STR_BUF_LEN 528 #else #define STR_BUF_LEN 512 @@ -297,22 +294,19 @@ void dMeterButton_c::draw() { s16 temp_r6 = g_drawHIO.mEmpButton.mRepeatHitFrameNum; s16 temp_r6_2 = g_drawHIO.mEmpButton.mRepeatHitFrameNum / 2; -#ifdef TARGET_PC - if (dusk::frame_interp::get_ui_tick_pending()) -#endif - { - field_0x4b8[i]++; + IF_DUSK_BLOCK(dusk::frame_interp::get_ui_tick_pending()) + field_0x4b8[i]++; - if (field_0x4b8[i] >= temp_r6) { - field_0x4b8[i] = 0; + if (field_0x4b8[i] >= temp_r6) { + field_0x4b8[i] = 0; - if (field_0x4bc[i] == 0) { - field_0x4bc[i] = 1; - } else { - field_0x4bc[i] = 0; - } + if (field_0x4bc[i] == 0) { + field_0x4bc[i] = 1; + } else { + field_0x4bc[i] = 0; } } + IF_DUSK_BLOCK_END f32 var_f2; if (temp_r6_2 < field_0x4b8[i]) { @@ -384,7 +378,7 @@ void dMeterButton_c::draw() { } if (var_r3) { -#ifdef TARGET_PC +#if TARGET_PC if (dusk::frame_interp::get_ui_tick_pending()) { mWasListen[i] = var_r22; mWasRepeat[i] = var_r23; @@ -394,11 +388,7 @@ void dMeterButton_c::draw() { } #endif if (var_r22) { -#ifdef TARGET_PC - if (field_0x2e8[i] == 18.0f && dusk::frame_interp::get_ui_tick_pending()) -#else - if (field_0x2e8[i] == 18.0f) -#endif + if (field_0x2e8[i] == 18.0f IF_DUSK(&& dusk::frame_interp::get_ui_tick_pending())) { mDoAud_seStart(Z2SE_SY_HINT_BUTTON_BLINK, NULL, 0, 0); } diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index 4358d6d5d2..0c2c3cf358 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -1,21 +1,21 @@ #include "d/dolzel.h" // IWYU pragma: keep +#include "d/d_msg_class.h" #include #include -#include "JSystem/J2DGraph/J2DTextBox.h" -#include "JSystem/JUtility/JUTFont.h" -#include "d/d_lib.h" #include "d/d_meter2_info.h" -#include "d/d_msg_class.h" #include "d/d_msg_object.h" -#include "d/d_msg_out_font.h" #include "d/d_msg_unit.h" -#include "dusk/version.hpp" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "d/d_msg_out_font.h" #include "m_Do/m_Do_graphic.h" +#include "d/d_lib.h" +#include "JSystem/JUtility/JUTFont.h" #if TARGET_PC #include "dusk/menu_pointer.h" #include "dusk/scope_guard.hpp" +#include "dusk/version.hpp" #include "helpers/bits.hpp" static bool read_full_color(const void* data, u32 size, u32& ccColor, u32& gcColor) { @@ -31,9 +31,7 @@ static bool read_full_color(const void* data, u32 size, u32& ccColor, u32& gcCol } return false; } -#endif -#if TARGET_PC #define CHAR_CODE_MALE_ICON (dusk::version::isRegionJpn() ? 0x8189 : 0xB2) #define CHAR_CODE_FEMALE_ICON (dusk::version::isRegionJpn() ? 0x818A : 0xB3) #define CHAR_CODE_STAR_ICON (dusk::version::isRegionJpn() ? 0x819A : 0xB1) diff --git a/src/d/d_msg_out_font.cpp b/src/d/d_msg_out_font.cpp index 79bbad5ebb..57b85b18b2 100644 --- a/src/d/d_msg_out_font.cpp +++ b/src/d/d_msg_out_font.cpp @@ -5,9 +5,12 @@ #include "d/d_meter2_info.h" #include "d/d_msg_object.h" #include "d/d_msg_out_font.h" +#include "f_op/f_op_msg_mng.h" + +#if TARGET_PC #include "dusk/frame_interpolation.h" #include "dusk/version.hpp" -#include "f_op/f_op_msg_mng.h" +#endif COutFontSet_c::COutFontSet_c() { initialize(); @@ -315,9 +318,8 @@ void COutFont_c::draw(J2DTextBox* i_textbox, f32 param_1, f32 param_2, f32 param sp256[i] = field_0x1b4[i]; } -#ifdef TARGET_PC - bool uiTickPending = dusk::frame_interp::get_ui_tick_pending(); - if (!uiTickPending) { +#if TARGET_PC + if (dusk::frame_interp::get_ui_tick_pending()) { for (int i = 0; i < 70; i++) { sp256[i] = -1; } @@ -526,15 +528,12 @@ void COutFont_c::draw(J2DTextBox* i_textbox, f32 param_1, f32 param_2, f32 param case 20: case 21: case 22: -#ifdef TARGET_PC - if (uiTickPending) -#endif - { - field_0x1b4[type]++; - if (field_0x1b4[type] >= 28) { - field_0x1b4[type] = 0; - } + IF_DUSK_BLOCK(dusk::frame_interp::get_ui_tick_pending()) + field_0x1b4[type]++; + if (field_0x1b4[type] >= 28) { + field_0x1b4[type] = 0; } + IF_DUSK_BLOCK_END mpPane[type]->rotate(0.5f * sizeX, 0.5f * sizeY, ROTATE_Z, (360.0f * (f32)field_0x1b4[type]) / 28.0f); diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp index b3a41a2988..b7e0e8a8db 100644 --- a/src/d/d_msg_scrn_3select.cpp +++ b/src/d/d_msg_scrn_3select.cpp @@ -5,20 +5,20 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include +#include "d/d_msg_scrn_3select.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DTextBox.h" +#include #include "d/d_com_inf_game.h" -#include "d/d_msg_object.h" -#include "d/d_msg_scrn_3select.h" -#include "d/d_pane_class.h" #include "d/d_select_cursor.h" -#include "dusk/version.hpp" +#include "d/d_msg_object.h" +#include "d/d_pane_class.h" #if TARGET_PC #include "dusk/menu_pointer.h" +#include "dusk/version.hpp" namespace { bool hit_choice_pane(CPaneMgr* pane, f32 padding) { diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp index 9460ce8921..4771257ccd 100644 --- a/src/d/d_msg_scrn_explain.cpp +++ b/src/d/d_msg_scrn_explain.cpp @@ -14,7 +14,9 @@ #include #include +#if TARGET_PC #include "dusk/version.hpp" +#endif #if TARGET_PC || VERSION == VERSION_GCN_JPN #define STR_BUF_LEN 528 diff --git a/src/d/d_msg_scrn_item.cpp b/src/d/d_msg_scrn_item.cpp index ab91739acc..17007403dc 100644 --- a/src/d/d_msg_scrn_item.cpp +++ b/src/d/d_msg_scrn_item.cpp @@ -24,7 +24,9 @@ #include "JSystem/JUtility/JUTTexture.h" #include +#if TARGET_PC #include "dusk/version.hpp" +#endif dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { if (param_3 != NULL) { diff --git a/src/d/d_msg_scrn_kanban.cpp b/src/d/d_msg_scrn_kanban.cpp index 8e2346feab..7f254bbafb 100644 --- a/src/d/d_msg_scrn_kanban.cpp +++ b/src/d/d_msg_scrn_kanban.cpp @@ -12,10 +12,10 @@ #include "d/d_msg_out_font.h" #include "d/d_msg_scrn_kanban.h" #include "d/d_pane_class.h" -#include "dusk/version.hpp" #if TARGET_PC #include "dusk/settings.h" +#include "dusk/version.hpp" #endif dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { diff --git a/src/d/d_msg_scrn_light.cpp b/src/d/d_msg_scrn_light.cpp index 19671b5d57..1f6a176066 100644 --- a/src/d/d_msg_scrn_light.cpp +++ b/src/d/d_msg_scrn_light.cpp @@ -6,7 +6,10 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include "d/d_com_inf_game.h" #include "d/d_pane_class.h" + +#if TARGET_PC #include "dusk/frame_interpolation.h" +#endif class dMsgScrnLight_HIO_c { public: diff --git a/src/d/d_msg_scrn_talk.cpp b/src/d/d_msg_scrn_talk.cpp index 6a30d08c47..1e63d67a9b 100644 --- a/src/d/d_msg_scrn_talk.cpp +++ b/src/d/d_msg_scrn_talk.cpp @@ -20,10 +20,9 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include -#include "dusk/version.hpp" - #if TARGET_PC #include "dusk/settings.h" +#include "dusk/version.hpp" #endif #if TARGET_PC diff --git a/src/d/d_msg_scrn_tree.cpp b/src/d/d_msg_scrn_tree.cpp index 440b2702d3..bbed47cb05 100644 --- a/src/d/d_msg_scrn_tree.cpp +++ b/src/d/d_msg_scrn_tree.cpp @@ -8,10 +8,10 @@ #include "d/d_msg_out_font.h" #include "d/d_msg_scrn_tree.h" #include "d/d_pane_class.h" -#include "dusk/version.hpp" #if TARGET_PC #include "dusk/settings.h" +#include "dusk/version.hpp" #endif dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) { diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index aa01a39de4..89506e8078 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -8,23 +8,19 @@ #include "m_Do/m_Do_controller_pad.h" #include #include - #include "JSystem/J2DGraph/J2DAnmLoader.h" +#include "f_op/f_op_msg_mng.h" + +#if TARGET_PC #include "dusk/utilities.hpp" #include "dusk/version.hpp" -#include "f_op/f_op_msg_mng.h" static bool isPalOrJpn() { return dusk::version::isRegionPal() || dusk::version::isRegionJpn(); } -#if TARGET_PC #define SJIS_MOJI(wmoji) ((static_cast(static_cast((wmoji)[0])) << 8) | static_cast((wmoji)[1])) -#else -#define SJIS_MOJI(wmoji) *(u16*)wmoji -#endif -#if TARGET_PC static const char* l_mojiHira[65] = { "\x82\xA0", "\x82\xA2", "\x82\xA4", "\x82\xA6", "\x82\xA8", "\x82\xA9", "\x82\xAB", "\x82\xAD", "\x82\xAF", "\x82\xB1", "\x82\xB3", "\x82\xB5", "\x82\xB7", "\x82\xB9", "\x82\xBB", "\x82\xBD", "\x82\xBF", "\x82\xC2", "\x82\xC4", "\x82\xC6", "\x82\xC8", "\x82\xC9", "\x82\xCA", "\x82\xCB", "\x82\xCC", "\x82\xCD", @@ -80,6 +76,8 @@ static const char* l_mojiEisu[65] = { "X", "k", "x", ",", "L", "Y", "l", "y", ".", "M", "Z", "m", "z", " ", }; #else +#define SJIS_MOJI(wmoji) *(u16*)wmoji + static const char* l_mojiHira[65] = { "あ", "い", "う", "え", "お", "か", "き", "く", "け", "こ", "さ", "し", "す", "せ", "そ", "た", "ち", "つ", "て", "と", "な", "に", "ぬ", "ね", "の", "は", @@ -1090,9 +1088,7 @@ void dName_c::selectCursorMove() { ((J2DTextBox*)mMojiIcon[mCharRow + mCharColumn * 5]->getPanePtr()) ->setWhite(JUtility::TColor(0xC8, 0xC8, 0xC8, 0xFF)); - #if TARGET_PC - nameWide(); - #endif + IF_DUSK(nameWide()); Vec pos = mMojiIcon[mCharRow + mCharColumn * 5]->getGlobalVtxCenter(false, 0); mSelIcon->setPos(pos.x, pos.y, mMojiIcon[mCharRow + mCharColumn * 5]->getPanePtr(), true); diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index e33de068db..9e443aa81a 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -8,30 +8,27 @@ // weak data from it (unlike here). #include "d/d_particle.h" -#include -#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" -#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "d/d_jnt_col.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRSolidHeap.h" -#include "JSystem/JMath/JMATrigonometric.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" #include "JSystem/JParticle/JPAEmitterManager.h" #include "JSystem/JParticle/JPAResourceManager.h" -#include "SSystem/SComponent/c_math.h" -#include "d/actor/d_a_player.h" -#include "d/d_com_inf_game.h" -#include "d/d_jnt_col.h" +#include "JSystem/JMath/JMATrigonometric.h" #include "d/d_s_play.h" -#include "f_op/f_op_actor_mng.h" -#include "m_Do/m_Do_graphic.h" +#include +#include "d/d_com_inf_game.h" #include "m_Do/m_Do_lib.h" -#include "tracy/Tracy.hpp" +#include "m_Do/m_Do_graphic.h" +#include "f_op/f_op_actor_mng.h" +#include "d/actor/d_a_player.h" +#include "SSystem/SComponent/c_math.h" #if TARGET_PC #include "dusk/frame_interpolation.h" -#endif -#ifndef __MWERKS__ -#include "helpers/math.h" +#include #endif #if DEBUG diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index de66b0317d..7faabde76b 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -5,29 +5,25 @@ #include "d/dolzel.h" // IWYU pragma: keep +#include "d/d_s_name.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" -#include "d/d_s_name.h" -#include "f_op/f_op_overlap_mng.h" #include "f_op/f_op_scene_mng.h" #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" -#include "m_Do/m_Do_main.h" #include "m_Do/m_Do_mtx.h" +#include "m_Do/m_Do_main.h" +#include "f_op/f_op_overlap_mng.h" -#ifdef TARGET_PC +#if TARGET_PC #include "dusk/autosave.h" #include "dusk/game_mode.hpp" #include "dusk/imgui/ImGuiConsole.hpp" -#include "dusk/livesplit.h" #include "dusk/memory.h" #include "dusk/settings.h" -#include "dusk/speedrun.h" -#endif -#if TARGET_PC #define SHOW_TV_SETTINGS_SCREEN (this->mShowTvSettingsScreen) #else #define SHOW_TV_SETTINGS_SCREEN (1) diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 7caba5c9c8..6a4d4c3c05 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -16,8 +16,6 @@ #include #include -#include "dusk/version.hpp" - #if PLATFORM_WII || PLATFORM_SHIELD #include #include @@ -28,11 +26,11 @@ #endif #if TARGET_PC -#include #include "dusk/game_mode.hpp" #include "dusk/settings.h" - +#include "dusk/version.hpp" #include "helpers/string.hpp" + #define strcpy SafeStringCopy #endif diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 0de9a13f75..14167723d9 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -22,13 +22,13 @@ #include #include -#include "dusk/logging.h" -#include "helpers/string.hpp" #if TARGET_PC -#include "dusk/mods/svc/stage.hpp" -#include -#include +#include "dusk/logging.h" #include "dusk/mods/svc/actor.hpp" +#include "dusk/mods/svc/stage.hpp" +#include "helpers/string.hpp" + +#include #endif void dStage_nextStage_c::set(const char* i_stage, s8 i_roomId, s16 i_point, s8 i_layer, s8 i_wipe, diff --git a/src/dusk/achievements.h b/src/dusk/achievements.h index c93ea5d626..eec7fc6d5a 100644 --- a/src/dusk/achievements.h +++ b/src/dusk/achievements.h @@ -1,13 +1,12 @@ #pragma once +#include + #include #include -#include -#include #include #include #include -#include "nlohmann/json.hpp" namespace dusk { diff --git a/src/dusk/action_bindings.cpp b/src/dusk/action_bindings.cpp index c919c9d4fe..2c97c2c894 100644 --- a/src/dusk/action_bindings.cpp +++ b/src/dusk/action_bindings.cpp @@ -1,9 +1,10 @@ #include "dusk/action_bindings.h" -#include "aurora/lib/input.hpp" #include "dusk/settings.h" #include "dusk/ui/ui.hpp" +#include + namespace dusk { static std::array(ActionBinds::COUNT)>, PAD_CHANMAX> actionPressData{}; diff --git a/src/dusk/audio/DuskAudioSystem.cpp b/src/dusk/audio/DuskAudioSystem.cpp index 3fda98a436..13275ed830 100644 --- a/src/dusk/audio/DuskAudioSystem.cpp +++ b/src/dusk/audio/DuskAudioSystem.cpp @@ -1,20 +1,21 @@ -#include "dusk/audio/DuskAudioSystem.h" +#include "DuskAudioSystem.h" -#include -#include -#include -#include +#include "DuskDsp.hpp" #include "JSystem/JAudio2/JASAiCtrl.h" +#include "JSystem/JAudio2/JASAudioThread.h" #include "JSystem/JAudio2/JASChannel.h" #include "JSystem/JAudio2/JASCriticalSection.h" +#include "JSystem/JAudio2/JASDriverIF.h" #include "JSystem/JAudio2/JASDSPChannel.h" #include "JSystem/JAudio2/JASHeapCtrl.h" -#include "DuskDsp.hpp" -#include "JSystem/JAudio2/JASAudioThread.h" -#include "JSystem/JAudio2/JASDriverIF.h" -#include "tracy/Tracy.hpp" +#include +#include + +#include +#include +#include using namespace dusk::audio; diff --git a/src/dusk/audio/DuskDsp.cpp b/src/dusk/audio/DuskDsp.cpp index 4009b37e39..01b07be90c 100644 --- a/src/dusk/audio/DuskDsp.cpp +++ b/src/dusk/audio/DuskDsp.cpp @@ -1,22 +1,22 @@ +#include "DuskDsp.hpp" + +#include "Adpcm.hpp" +#include "DuskAudioSystem.h" +#include "global.h" + +#include "dusk/logging.h" +#include "helpers/endian.h" + #include #include - -#include "DuskDsp.hpp" +#include +#include #include #include #include -#include #include -#include "Adpcm.hpp" -#include "dusk/audio/DuskAudioSystem.h" -#include "dusk/logging.h" -#include "freeverb/revmodel.hpp" -#include "global.h" -#include "helpers/endian.h" -#include "tracy/Tracy.hpp" - using namespace dusk::audio; ChannelAuxData dusk::audio::ChannelAux[DSP_CHANNELS] = {}; diff --git a/src/dusk/audio/DuskDsp.hpp b/src/dusk/audio/DuskDsp.hpp index cfcbfe3f46..8d7b74a1d6 100644 --- a/src/dusk/audio/DuskDsp.hpp +++ b/src/dusk/audio/DuskDsp.hpp @@ -1,16 +1,15 @@ #pragma once +// ReSharper disable once CppUnusedIncludeDirective +#include "global.h" #include "JSystem/JAudio2/JASDSPInterface.h" +#include + #include #include - -#include "SDL3/SDL_audio.h" #include -// ReSharper disable once CppUnusedIncludeDirective -#include "global.h" - namespace dusk::audio { constexpr int SampleRate = 32000; diff --git a/src/dusk/audio/JASCriticalSection.cpp b/src/dusk/audio/JASCriticalSection.cpp index 9baf2d9bac..73a2671630 100644 --- a/src/dusk/audio/JASCriticalSection.cpp +++ b/src/dusk/audio/JASCriticalSection.cpp @@ -1,8 +1,8 @@ #include "JSystem/JAudio2/JASCriticalSection.h" -#include +#include -#include "tracy/Tracy.hpp" +#include static TracyLockable(std::recursive_mutex, gAudioThreadMutex); diff --git a/src/dusk/autosave.cpp b/src/dusk/autosave.cpp index bae2812a1f..e53395d9b6 100644 --- a/src/dusk/autosave.cpp +++ b/src/dusk/autosave.cpp @@ -1,8 +1,13 @@ #include "dusk/autosave.h" + #include "dusk/ui/ui.hpp" #include "imgui/ImGuiConsole.hpp" #include "mods/svc/save.hpp" +#include "d/actor/d_a_alink.h" +#include "m_Do/m_Do_MemCard.h" +#include "m_Do/m_Do_MemCardRWmng.h" + bool shouldAutoSave = false; u8 mSaveBuffer[QUEST_LOG_SIZE * 3]; u8 mAutoSaveProc = 0; diff --git a/src/dusk/autosave.h b/src/dusk/autosave.h index 2ab0887295..d9e83b442a 100644 --- a/src/dusk/autosave.h +++ b/src/dusk/autosave.h @@ -1,9 +1,5 @@ #pragma once -#include -#include -#include - void noAutoSave(); void triggerAutoSave(); void updateAutoSave(); diff --git a/src/dusk/commands.cpp b/src/dusk/commands.cpp index b953095936..b4267700da 100644 --- a/src/dusk/commands.cpp +++ b/src/dusk/commands.cpp @@ -1,31 +1,33 @@ #include "commands.hpp" -#include "JSystem/JUtility/JUTGamePad.h" -#include "SSystem/SComponent/c_math.h" -#include "SSystem/SComponent/c_sxyz.h" -#include "SSystem/SComponent/c_xyz.h" +#include "game_clock.h" + #include "c/c_damagereaction.h" #include "d/actor/d_a_alink.h" +#include "d/d_camera.h" #include "d/d_com_inf_actor.h" #include "d/d_com_inf_game.h" -#include "d/d_camera.h" #include "d/d_kankyo.h" #include "d/d_stage.h" -#include "dusk/game_clock.h" #include "f_op/f_op_actor_mng.h" #include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_layer_iter.h" #include "f_pc/f_pc_manager.h" #include "f_pc/f_pc_node.h" +#include "JSystem/JUtility/JUTGamePad.h" +#include "SSystem/SComponent/c_math.h" +#include "SSystem/SComponent/c_sxyz.h" +#include "SSystem/SComponent/c_xyz.h" + +#include + #include #include #include #include #include -#include "fmt/format.h" - namespace dusk { namespace { diff --git a/src/dusk/config.cpp b/src/dusk/config.cpp index 5a66380ced..b9bbe88b70 100644 --- a/src/dusk/config.cpp +++ b/src/dusk/config.cpp @@ -1,12 +1,16 @@ #include "dusk/config.hpp" -#include "absl/container/flat_hash_map.h" -#include "fmt/format.h" -#include "nlohmann/json.hpp" +#include "dusk/action_bindings.h" #include "dusk/io.hpp" -#include +#include "dusk/logging.h" +#include "dusk/main.h" #include "dusk/settings.h" +#include +#include +#include +#include + #include #include #include @@ -18,10 +22,6 @@ #include #include -#include "dusk/action_bindings.h" -#include "dusk/logging.h" -#include "dusk/main.h" - namespace dusk::config { namespace { constexpr auto ConfigFileName = "config.json"; diff --git a/src/dusk/discord_presence.cpp b/src/dusk/discord_presence.cpp index 6eca5d2186..29e4f27617 100644 --- a/src/dusk/discord_presence.cpp +++ b/src/dusk/discord_presence.cpp @@ -1,14 +1,15 @@ #if BOREALIS_HAS_DISCORD +#include "discord_presence.hpp" + +#include "app_info.hpp" +#include "logging.h" +#include "main.h" +#include "map_loader_definitions.h" -#include "dusk/discord_presence.hpp" #include "d/d_com_inf_game.h" -#include "dusk/app_info.hpp" -#include "dusk/logging.h" -#include "dusk/main.h" -#include "dusk/map_loader_definitions.h" -#include "fmt/format.h" #include +#include #include #include diff --git a/src/dusk/dusk.h b/src/dusk/dusk.h index b95b33515e..e360a24d26 100644 --- a/src/dusk/dusk.h +++ b/src/dusk/dusk.h @@ -1,8 +1,7 @@ #pragma once #include - -#include "aurora/gfx.h" +#include extern AuroraInfo auroraInfo; diff --git a/src/dusk/dvd_asset.cpp b/src/dusk/dvd_asset.cpp index f5c8e73d4d..335b1c5572 100644 --- a/src/dusk/dvd_asset.cpp +++ b/src/dusk/dvd_asset.cpp @@ -1,12 +1,13 @@ #include "dusk/dvd_asset.hpp" + #include "dusk/logging.h" #include "helpers/endian.h" -#include "dolphin/dvd.h" + #include "DynamicLink.h" #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRDvdRipper.h" -#include +#include namespace dusk { diff --git a/src/dusk/game_clock.cpp b/src/dusk/game_clock.cpp index a38a08c7d2..178ec7803a 100644 --- a/src/dusk/game_clock.cpp +++ b/src/dusk/game_clock.cpp @@ -1,10 +1,11 @@ #include "dusk/game_clock.h" -#include +#include "dusk/frame_interpolation.h" + #include + +#include #include -#include -#include #include namespace dusk::game_clock { diff --git a/src/dusk/game_mode.cpp b/src/dusk/game_mode.cpp index 8fdb3106f3..ffecd66df3 100644 --- a/src/dusk/game_mode.cpp +++ b/src/dusk/game_mode.cpp @@ -1,10 +1,14 @@ #include "dusk/game_mode.hpp" -#include "JSystem/JUtility/JUTGamePad.h" -#include "aurora/lib/logging.hpp" + #include "dusk/config.hpp" #include "dusk/ui/prelaunch.hpp" + #include "m_Do/m_Do_MemCard.h" +#include "JSystem/JUtility/JUTGamePad.h" + +#include + namespace dusk::gamemode { namespace { aurora::Module Log("dusk::gamemode"); diff --git a/src/dusk/game_mode.hpp b/src/dusk/game_mode.hpp index 3c2b63a484..2376eb062b 100644 --- a/src/dusk/game_mode.hpp +++ b/src/dusk/game_mode.hpp @@ -1,8 +1,9 @@ #pragma once -#include "d/d_file_select.h" #include "mods/svc/game_mode.h" +#include "d/d_file_select.h" + #include #include #include diff --git a/src/dusk/gamepad_color.cpp b/src/dusk/gamepad_color.cpp index 9fea8fd769..36e738c29e 100644 --- a/src/dusk/gamepad_color.cpp +++ b/src/dusk/gamepad_color.cpp @@ -1,14 +1,17 @@ -#include -#include -#include -#include -#include -#include +#include "dusk/gamepad_color.h" #include "ui/controller_config.hpp" +#include "d/d_com_inf_game.h" +#include "d/actor/d_a_player.h" +#include "d/actor/d_a_alink.h" + +#include + #include +#include + namespace dusk::input { namespace { diff --git a/src/dusk/globals.cpp b/src/dusk/globals.cpp index 591ece679f..34649470c9 100644 --- a/src/dusk/globals.cpp +++ b/src/dusk/globals.cpp @@ -34,5 +34,5 @@ DSPTaskInfo* __DSP_first_task; DSPTaskInfo* __DSP_curr_task; // mDo_dvd -#include +#include "m_Do/m_Do_dvd_thread.h" u8 mDoDvdThd::DVDLogoMode; diff --git a/src/dusk/hq_minimap.cpp b/src/dusk/hq_minimap.cpp index a4d73cbcf1..790597d579 100644 --- a/src/dusk/hq_minimap.cpp +++ b/src/dusk/hq_minimap.cpp @@ -1,6 +1,7 @@ -#include "aurora/texture.hpp" #include "dusk/texture_replacements.hpp" -#include "fmt/format.h" + +#include +#include #include #include diff --git a/src/dusk/imgui/ImGuiActorSpawner.cpp b/src/dusk/imgui/ImGuiActorSpawner.cpp index f3aefd4c41..ba2a41dcc4 100644 --- a/src/dusk/imgui/ImGuiActorSpawner.cpp +++ b/src/dusk/imgui/ImGuiActorSpawner.cpp @@ -1,12 +1,13 @@ -#include "imgui.h" - #include "ImGuiMenuTools.hpp" + #include "d/actor/d_a_alink.h" -#include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" + #include "SSystem/SComponent/c_sxyz.h" #include "SSystem/SComponent/c_xyz.h" +#include + namespace dusk { namespace { diff --git a/src/dusk/imgui/ImGuiBloomWindow.cpp b/src/dusk/imgui/ImGuiBloomWindow.cpp index 1741f82cd8..e22b86ee1e 100644 --- a/src/dusk/imgui/ImGuiBloomWindow.cpp +++ b/src/dusk/imgui/ImGuiBloomWindow.cpp @@ -1,11 +1,13 @@ -#include - -#include "imgui.h" - #include "ImGuiBloomWindow.hpp" + #include "ImGuiMenuTools.hpp" + #include "m_Do/m_Do_graphic.h" +#include + +#include + namespace dusk { namespace { struct BloomOverride { diff --git a/src/dusk/imgui/ImGuiCameraOverlay.cpp b/src/dusk/imgui/ImGuiCameraOverlay.cpp index 3b859769b9..914f13f1af 100644 --- a/src/dusk/imgui/ImGuiCameraOverlay.cpp +++ b/src/dusk/imgui/ImGuiCameraOverlay.cpp @@ -1,13 +1,16 @@ -#include "f_op/f_op_camera_mng.h" -#include "SSystem/SComponent/c_xyz.h" -#include "d/d_com_inf_game.h" - -#include "imgui.h" #include "ImGuiConfig.hpp" #include "ImGuiConsole.hpp" #include "ImGuiMenuTools.hpp" + #include "dusk/settings.h" +#include "d/d_com_inf_game.h" +#include "f_op/f_op_camera_mng.h" + +#include "SSystem/SComponent/c_xyz.h" + +#include + namespace dusk { void ImGuiMenuTools::ShowCameraOverlay() { if (!getSettings().backend.enableAdvancedSettings || diff --git a/src/dusk/imgui/ImGuiConfig.hpp b/src/dusk/imgui/ImGuiConfig.hpp index 4bceb36a38..6e6cbdea9d 100644 --- a/src/dusk/imgui/ImGuiConfig.hpp +++ b/src/dusk/imgui/ImGuiConfig.hpp @@ -2,7 +2,8 @@ #define DUSK_IMGUICONFIG_HPP #include "dusk/config.hpp" -#include "imgui.h" + +#include namespace dusk::config { inline bool ImGuiCheckbox(const char* title, ConfigVar& var) { diff --git a/src/dusk/imgui/ImGuiConsole.cpp b/src/dusk/imgui/ImGuiConsole.cpp index 89039dbc14..97a13efc3d 100644 --- a/src/dusk/imgui/ImGuiConsole.cpp +++ b/src/dusk/imgui/ImGuiConsole.cpp @@ -1,15 +1,8 @@ -#include -#include -#include -#include - #define IMGUI_DEFINE_MATH_OPERATORS -#include "imgui.h" -#include - #include "ImGuiConsole.hpp" + #include "ImGuiEngine.hpp" -#include "JSystem/JUtility/JUTGamePad.h" + #include "dusk/action_bindings.h" #include "dusk/config.hpp" #include "dusk/data.hpp" @@ -20,10 +13,21 @@ #include "dusk/presentation.hpp" #include "dusk/settings.h" #include "dusk/ui/ui.hpp" + #include "f_pc/f_pc_manager.h" #include "f_pc/f_pc_name.h" -#include "fmt/format.h" -#include "tracy/Tracy.hpp" + +#include "JSystem/JUtility/JUTGamePad.h" + +#include +#include +#include +#include +#include + +#include +#include +#include #if _WIN32 #define NOMINMAX diff --git a/src/dusk/imgui/ImGuiConsole.hpp b/src/dusk/imgui/ImGuiConsole.hpp index be344afa3f..87f0b1795a 100644 --- a/src/dusk/imgui/ImGuiConsole.hpp +++ b/src/dusk/imgui/ImGuiConsole.hpp @@ -1,15 +1,14 @@ #ifndef DUSK_IMGUI_HPP #define DUSK_IMGUI_HPP +#include "ImGuiMenuTools.hpp" -#include -#include -#include +#include "dusk/main.h" #include +#include -#include "ImGuiMenuTools.hpp" -#include "dusk/main.h" -#include "imgui.h" +#include +#include union SDL_Event; struct ImGuiWindow; diff --git a/src/dusk/imgui/ImGuiControllerOverlay.cpp b/src/dusk/imgui/ImGuiControllerOverlay.cpp index ad07978a8b..7432c1f49f 100644 --- a/src/dusk/imgui/ImGuiControllerOverlay.cpp +++ b/src/dusk/imgui/ImGuiControllerOverlay.cpp @@ -1,11 +1,12 @@ -#include "m_Do/m_Do_controller_pad.h" - -#include "imgui.h" -#include #include "ImGuiConsole.hpp" + #include "dusk/settings.h" +#include "m_Do/m_Do_controller_pad.h" + #include +#include +#include namespace dusk { void ImGuiMenuTools::ShowInputViewer() { diff --git a/src/dusk/imgui/ImGuiEngine.cpp b/src/dusk/imgui/ImGuiEngine.cpp index b2ea1f8e1a..8c4fd16a43 100644 --- a/src/dusk/imgui/ImGuiEngine.cpp +++ b/src/dusk/imgui/ImGuiEngine.cpp @@ -1,17 +1,17 @@ #include "ImGuiEngine.hpp" +#include "dusk/logging.h" + +#include +#include +#include #include #include #include #include -#include -#include -#include -#include -#include -#include "aurora/lib/window.hpp" -#include "dusk/logging.h" +#include +#include #ifdef IMGUI_ENABLE_FREETYPE #include "misc/freetype/imgui_freetype.h" diff --git a/src/dusk/imgui/ImGuiEngine.hpp b/src/dusk/imgui/ImGuiEngine.hpp index 44077c9625..2c40b02c89 100644 --- a/src/dusk/imgui/ImGuiEngine.hpp +++ b/src/dusk/imgui/ImGuiEngine.hpp @@ -1,8 +1,8 @@ #pragma once +#include + #include -#include "imgui.h" -#include "misc/cpp/imgui_stdlib.h" namespace dusk { class ImGuiEngine { diff --git a/src/dusk/imgui/ImGuiHeapOverlay.cpp b/src/dusk/imgui/ImGuiHeapOverlay.cpp index 33209ab0d4..0d6da0b210 100644 --- a/src/dusk/imgui/ImGuiHeapOverlay.cpp +++ b/src/dusk/imgui/ImGuiHeapOverlay.cpp @@ -1,13 +1,15 @@ -#include -#include - #include "ImGuiConsole.hpp" #include "ImGuiMenuTools.hpp" + #include "JSystem/JFramework/JFWSystem.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRHeap.h" -#include "absl/container/flat_hash_map.h" -#include "imgui.h" + +#include +#include + +#include +#include struct OpenHeapData { bool Safe; diff --git a/src/dusk/imgui/ImGuiMenuTools.cpp b/src/dusk/imgui/ImGuiMenuTools.cpp index 7657c48815..0ecfdce149 100644 --- a/src/dusk/imgui/ImGuiMenuTools.cpp +++ b/src/dusk/imgui/ImGuiMenuTools.cpp @@ -1,25 +1,26 @@ -#include "fmt/format.h" -#include "imgui.h" -#include "aurora/gfx.h" - -#include "ImGuiConfig.hpp" -#include "dusk/hotkeys.h" -#include "dusk/settings.h" -#include "ImGuiConsole.hpp" #include "ImGuiMenuTools.hpp" +#include "ImGuiConfig.hpp" +#include "ImGuiConsole.hpp" #include "ImGuiEngine.hpp" + +#include "dusk/data.hpp" +#include "dusk/dusk.h" +#include "dusk/hotkeys.h" +#include "dusk/main.h" +#include "dusk/os.h" +#include "dusk/settings.h" +#include "dusk/speedrun.h" + #include "d/actor/d_a_alink.h" #include "d/actor/d_a_horse.h" #include "d/d_com_inf_game.h" -#include "dusk/data.hpp" -#include "dusk/dusk.h" -#include "dusk/speedrun.h" -#include "dusk/main.h" -#include "dusk/os.h" #include "m_Do/m_Do_main.h" +#include #include +#include +#include #include #if defined(__APPLE__) diff --git a/src/dusk/imgui/ImGuiMenuTools.hpp b/src/dusk/imgui/ImGuiMenuTools.hpp index 61fab81f79..68b150b6d4 100644 --- a/src/dusk/imgui/ImGuiMenuTools.hpp +++ b/src/dusk/imgui/ImGuiMenuTools.hpp @@ -1,14 +1,10 @@ #ifndef DUSK_IMGUI_MENUTOOLS_HPP #define DUSK_IMGUI_MENUTOOLS_HPP - -#include -#include -#include - -#include "imgui.h" #include "ImGuiSaveEditor.hpp" #include "ImGuiStateShare.hpp" +#include + namespace dusk { class ImGuiMenuTools { public: diff --git a/src/dusk/imgui/ImGuiProcessOverlay.cpp b/src/dusk/imgui/ImGuiProcessOverlay.cpp index 5b4fff28db..03ad595ac1 100644 --- a/src/dusk/imgui/ImGuiProcessOverlay.cpp +++ b/src/dusk/imgui/ImGuiProcessOverlay.cpp @@ -1,19 +1,17 @@ #define PROCS_DUMP_NAMES 1 -#include +#include "ImGuiConsole.hpp" +#include "ImGuiMenuTools.hpp" -#include "f_pc/f_pc_name.h" #include "f_pc/f_pc_create_iter.h" #include "f_pc/f_pc_create_req.h" #include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_layer_iter.h" #include "f_pc/f_pc_leaf.h" +#include "f_pc/f_pc_name.h" #include "f_pc/f_pc_node.h" -#include "d/d_debug_viewer.h" -#include "imgui.h" -#include "ImGuiConsole.hpp" -#include "ImGuiMenuTools.hpp" -#include "imgui_internal.h" + +#include namespace dusk { static bool BeginProcTable() { diff --git a/src/dusk/imgui/ImGuiSaveEditor.cpp b/src/dusk/imgui/ImGuiSaveEditor.cpp index 244b26e200..866b0fe369 100644 --- a/src/dusk/imgui/ImGuiSaveEditor.cpp +++ b/src/dusk/imgui/ImGuiSaveEditor.cpp @@ -1,16 +1,16 @@ -#include "fmt/format.h" -#include "imgui.h" -#include "aurora/gfx.h" +#include "ImGuiSaveEditor.hpp" #include "ImGuiConsole.hpp" -#include "ImGuiSaveEditor.hpp" #include "ImGuiEventFlags.hpp" +#include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_item_data.h" #include "d/d_meter2_info.h" #include "d/d_save.h" -#include "d/actor/d_a_player.h" + +#include +#include #include diff --git a/src/dusk/imgui/ImGuiSaveEditor.hpp b/src/dusk/imgui/ImGuiSaveEditor.hpp index a18262862f..50ac7530a5 100644 --- a/src/dusk/imgui/ImGuiSaveEditor.hpp +++ b/src/dusk/imgui/ImGuiSaveEditor.hpp @@ -1,11 +1,6 @@ #ifndef DUSK_IMGUI_SAVEEDITOR_HPP #define DUSK_IMGUI_SAVEEDITOR_HPP -#include -#include - -#include "imgui.h" - namespace dusk { class ImGuiSaveEditor { public: diff --git a/src/dusk/imgui/ImGuiStateShare.cpp b/src/dusk/imgui/ImGuiStateShare.cpp index be45d5394b..9f7ee09282 100644 --- a/src/dusk/imgui/ImGuiStateShare.cpp +++ b/src/dusk/imgui/ImGuiStateShare.cpp @@ -1,24 +1,26 @@ #include "ImGuiStateShare.hpp" -#include "ImGuiMenuTools.hpp" + #include "ImGuiConsole.hpp" +#include "ImGuiMenuTools.hpp" -#include "imgui.h" -#include "fmt/format.h" -#include "absl/strings/escaping.h" -#include "nlohmann/json.hpp" - -#include "d/d_com_inf_game.h" -#include "dusk/main.h" +#include "dusk/autosave.h" #include "dusk/io.hpp" #include "dusk/logging.h" +#include "dusk/main.h" #include "dusk/settings.h" + +#include "d/d_com_inf_game.h" #include "f_op/f_op_overlap_mng.h" + +#include +#include #include -#include "aurora/lib/window.hpp" +#include +#include +#include +#include #include -#include -#include namespace dusk { diff --git a/src/dusk/imgui/ImGuiStubLog.cpp b/src/dusk/imgui/ImGuiStubLog.cpp index 9a6f084eef..cc28bbc53d 100644 --- a/src/dusk/imgui/ImGuiStubLog.cpp +++ b/src/dusk/imgui/ImGuiStubLog.cpp @@ -1,9 +1,11 @@ -#include -#include +#include "ImGuiMenuTools.hpp" #include "dusk/logging.h" -#include "imgui.h" -#include "ImGuiMenuTools.hpp" + +#include + +#include +#include namespace dusk { static ImGuiTextBuffer StubLogBuffer; diff --git a/src/dusk/logging.cpp b/src/dusk/logging.cpp index 1f3a0451b4..b85635f1a5 100644 --- a/src/dusk/logging.cpp +++ b/src/dusk/logging.cpp @@ -1,8 +1,8 @@ #include "dusk/logging.h" -#include +#include -#include "tracy/Tracy.hpp" +#include bool StubLogEnabled = true; diff --git a/src/dusk/mod_loader.hpp b/src/dusk/mod_loader.hpp index f465bdbd94..d07f0d6f2c 100644 --- a/src/dusk/mod_loader.hpp +++ b/src/dusk/mod_loader.hpp @@ -1,5 +1,10 @@ #pragma once +#include "dusk/config.hpp" +#include "dusk/config_var.hpp" +#include "mods/api.h" +#include "mods/runtime.h" + #include #include #include @@ -8,11 +13,6 @@ #include #include -#include "dusk/config.hpp" -#include "dusk/config_var.hpp" -#include "mods/api.h" -#include "mods/runtime.h" - namespace dusk::mods { struct LoadedMod; class ModBundle; diff --git a/src/dusk/mods/item_checks.cpp b/src/dusk/mods/item_checks.cpp index dc0a66d209..221654ea07 100644 --- a/src/dusk/mods/item_checks.cpp +++ b/src/dusk/mods/item_checks.cpp @@ -3,17 +3,16 @@ #include "dusk/mod_loader.hpp" #include "dusk/mods/loader/loader.hpp" #include "dusk/mods/svc/item.hpp" - -#include "aurora/lib/logging.hpp" -#include "d/d_com_inf_game.h" -#include "d/d_item_data.h" #include "mods/items.h" +#include "d/d_com_inf_game.h" +#include "d/d_item_data.h" + +#include #include #include #include -#include #include #include #include diff --git a/src/dusk/mods/item_gives.cpp b/src/dusk/mods/item_gives.cpp index 8feb0a7847..7a0ed3f6b1 100644 --- a/src/dusk/mods/item_gives.cpp +++ b/src/dusk/mods/item_gives.cpp @@ -4,13 +4,13 @@ #include "dusk/mods/loader/loader.hpp" #include "dusk/mods/svc/item.hpp" -#include "aurora/lib/logging.hpp" #include "d/actor/d_a_alink.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" #include "d/d_item_data.h" #include "f_op/f_op_actor_mng.h" +#include #include #include diff --git a/src/dusk/mods/loader/bundle_zip.cpp b/src/dusk/mods/loader/bundle_zip.cpp index 517c5943c2..6075dd5dc1 100644 --- a/src/dusk/mods/loader/bundle_zip.cpp +++ b/src/dusk/mods/loader/bundle_zip.cpp @@ -1,6 +1,7 @@ -#include "fmt/format.h" #include "loader.hpp" +#include + #include namespace dusk::mods { diff --git a/src/dusk/mods/loader/loader.cpp b/src/dusk/mods/loader/loader.cpp index bacae852bb..71b17b7cff 100644 --- a/src/dusk/mods/loader/loader.cpp +++ b/src/dusk/mods/loader/loader.cpp @@ -1,37 +1,37 @@ #include "loader.hpp" -#include "dusk/logging.h" -#include "dusk/mod_loader.hpp" - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "../manifest.hpp" #include "depgraph.hpp" +#include "native_module.hpp" +#if DUSK_HAS_PREPATCH +#include "prepatch.hpp" +#endif + #include "dusk/config.hpp" #include "dusk/data.hpp" #include "dusk/io.hpp" +#include "dusk/logging.h" +#include "dusk/mod_loader.hpp" #include "dusk/mods/log_buffer.hpp" #include "dusk/mods/svc/config.hpp" #include "dusk/mods/svc/hook.hpp" #include "dusk/mods/svc/registry.hpp" #include "dusk/ui/mods_window.hpp" #include "dusk/ui/ui.hpp" -#include "miniz.h" -#include "native_module.hpp" -#include "nlohmann/json.hpp" -#if DUSK_HAS_PREPATCH -#include "prepatch.hpp" -#endif + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace std::string_literals; using namespace std::string_view_literals; diff --git a/src/dusk/mods/log_buffer.hpp b/src/dusk/mods/log_buffer.hpp index 33a143705d..2787ccb07f 100644 --- a/src/dusk/mods/log_buffer.hpp +++ b/src/dusk/mods/log_buffer.hpp @@ -1,13 +1,12 @@ #pragma once -#include -#include -#include -#include +#include "mods/svc/log.h" #include -#include "mods/svc/log.h" +#include +#include +#include namespace dusk::mods::log { diff --git a/src/dusk/mods/manifest.hpp b/src/dusk/mods/manifest.hpp index c6bc03f038..586759a8b1 100644 --- a/src/dusk/mods/manifest.hpp +++ b/src/dusk/mods/manifest.hpp @@ -1,10 +1,10 @@ #pragma once +#include "mods/svc/hook.h" + #include #include -#include "mods/svc/hook.h" - namespace dusk::mods::manifest { // Symbol flags mirrored from symgen. diff --git a/src/dusk/mods/svc/actor.cpp b/src/dusk/mods/svc/actor.cpp index e3cc9411d7..19aa8c9c20 100644 --- a/src/dusk/mods/svc/actor.cpp +++ b/src/dusk/mods/svc/actor.cpp @@ -1,21 +1,18 @@ #include "mods/svc/actor.h" -#include "dusk/mods/svc/actor.hpp" -#include "config.hpp" +#include "actor.hpp" #include "internal.hpp" #include "registry.hpp" -#include "aurora/lib/logging.hpp" #include "dusk/mod_loader.hpp" #include "dusk/mods/loader/loader.hpp" -#include - #include "d/d_stage.h" #include "f_op/f_op_actor_tag.h" #include "f_pc/f_pc_deletor.h" -#include +#include + #include namespace dusk::mods::svc::actor_impl { diff --git a/src/dusk/mods/svc/game_mode.cpp b/src/dusk/mods/svc/game_mode.cpp index e7b8c06915..a84afad78f 100644 --- a/src/dusk/mods/svc/game_mode.cpp +++ b/src/dusk/mods/svc/game_mode.cpp @@ -1,14 +1,14 @@ #include "mods/svc/game_mode.h" -#include "dusk/game_mode.hpp" -#include "config.hpp" #include "internal.hpp" #include "registry.hpp" -#include "aurora/lib/logging.hpp" +#include "dusk/game_mode.hpp" #include "dusk/mod_loader.hpp" #include "dusk/mods/loader/loader.hpp" -#include "fmt/format.h" + +#include +#include #include #include diff --git a/src/dusk/mods/svc/host.cpp b/src/dusk/mods/svc/host.cpp index 114a1bc2ee..bde28f6b89 100644 --- a/src/dusk/mods/svc/host.cpp +++ b/src/dusk/mods/svc/host.cpp @@ -5,11 +5,12 @@ #include "dusk/mods/loader/loader.hpp" #include "dusk/mods/log_buffer.hpp" #include "dusk/mods/manifest.hpp" -#include "fmt/format.h" -#include #include #include +#include + +#include #include #include diff --git a/src/dusk/mods/svc/overlay.cpp b/src/dusk/mods/svc/overlay.cpp index d32cc8069c..478fbe32de 100644 --- a/src/dusk/mods/svc/overlay.cpp +++ b/src/dusk/mods/svc/overlay.cpp @@ -1,15 +1,16 @@ #include "internal.hpp" #include "registry.hpp" -#include -#include "JSystem/JKernel/JKRArchive.h" -#include "aurora/dvd.h" #include "dusk/mods/loader/loader.hpp" #include "mods/svc/overlay.h" +#include "JSystem/JKernel/JKRArchive.h" + +#include +#include + #include #include -#include #include #include #include diff --git a/src/dusk/mods/svc/save.cpp b/src/dusk/mods/svc/save.cpp index 1b4e2047e7..b09b3999cc 100644 --- a/src/dusk/mods/svc/save.cpp +++ b/src/dusk/mods/svc/save.cpp @@ -3,13 +3,15 @@ #include "item.hpp" #include "registry.hpp" -#include "aurora/lib/logging.hpp" -#include "d/d_save.h" #include "dusk/main.h" #include "dusk/mods/loader/loader.hpp" #include "dusk/utilities.hpp" #include "mods/svc/save.h" +#include "d/d_save.h" + +#include + #include #include diff --git a/src/dusk/mods/svc/stage.cpp b/src/dusk/mods/svc/stage.cpp index 431591ae66..f20634e8ec 100644 --- a/src/dusk/mods/svc/stage.cpp +++ b/src/dusk/mods/svc/stage.cpp @@ -2,12 +2,13 @@ #include "registry.hpp" -#include "aurora/lib/logging.hpp" #include "dusk/mods/loader/loader.hpp" +#include "dusk/utilities.hpp" #include "mods/svc/stage.h" #include "d/d_com_inf_game.h" -#include "dusk/utilities.hpp" + +#include #include #include diff --git a/src/dusk/mods/svc/ui.cpp b/src/dusk/mods/svc/ui.cpp index 7516b893bf..f10794d1ab 100644 --- a/src/dusk/mods/svc/ui.cpp +++ b/src/dusk/mods/svc/ui.cpp @@ -5,7 +5,6 @@ #include "registry.hpp" #include "ui_v1.hpp" -#include #include "dusk/mod_loader.hpp" #include "dusk/mods/loader/loader.hpp" #include "dusk/mods/log_buffer.hpp" @@ -16,15 +15,16 @@ #include "dusk/ui/ui.hpp" #include "mods/svc/ui.h" -#include #include +#include #include +#include +#include #include #include #include #include -#include #include #include #include @@ -37,8 +37,6 @@ #include #include -#include "SDL3/SDL_clipboard.h" - namespace { constexpr size_t kUiControlSelectedSize = diff --git a/src/dusk/stubs.cpp b/src/dusk/stubs.cpp index ac72f8377d..3cd99264c4 100644 --- a/src/dusk/stubs.cpp +++ b/src/dusk/stubs.cpp @@ -1,19 +1,14 @@ +#include "dusk/logging.h" +#include "dusk/main.h" + #include #include -#include -#include -#include -#include -#include +#include + +#include #include #include -#include #include -#include -#include -#include - -#include "tracy/Tracy.hpp" #ifndef _WIN32 #include diff --git a/src/dusk/time.h b/src/dusk/time.h index fad3186042..6423e084cf 100644 --- a/src/dusk/time.h +++ b/src/dusk/time.h @@ -1,10 +1,10 @@ #pragma once +#include + #include #include -#include "SDL3/SDL_timer.h" - #ifdef _WIN32 #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN diff --git a/src/dusk/ui/achievements.cpp b/src/dusk/ui/achievements.cpp index 905fa57f59..3fe713520e 100644 --- a/src/dusk/ui/achievements.cpp +++ b/src/dusk/ui/achievements.cpp @@ -1,12 +1,14 @@ #include "achievements.hpp" -#include "Z2AudioLib/Z2SeMgr.h" -#include "dusk/achievements.h" -#include "fmt/format.h" -#include "m_Do/m_Do_audio.h" #include "nav_types.hpp" #include "pane.hpp" +#include "dusk/achievements.h" + +#include "m_Do/m_Do_audio.h" + +#include + namespace dusk::ui { namespace { diff --git a/src/dusk/ui/document.cpp b/src/dusk/ui/document.cpp index 8ad701d3ce..3278361f83 100644 --- a/src/dusk/ui/document.cpp +++ b/src/dusk/ui/document.cpp @@ -1,10 +1,11 @@ #include "document.hpp" -#include "aurora/rmlui.hpp" #include "ui.hpp" #include "m_Do/m_Do_audio.h" +#include + #include namespace dusk::ui { diff --git a/src/dusk/ui/menu_bar.cpp b/src/dusk/ui/menu_bar.cpp index 4884dbf3a9..5ebf65145d 100644 --- a/src/dusk/ui/menu_bar.cpp +++ b/src/dusk/ui/menu_bar.cpp @@ -1,32 +1,30 @@ #include "menu_bar.hpp" -#include - -#include "Z2AudioLib/Z2SeMgr.h" -#include "m_Do/m_Do_audio.h" - #include "achievements.hpp" -#include "aurora/rmlui.hpp" +#include "editor.hpp" +#include "modal.hpp" +#include "mods_window.hpp" +#include "prelaunch.hpp" +#include "settings.hpp" +#include "ui.hpp" +#include "warp.hpp" +#include "window.hpp" + #include "dusk/game_mode.hpp" #include "dusk/livesplit.h" #include "dusk/main.h" #include "dusk/mods/svc/ui.hpp" #include "dusk/settings.h" #include "dusk/speedrun.h" -#include "dusk/ui/prelaunch.hpp" -#include "editor.hpp" -#include "f_op/f_op_scene_mng.h" + #include "f_pc/f_pc_manager.h" #include "f_pc/f_pc_name.h" -#include "imgui.h" -#include "modal.hpp" -#include "mods_window.hpp" -#include "settings.hpp" -#include "ui.hpp" -#include "warp.hpp" -#include "window.hpp" +#include "m_Do/m_Do_audio.h" + +#include +#include +#include -#include #include namespace dusk::ui { diff --git a/src/dusk/ui/mods_window.cpp b/src/dusk/ui/mods_window.cpp index e23cb39d1d..43775d8902 100644 --- a/src/dusk/ui/mods_window.cpp +++ b/src/dusk/ui/mods_window.cpp @@ -1,16 +1,17 @@ #include "mods_window.hpp" -#include "dusk/mod_loader.hpp" -#include "dusk/mods/svc/net.hpp" -#include "dusk/mods/svc/ui.hpp" -#include "fmt/format.h" #include "logs_window.hpp" #include "mod_texture_provider.hpp" #include "pane.hpp" -#include "Z2AudioLib/Z2SeMgr.h" +#include "dusk/mod_loader.hpp" +#include "dusk/mods/svc/net.hpp" +#include "dusk/mods/svc/ui.hpp" + #include "m_Do/m_Do_audio.h" +#include + #include #include #include diff --git a/src/dusk/ui/overlay.cpp b/src/dusk/ui/overlay.cpp index be95e99a4f..2dc77aebec 100644 --- a/src/dusk/ui/overlay.cpp +++ b/src/dusk/ui/overlay.cpp @@ -1,22 +1,25 @@ #include "overlay.hpp" -#include #include "controller_config.hpp" +#include "window.hpp" + #include "dusk/achievements.h" #include "dusk/action_bindings.h" #include "dusk/livesplit.h" #include "dusk/settings.h" #include "dusk/speedrun.h" -#include "fmt/format.h" -#include "magic_enum.hpp" -#include "window.hpp" +#include "m_Do/m_Do_main.h" + +#include +#include +#include +#include +#include #include #include + #include -#include -#include -#include #if defined(__APPLE__) #include diff --git a/src/dusk/ui/settings.cpp b/src/dusk/ui/settings.cpp index a6f549048f..527e6c32c8 100644 --- a/src/dusk/ui/settings.cpp +++ b/src/dusk/ui/settings.cpp @@ -1,41 +1,38 @@ #include "settings.hpp" -#include "aurora/gfx.h" #include "bool_button.hpp" #include "controller_config.hpp" -#include "dusk/app_info.hpp" -#include "dusk/audio/DuskAudioSystem.h" -#include "dusk/audio/DuskDsp.hpp" -#include "dusk/config.hpp" -#include "dusk/hotkeys.h" -#include "dusk/data.hpp" -#include "dusk/imgui/ImGuiEngine.hpp" -#include "dusk/io.hpp" -#include "dusk/language.hpp" -#include "dusk/presentation.hpp" -#include -#include -#include "dusk/livesplit.h" -#include "dusk/discord_presence.hpp" -#include "dusk/speedrun.h" #include "graphics_tuner.hpp" -#include "m_Do/m_Do_main.h" #include "menu_bar.hpp" #include "modal.hpp" #include "number_button.hpp" -#include "menu_bar.hpp" #include "pane.hpp" #include "prelaunch.hpp" #include "touch_controls_editor.hpp" #include "ui.hpp" -#include -#include -#include +#include "dusk/app_info.hpp" +#include "dusk/audio/DuskAudioSystem.h" +#include "dusk/audio/DuskDsp.hpp" +#include "dusk/config.hpp" +#include "dusk/data.hpp" +#include "dusk/discord_presence.hpp" +#include "dusk/hotkeys.h" +#include "dusk/imgui/ImGuiEngine.hpp" +#include "dusk/language.hpp" +#include "dusk/livesplit.h" +#include "dusk/presentation.hpp" +#include "dusk/speedrun.h" +#include +#include +#include +#include #if BOREALIS_HAS_SENTRY #include #endif +#include +#include #include #include diff --git a/src/dusk/ui/ui.cpp b/src/dusk/ui/ui.cpp index 0e3a8d7c32..91dec21a17 100644 --- a/src/dusk/ui/ui.cpp +++ b/src/dusk/ui/ui.cpp @@ -1,23 +1,5 @@ #include "ui.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "aurora/lib/window.hpp" -#include "dusk/config.hpp" -#include "dusk/io.hpp" -#include #include "command_console.hpp" #include "icon_provider.hpp" #include "input.hpp" @@ -25,6 +7,24 @@ #include "prelaunch.hpp" #include "window.hpp" +#include "dusk/config.hpp" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + namespace dusk::ui { namespace { diff --git a/src/dusk/ui/warp.cpp b/src/dusk/ui/warp.cpp index efae7f1d65..0827745fa1 100644 --- a/src/dusk/ui/warp.cpp +++ b/src/dusk/ui/warp.cpp @@ -4,7 +4,8 @@ #include "pane.hpp" #include "dusk/map_loader_definitions.h" -#include "fmt/format.h" + +#include namespace dusk::ui { namespace { diff --git a/src/dusk/ui/window.cpp b/src/dusk/ui/window.cpp index f1162a09b6..bf0fee5ea9 100644 --- a/src/dusk/ui/window.cpp +++ b/src/dusk/ui/window.cpp @@ -1,15 +1,15 @@ #include "window.hpp" -#include "aurora/lib/window.hpp" -#include "aurora/rmlui.hpp" -#include "fmt/format.h" -#include "magic_enum.hpp" #include "pane.hpp" #include "ui.hpp" -#include "Z2AudioLib/Z2SeMgr.h" #include "m_Do/m_Do_audio.h" +#include +#include +#include +#include + #include #include diff --git a/src/f_ap/f_ap_game.cpp b/src/f_ap/f_ap_game.cpp index 3627f16bbb..cff78bb7cf 100644 --- a/src/f_ap/f_ap_game.cpp +++ b/src/f_ap/f_ap_game.cpp @@ -1,37 +1,37 @@ #include "f_ap/f_ap_game.h" -#include -#include "DynamicLink.h" -#include "JSystem/J3DGraphLoader/J3DModelLoader.h" -#include "JSystem/J3DGraphLoader/J3DModelSaver.h" -#include "JSystem/JHostIO/JORFile.h" -#include "JSystem/JKernel/JKRAram.h" -#include "JSystem/JKernel/JKRAramArchive.h" -#include "JSystem/JKernel/JKRSolidHeap.h" -#include "JSystem/JUtility/JUTDbPrint.h" #include "SSystem/SComponent/c_counter.h" -#include "d/actor/d_a_alink.h" -#include "d/actor/d_a_grass.h" -#include "d/actor/d_a_midna.h" -#include "d/d_model.h" -#include "d/d_tresure.h" -#include "dusk/achievements.h" -#include "dusk/frame_interpolation.h" -#include "dusk/livesplit.h" -#include "dusk/logging.h" -#include "dusk/mod_loader.hpp" #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_draw_tag.h" #include "f_op/f_op_overlap_mng.h" #include "f_op/f_op_scene_mng.h" -#include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_main.h" +#include "m_Do/m_Do_graphic.h" +#include "DynamicLink.h" +#include "JSystem/JKernel/JKRSolidHeap.h" +#include "JSystem/JKernel/JKRAram.h" +#include "JSystem/JKernel/JKRAramArchive.h" +#include "JSystem/JUtility/JUTDbPrint.h" +#include "JSystem/JHostIO/JORFile.h" +#include "JSystem/J3DGraphLoader/J3DModelLoader.h" +#include "JSystem/J3DGraphLoader/J3DModelSaver.h" +#include "d/actor/d_a_alink.h" +#include "d/actor/d_a_midna.h" +#include "d/d_model.h" +#include "d/actor/d_a_grass.h" +#include "d/d_tresure.h" +#include #if TARGET_PC -#include -#include +#include "dusk/achievements.h" +#include "dusk/autosave.h" +#include "dusk/frame_interpolation.h" #include "dusk/game_mode.hpp" +#include "dusk/gamepad_color.h" +#include "dusk/logging.h" #include "dusk/menu_pointer.h" -#include "tracy/Tracy.hpp" +#include "dusk/mod_loader.hpp" + +#include #endif fapGm_HIO_c::fapGm_HIO_c() { diff --git a/src/f_pc/f_pc_draw.cpp b/src/f_pc/f_pc_draw.cpp index 8b775257fc..8c53618219 100644 --- a/src/f_pc/f_pc_draw.cpp +++ b/src/f_pc/f_pc_draw.cpp @@ -8,9 +8,10 @@ #include "f_pc/f_pc_leaf.h" #include "f_pc/f_pc_node.h" #include "f_pc/f_pc_pause.h" -#include "dusk/frame_interpolation.h" -#include + +#if TARGET_PC #include "dusk/logging.h" +#endif int fpcDw_Execute(base_process_class* i_proc) { if (!fpcPause_IsEnable(i_proc, 2)) { diff --git a/src/f_pc/f_pc_leaf.cpp b/src/f_pc/f_pc_leaf.cpp index d28067c7ff..7ae56974ca 100644 --- a/src/f_pc/f_pc_leaf.cpp +++ b/src/f_pc/f_pc_leaf.cpp @@ -65,9 +65,7 @@ int fpcLf_Create(leafdraw_class* i_leaf) { LEAFDRAW_BASE(i_leaf).subtype = fpcBs_MakeOfType(&g_fpcLf_type); fpcDwPi_Init(&i_leaf->draw_priority, pprofile->priority); i_leaf->unk_0xBC = 0; -#if TARGET_PC - i_leaf->draw_interp_frame = false; -#endif + IF_DUSK(i_leaf->draw_interp_frame = false); } int ret = fpcMtd_Create(&i_leaf->leaf_methods->base, i_leaf); diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp index 22c705c720..0af7092da4 100644 --- a/src/f_pc/f_pc_manager.cpp +++ b/src/f_pc/f_pc_manager.cpp @@ -23,9 +23,9 @@ #if TARGET_PC #include "dusk/game_clock.h" -#endif -#include "tracy/Tracy.hpp" +#include +#endif void fpcM_Draw(void* i_proc) { fpcDw_Execute((base_process_class*)i_proc); diff --git a/src/f_pc/f_pc_node.cpp b/src/f_pc/f_pc_node.cpp index d56cd6d4c6..a8fd47bd9c 100644 --- a/src/f_pc/f_pc_node.cpp +++ b/src/f_pc/f_pc_node.cpp @@ -8,10 +8,10 @@ #include "f_pc/f_pc_debug_sv.h" #if TARGET_PC +#include "dusk/frame_interpolation.h" + #include "f_op/f_op_draw_iter.h" #include "f_pc/f_pc_manager.h" - -#include "dusk/frame_interpolation.h" #endif int fpcNd_DrawMethod(nodedraw_method_class* i_method_class, void* i_data) { diff --git a/src/helpers/batch.cpp b/src/helpers/batch.cpp index a614eb8b1c..ea77363e24 100644 --- a/src/helpers/batch.cpp +++ b/src/helpers/batch.cpp @@ -1,4 +1,5 @@ #include "helpers/batch.hpp" + #include "dusk/logging.h" #include diff --git a/src/helpers/endian.cpp b/src/helpers/endian.cpp index a4de822f07..885527da85 100644 --- a/src/helpers/endian.cpp +++ b/src/helpers/endian.cpp @@ -1,8 +1,9 @@ #include "helpers/endian.h" -#include -#include "SSystem/SComponent/c_xyz.h" + #include "helpers/endian_gx.hpp" +#include "SSystem/SComponent/c_xyz.h" + #define IMPL_ENUM(type) \ template <> \ type BE::swap(type val) { \ diff --git a/src/helpers/string.cpp b/src/helpers/string.cpp index 23fdbfb8db..67b8115c51 100644 --- a/src/helpers/string.cpp +++ b/src/helpers/string.cpp @@ -1,5 +1,6 @@ #include "helpers/string.hpp" -#include "fmt/format.h" + +#include namespace { void strncpyProxy(char* dst, const char* src, size_t count) { diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index fec93cbed4..9be3b5dde0 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -12,10 +12,11 @@ #include "d/d_debug_viewer.h" #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_dvd_thread.h" -#include "tracy/Tracy.hpp" #if TARGET_PC #include "dusk/settings.h" + +#include #endif #if PLATFORM_WII || PLATFORM_SHIELD diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp index 9751bf4f27..f1a8e66637 100644 --- a/src/m_Do/m_Do_controller_pad.cpp +++ b/src/m_Do/m_Do_controller_pad.cpp @@ -10,12 +10,13 @@ #include "f_ap/f_ap_game.h" #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_main.h" -#include "tracy/Tracy.hpp" #if TARGET_PC #include "dusk/menu_pointer.h" #include "dusk/settings.h" #include "dusk/ui/touch_controls.hpp" + +#include #endif DUSK_GAME_DATA JUTGamePad* mDoCPd_c::m_gamePad[4]; diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 2d7cc86bbd..a4003d1689 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -24,9 +24,12 @@ #include "m_Do/m_Do_mtx.h" #include #include -#include "dusk/logging.h" + +#if TARGET_PC #include "dusk/frame_interpolation.h" +#include "dusk/logging.h" #include "dusk/version.hpp" +#endif DUSK_GAME_DATA u8 mDoExt::CurrentHeapAdjustVerbose; DUSK_GAME_DATA u8 mDoExt::HeapAdjustVerbose; @@ -310,6 +313,11 @@ static void mDoExt_modelDiff(J3DModel* i_model) { modelMtxErrorCheck(i_model); i_model->calcMaterial(); i_model->diff(); +#if TARGET_PC + if (!dusk::frame_interp::is_sim_frame()) { + return; + } +#endif i_model->entry(); } diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 0d0f9014dc..2c966059e9 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -36,7 +36,6 @@ #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" #include "m_Do/m_Do_main.h" -#include "tracy/Tracy.hpp" #if PLATFORM_WII || PLATFORM_SHIELD #include @@ -47,17 +46,20 @@ #endif #if TARGET_PC -#include -#include "aurora/lib/window.hpp" -#include "d/actor/d_a_horse.h" #include "dusk/dusk.h" -#include "helpers/endian.h" #include "dusk/frame_interpolation.h" #include "dusk/gfx.hpp" -#include "helpers/gx_helper.h" #include "dusk/imgui/ImGuiConsole.hpp" #include "dusk/logging.h" #include "dusk/settings.h" +#include "helpers/endian.h" +#include "helpers/gx_helper.h" + +#include "d/actor/d_a_horse.h" + +#include +#include +#include #endif class mDoGph_HIO_c : public JORReflexible { diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 11b15b0e0b..63aa2d8946 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -5,45 +5,82 @@ */ #include "m_Do/m_Do_main.h" -#include -#include #include "DynamicLink.h" #include "JSystem/JAudio2/JASAudioThread.h" -#include "JSystem/JAudio2/JAUSectionHeap.h" #include "JSystem/JAudio2/JAUSoundTable.h" #include "JSystem/JFramework/JFWSystem.h" -#include "JSystem/JHostIO/JORServer.h" #include "JSystem/JKernel/JKRAram.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/JUtility/JUTConsole.h" +#include "JSystem/JUtility/JUTReport.h" #include "JSystem/JUtility/JUTException.h" #include "JSystem/JUtility/JUTProcBar.h" -#include "JSystem/JUtility/JUTReport.h" -#include "SSystem/SComponent/c_counter.h" -#include "SSystem/SComponent/c_API_graphic.h" +#include "JSystem/JHostIO/JORServer.h" #include "Z2AudioLib/Z2WolfHowlMgr.h" #include "c/c_dylink.h" #include "d/d_com_inf_game.h" -#include "d/d_debug_pad.h" #include "d/d_s_logo.h" #include "d/d_s_menu.h" #include "d/d_s_play.h" -#include "dusk/time.h" +#include "d/d_debug_pad.h" #include "f_ap/f_ap_game.h" #include "f_op/f_op_msg.h" #include "m_Do/m_Do_MemCard.h" #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_dvd_thread.h" -#include "m_Do/m_Do_ext2.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" #include "m_Do/m_Do_printf.h" #include "m_Do/m_Do_ext2.h" -#include "SSystem/SComponent/c_counter.h" #include -#include +#include "dusk/app_info.hpp" +#include "dusk/audio/DuskAudioSystem.h" +#include "dusk/audio/DuskDsp.hpp" +#include "dusk/commands.hpp" +#include "dusk/config.hpp" +#include "dusk/data.hpp" +#include "dusk/discord_presence.hpp" +#include "dusk/dusk.h" +#include "dusk/frame_interpolation.h" +#include "dusk/game_clock.h" +#include "dusk/game_combos.h" +#include "dusk/gyro.h" +#include "dusk/hq_minimap.hpp" +#include "dusk/imgui/ImGuiConsole.hpp" +#include "dusk/imgui/ImGuiEngine.hpp" +#include "dusk/iso_validate.hpp" +#include "dusk/logging.h" +#include "dusk/main.h" +#include "dusk/mod_loader.hpp" +#include "dusk/mods/svc/window.hpp" +#include "dusk/mouse.h" +#include "dusk/os.h" +#include "dusk/presentation.hpp" +#include "dusk/settings.h" +#include "dusk/speedrun.h" +#include "dusk/texture_replacements.hpp" +#include "dusk/time.h" +#include "dusk/ui/command_console.hpp" +#include "dusk/ui/menu_bar.hpp" +#include "dusk/ui/overlay.hpp" +#include "dusk/ui/prelaunch.hpp" +#include "dusk/ui/preset.hpp" +#if BOREALIS_HAS_SENTRY +#include "dusk/ui/reporting.hpp" +#endif +#include "dusk/ui/touch_controls.hpp" +#include "dusk/ui/ui.hpp" +#include "dusk/version.hpp" + +#include "d/actor/d_a_movie_player.h" + +#include "SSystem/SComponent/c_API_graphic.h" + +#include +#include +#include #include #include #include @@ -51,69 +88,19 @@ #include #include #include +#include +#include +#include +#include + #include #include #include -#include "SSystem/SComponent/c_API.h" -#include "dusk/app_info.hpp" -#include "dusk/data.hpp" -#include "dusk/dusk.h" -#include "dusk/frame_interpolation.h" -#include "dusk/game_clock.h" -#include "dusk/gyro.h" -#include "dusk/commands.hpp" -#include "dusk/game_combos.h" -#include "dusk/imgui/ImGuiConsole.hpp" -#include "dusk/imgui/ImGuiEngine.hpp" -#include "dusk/iso_validate.hpp" -#include "dusk/logging.h" -#include "dusk/main.h" -#include "dusk/hq_minimap.hpp" -#include "dusk/mod_loader.hpp" -#include "dusk/mods/svc/window.hpp" -#include "dusk/mouse.h" -#include "dusk/os.h" -#include "dusk/presentation.hpp" -#include "dusk/ui/command_console.hpp" -#include "dusk/ui/menu_bar.hpp" -#include "dusk/ui/overlay.hpp" -#include "dusk/ui/prelaunch.hpp" -#include "dusk/ui/preset.hpp" -#include "dusk/ui/touch_controls.hpp" -#include "dusk/ui/ui.hpp" -#include -#include -#include -#include -#include - -#include "SDL3/SDL_init.h" -#include "SDL3/SDL_iostream.h" -#include "SDL3/SDL_misc.h" -#include "cxxopts.hpp" -#include "d/actor/d_a_movie_player.h" -#include "dusk/audio/DuskAudioSystem.h" -#include "dusk/audio/DuskDsp.hpp" -#include "dusk/config.hpp" -#include "dusk/speedrun.h" -#include "dusk/settings.h" -#include "dusk/texture_replacements.hpp" -#include "dusk/io.hpp" -#include "dusk/version.hpp" -#include "dusk/discord_presence.hpp" -#include "tracy/Tracy.hpp" -#include "f_pc/f_pc_draw.h" -#include "tracy/Tracy.hpp" -#include #ifdef __APPLE__ #include #endif -#if BOREALIS_HAS_SENTRY -#include "dusk/ui/reporting.hpp" -#endif - // --- GLOBALS --- DUSK_GAME_DATA s8 mDoMain::developmentMode = -1; DUSK_GAME_DATA OSTime mDoMain::sPowerOnTime;