Merge pull request #325 from robojumper/reimport-msl-c

Re-import MSL_C from TP

7 files changed, 8 insertions, 8 deletions

diff --git a/src/d/col/c/c_m3d.cpp b/src/d/col/c/c_m3d.cpp
index f69a11a7..4ac33b5a 100644
--- a/src/d/col/c/c_m3d.cpp
+++ b/src/d/col/c/c_m3d.cpp
@@ -11,7 +11,6 @@
 #include "d/col/c/c_m3d_g_unk.h"
 #include "egg/math/eggMath.h"
 #include "m/m_vec.h"
-#include "math.h"
 #include "nw4r/math/math_types.h"
 #include "rvl/MTX.h" // IWYU pragma: export
 #include "rvl/MTX/vec.h"
diff --git a/src/d/d_light_env.cpp b/src/d/d_light_env.cpp
index ac52b039..025d934f 100644
--- a/src/d/d_light_env.cpp
+++ b/src/d/d_light_env.cpp
@@ -46,9 +46,9 @@ void dLightEnv_c::sphere_to_cartesian(f32 angY, f32 angXZ, mVec3_c *pOut) {
     f32 radXZ = angXZ / (180.f / M_PI);
 
     mVec3_c pos;
-    pos.x = std::cosf(radY) * std::sinf(radXZ);
-    pos.y = std::sinf(radY);
-    pos.z = std::cosf(radY) * std::cosf(radXZ);
+    pos.x = std::cos(radY) * std::sin(radXZ);
+    pos.y = std::sin(radY);
+    pos.z = std::cos(radY) * std::cos(radXZ);
 
     pOut->x = pos.x;
     pOut->y = pos.y;
diff --git a/src/d/d_message.cpp b/src/d/d_message.cpp
index 5a1e703e..d4b97316 100644
--- a/src/d/d_message.cpp
+++ b/src/d/d_message.cpp
@@ -48,6 +48,7 @@
 
 #include <cstring>
 #include <stdio.h>
+#include <stdlib.h>
 
 s32 dFlow_c::sExitId = -1;
 
diff --git a/src/d/d_pad.cpp b/src/d/d_pad.cpp
index c49a6f0d..58f2113d 100644
--- a/src/d/d_pad.cpp
+++ b/src/d/d_pad.cpp
@@ -850,7 +850,7 @@ void ex_c::acc_c::fn_800576D0(s32 chan) {
                 f32 f = acc.dot(dir);
                 if (!cM3d_IsZero(cross.squaredLength())) {
                     cross.normalize();
-                    f32 acos = std::acosf(f);
+                    f32 acos = std::acos(f);
                     MTXRotAxisRad(field_0x1098, cross, acos);
                     // TODO - bad part end
                 } else {
diff --git a/src/d/lyt/d_lyt_deposit.cpp b/src/d/lyt/d_lyt_deposit.cpp
index 37fbd33b..87996ddc 100644
--- a/src/d/lyt/d_lyt_deposit.cpp
+++ b/src/d/lyt/d_lyt_deposit.cpp
@@ -37,7 +37,7 @@
 #include "toBeSorted/arc_managers/layout_arc_manager.h"
 #include "toBeSorted/file_manager.h"
 
-#include <cwchar>
+#include <cstddef>
 
 struct DepositSellValues {
     /* 0x00 */ u8 itemId;
diff --git a/src/d/lyt/d_lyt_pause_disp_00.cpp b/src/d/lyt/d_lyt_pause_disp_00.cpp
index 97f09055..bf72820a 100644
--- a/src/d/lyt/d_lyt_pause_disp_00.cpp
+++ b/src/d/lyt/d_lyt_pause_disp_00.cpp
@@ -27,7 +27,7 @@
 #include "sized_string.h"
 #include "toBeSorted/counters/counter.h"
 
-#include <limits.h>
+#include <climits>
 
 STATE_DEFINE(dLytPauseDisp00_c, None);
 STATE_DEFINE(dLytPauseDisp00_c, In);
diff --git a/src/d/lyt/d_lyt_shop.cpp b/src/d/lyt/d_lyt_shop.cpp
index 01afc3ee..66fd2d67 100644
--- a/src/d/lyt/d_lyt_shop.cpp
+++ b/src/d/lyt/d_lyt_shop.cpp
@@ -32,7 +32,7 @@
 #include "toBeSorted/arc_managers/layout_arc_manager.h"
 #include "toBeSorted/counters/counter.h"
 
-#include <cwchar>
+#include <cstddef>
 
 struct ShopUpgradeItemData {
     /* 0x0 */ s32 itemId;