Tidy includes, drop PC STATIC_ASSERTs, and more macro usage

2026-09-07 02:10:14 -04:00 · 2026-09-04 20:48:36 -04:00
parent 2170967b6b
commit bb09df7948
179 changed files with 838 additions and 799 deletions
@@ -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 {};

@@ -2,7 +2,6 @@
 #define C_M3D_G_TRI_H_

 #include "SSystem/SComponent/c_m3d_g_pla.h"
-#include "helpers/endian.h"

 class cM3dGCyl;

@@ -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 */
@@ -36,5 +36,4 @@ public:

 STATIC_ASSERT(sizeof(obj_gb_class) == 0x6bc);

-
 #endif /* D_A_OBJ_GB_H */
@@ -17,7 +17,6 @@ public:

 STATIC_ASSERT(sizeof(kita_s) == 0x60);

-
 /**
 * @ingroup actors-objects
 * @class obj_kita_class
@@ -53,5 +53,4 @@ public:

 STATIC_ASSERT(sizeof(daObjSM_DOOR_c) == 0x858);

-
 #endif /* D_A_OBJ_SM_DOOR_H */
@@ -6,9 +6,12 @@
 #include "d/d_bg_w_base.h"
 #include <mtx.h>
 #include <types.h>
-#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;
@@ -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;
@@ -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;
@@ -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;

@@ -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 */
@@ -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
@@ -2,7 +2,10 @@
 #define D_MSG_D_MSG_FLOW_H

 #include <types.h>
+
+#if TARGET_PC
 #include "helpers/endian.h"
+#endif

 enum {
    NODETYPE_MESSAGE_e = 1,
@@ -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;
@@ -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,
@@ -2,7 +2,10 @@
 #define D_D_TRESURE_H

 #include <mtx.h>
+
+#if TARGET_PC
 #include "helpers/offset_ptr.h"
+#endif

 class dTres_c {
 public:
@@ -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))

@@ -2,13 +2,10 @@
 #define M_DO_M_DO_LIB_H

 #include "JSystem/J3DU/J3DUClipper.h"
-#include <dolphin/gx/GXStruct.h>

 #if TARGET_PC
-#include "JSystem/JGeometry.h"
-#endif
-
 #include "helpers/gx_helper.h"
+#endif

 typedef struct Vec Vec;
 struct ResTIMG;
@@ -5,9 +5,12 @@
 #include "SSystem/SComponent/c_xyz.h"
 #include <mtx.h>

-#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;

@@ -2,7 +2,6 @@
 #define M_DO_M_DO_PRINTF_H

 #include <os.h>
-#include "helpers/endian.h"

 void my_PutString(const char*);
 void mDoPrintf_vprintf_Interrupt(char const*, va_list);