Add stdint.h to types.h

include/dolphin/types.h

@@ -85,6 +85,7 @@ typedef unsigned int uint;
 #endif
 
 #include "stddef.h" // IWYU pragma: export
+#include "stdint.h" // IWYU pragma: export
 
 #define INT32_MAX (0x7fffffff)
 #define UINT32_MAX (0xffffffff)

include/f_op/f_op_kankyo_mng.h

@@ -17,7 +17,7 @@ typedef int (*fopKyM_CreateFunc)(void*);
 void fopKyM_Delete(void* param_1);
 fpc_ProcID fopKyM_Create(s16 param_1, fopKyM_CreateFunc param_2 = NULL, void* param_3 = NULL);
 fpc_ProcID fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos = NULL, cXyz* i_scale = NULL,
-                  fopKyM_CreateFunc i_createFunc = NULL);
+                         fopKyM_CreateFunc i_createFunc = NULL);
 kankyo_class* fopKyM_SearchByID(fpc_ProcID id);
 base_process_class* fopKyM_fastCreate(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3,
                                       fopKyM_CreateFunc);

src/JSystem/J3DGraphAnimator/J3DCluster.cpp

@@ -13,7 +13,6 @@
 #include "JSystem/J3DAssert.h"
 #include "dolphin/os/OS.h"
 #include "string.h"
-#include "stdint.h"
 
 /* 802F37C4-802F37E4       .text clear__13J3DDeformDataFv */
 void J3DDeformData::clear() {

src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h

@@ -7,12 +7,12 @@
 
 #ifdef __cplusplus
     using std::uint8_t;
-	using std::uint16_t;
-	using std::uint32_t;
+    using std::uint16_t;
+    using std::uint32_t;
 
     using std::int8_t;
-	using std::int16_t;
-	using std::int32_t;
+    using std::int16_t;
+    using std::int32_t;
 
     using std::uint64_t;
     using std::int64_t;

src/d/actor/d_a_ship.cpp

@@ -22,7 +22,6 @@
 #include "d/actor/d_a_bomb.h"
 #include "d/actor/d_a_grid.h"
 #include "res/Object/Ship.h"
-#include "cstdint.h"
 
 static char l_arcName[] = "Ship";
 static Vec l_cannon_top = {85.0f, 0.0f, 10.0f};
@@ -4715,7 +4714,8 @@ cPhs_State daShip_c::create() {
         fopAcM_SetMin(this, -325.0f, -50.0f, -325.0f);
         fopAcM_SetMax(this, 325.0f, 570.0f, 240.0f);
         
-        fopKyM_create(fpcNm_WIND_ARROW_e, (std::intptr_t)this, 0, 0, 0);
+        // The this pointer is passed as the param for some reason, but it doesn't actually seem to be used?
+        fopKyM_create(fpcNm_WIND_ARROW_e, (intptr_t)this, 0, 0, 0);
 
         offStateFlg(daSFLG_UNK2_e);
         mAcch.CrrPos(*dComIfG_Bgsp());

src/d/actor/d_a_tornado.cpp

@@ -11,8 +11,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_ship.h"
 #include "d/d_kankyo_wether.h"
-#include "d/actor/d_a_player.h"
-#include "cstdint.h"
 
 static char l_arcName[] = "Trnd";
 
@@ -329,7 +327,7 @@ cPhs_State daTornado_c::create() {
         for (u16 i = 1; i < modelData->getJointNum(); i++) {
             modelData->getJointNodePointer(i)->setCallBack(daTornado_jointCallBack);
         }
-        mpModel->setUserArea((std::uintptr_t)this);
+        mpModel->setUserArea((uintptr_t)this);
     }
     return rt;
 }

src/d/d_wpillar.cpp

@@ -2,7 +2,6 @@
 #include "d/d_wpillar.h"
 #include "f_op/f_op_kankyo.h"
 #include "d/actor/d_a_player_main.h"
-#include "cstdint.h"
 
 /* 8023E968-8023E9E4       .text jointCallBack__10dWpillar_cFi */
 int dWpillar_c::jointCallBack(int i_jointNo) {
@@ -175,7 +174,7 @@ cPhs_State dWpillar_c::create() {
             modelData->getJointNodePointer(i)->setCallBack(dWpillar_jointCallBack);
         }
 
-        mpModel->setUserArea((std::uintptr_t)this);
+        mpModel->setUserArea((uintptr_t)this);
         dComIfGp_particle_setShipTail(dPa_name::ID_IT_JN_WP_HAMON01, &mPos, NULL, &mScale, 0xFF, &dPa_control_c::mSingleRippleEcallBack);
         dComIfGp_particle_setShipTail(dPa_name::ID_IT_JN_WP_HAMON02, &mPos, NULL, &mScale, 0xFF, &dPa_control_c::mSingleRippleEcallBack);
         dComIfGp_particle_setShipTail(dPa_name::ID_IT_JN_WP_HAMON03, &mPos, NULL, &mScale, 0xFF, &dPa_control_c::mSingleRippleEcallBack);