Add stdint.h to types.h

5 files changed, 8 insertions, 12 deletions

diff --git a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp b/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
index 6b519718..8c59ca97 100644
--- a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
+++ b/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() {
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h
index e6ed832a..e352a298 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h
+++ b/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;
diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp
index 1ca44606..f3384bb1 100644
--- a/src/d/actor/d_a_ship.cpp
+++ b/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());
diff --git a/src/d/actor/d_a_tornado.cpp b/src/d/actor/d_a_tornado.cpp
index 88e501ea..328e5779 100644
--- a/src/d/actor/d_a_tornado.cpp
+++ b/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;
 }
diff --git a/src/d/d_wpillar.cpp b/src/d/d_wpillar.cpp
index d5a9b024..9306f8ad 100644
--- a/src/d/d_wpillar.cpp
+++ b/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);