Work on JAS inlines, fix limits/climits headers

13 files changed, 21 insertions, 22 deletions

diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index 53a4f570..fee0ccb9 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -300,7 +300,7 @@ void daArrow_c::arrowShooting() {
     
     clrAtHitNormal();
     setAtHitPosBuff(&end);
-    mNearestHitDist = FLOAT_MAX;
+    mNearestHitDist = FLT_MAX;
 }
 
 /* 800D4D98-800D4DC0       .text arrowUseMp__9daArrow_cFv */
diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp
index 30e4625c..fae82799 100644
--- a/src/d/actor/d_a_npc_nz.cpp
+++ b/src/d/actor/d_a_npc_nz.cpp
@@ -825,7 +825,7 @@ bool daNpc_Nz_c::_execute() {
     TailControl();
     mAcch.CrrPos(*dComIfG_Bgsp());
     mpBait = NULL;
-    field_0x910 = FLOAT_MAX;
+    field_0x910 = FLT_MAX;
     setMtx();
 
     return false;
diff --git a/src/d/actor/d_a_npc_nz_cut.inc b/src/d/actor/d_a_npc_nz_cut.inc
index 22acae4d..01809366 100644
--- a/src/d/actor/d_a_npc_nz_cut.inc
+++ b/src/d/actor/d_a_npc_nz_cut.inc
@@ -197,7 +197,7 @@ void daNpc_Nz_c::cutEatesaProc() {
     if(pBait) {
         fopAcM_delete(pBait);
         mpBait = NULL;
-        field_0x910 = FLOAT_MAX;
+        field_0x910 = FLT_MAX;
     }
     else {
         if(mpMorf->checkFrame(mpMorf->getEndFrame() - 1.0f)) {
diff --git a/src/d/actor/d_a_obj_YLzou.cpp b/src/d/actor/d_a_obj_YLzou.cpp
index ca8eacb6..8b0c66d6 100644
--- a/src/d/actor/d_a_obj_YLzou.cpp
+++ b/src/d/actor/d_a_obj_YLzou.cpp
@@ -6,7 +6,6 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 #include "d/actor/d_a_obj_YLzou.h"
 #include "res/Object/YLzou.h"
-#include "limits.h"
 
 enum YLzouAction {
     /* 0x00 */ ACTION_MOVE_YLZOU_DEMO_START_WAIT = 0x00,
diff --git a/src/d/actor/d_a_obj_barrel2.cpp b/src/d/actor/d_a_obj_barrel2.cpp
index dfc40465..e483e9f2 100644
--- a/src/d/actor/d_a_obj_barrel2.cpp
+++ b/src/d/actor/d_a_obj_barrel2.cpp
@@ -279,7 +279,7 @@ cPhs_State daObjBarrel2::Act_c::_create() {
                 &sp24,
                 prm_get_coming() ? 1 : 0
             );
-            m45C = FLOAT_MAX;
+            m45C = FLT_MAX;
             m468 = 0;
             m470 = 0;
             m460 = fpcM_ERROR_PROCESS_ID_e;
@@ -763,7 +763,7 @@ void daObjBarrel2::Act_c::set_item_position() {
         raceItem->startOffsetPos();
         m45C = fopAcM_searchPlayerDistance2(raceItem);
     } else {
-        m45C = FLOAT_MAX;
+        m45C = FLT_MAX;
     }
 }
 
@@ -777,7 +777,7 @@ void daObjBarrel2::Act_c::item_drop_init(float arg1) {
         raceItem->endOffsetPos(-7.0f, &sp08, arg1, 0.0f, (csXyz*)&csXyz::Zero);
         m45C = fopAcM_searchPlayerDistance2(raceItem);
     } else {
-        m45C = FLOAT_MAX;
+        m45C = FLT_MAX;
     }
 }
 
@@ -786,7 +786,7 @@ void daObjBarrel2::Act_c::item_drop() {
     if (M_tmp_item_actor != NULL) {
         m45C = fopAcM_searchPlayerDistance2(M_tmp_item_actor);
     } else {
-        m45C = FLOAT_MAX;
+        m45C = FLT_MAX;
     }
 }
 
diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp
index 83fb6478..84bb6128 100644
--- a/src/d/actor/d_a_obj_movebox.cpp
+++ b/src/d/actor/d_a_obj_movebox.cpp
@@ -105,7 +105,7 @@ Bgc_c::Bgc_c() {
     }
     mMaxGroundIdx = -1;
     mWallIdx = -1;
-    mNearestWallDist = FLOAT_MAX;
+    mNearestWallDist = FLT_MAX;
     mWaterY = 0.0f;
     mStateFlags = (State_e)0;
 }
@@ -163,7 +163,7 @@ void Bgc_c::wall_pos(const Act_c* movebox, const BgcSrc_c* bgcSrc, int bgcSrcCou
     
     const s16 angle = movebox->home.angle.y + param_4;
     mWallIdx = -1;
-    mNearestWallDist = FLOAT_MAX;
+    mNearestWallDist = FLT_MAX;
     mDoMtx_stack_c::YrotS(angle);
     mDoMtx_stack_c::XrotM(0x4000);
     mDoMtx_stack_c::multVec(&cXyz::BaseY, &temp_20);
diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp
index f76e4ca0..351f8d28 100644
--- a/src/d/actor/d_a_ship.cpp
+++ b/src/d/actor/d_a_ship.cpp
@@ -999,7 +999,7 @@ BOOL daShip_c::checkOutRange() {
             } 
         }
 
-        f32 minDist = FLOAT_MAX;
+        f32 minDist = FLT_MAX;
         
         for (int i = 0; i < path->m_num; pnt++, i++) {
             f32 dx = current.pos.x - pnt->m_position.x;
diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp
index 9c6db668..ee791104 100644
--- a/src/d/actor/d_a_ykgr.cpp
+++ b/src/d/actor/d_a_ykgr.cpp
@@ -92,7 +92,7 @@ f32 daYkgr_c::getPosRate() {
         return 0.0f;
     }
 
-    f32 fVar4 = FLOAT_MAX;
+    f32 fVar4 = FLT_MAX;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz sp30 = player->current.pos;
     dPnt* pdVar7 = m_path->m_points;
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp
index aa96d1bc..8a53d0a2 100644
--- a/src/d/d_attention.cpp
+++ b/src/d/d_attention.cpp
@@ -437,14 +437,14 @@ void dAttention_c::initList(u32 flagMask) {
 
     for (i = 0; i < (s32)ARRAY_SIZE(mLockOnList); i++) {
         mLockOnList[i].setActor(NULL);
-        mLockOnList[i].mWeight = FLOAT_MAX;
+        mLockOnList[i].mWeight = FLT_MAX;
     }
     mLockOnOffset = 0;
     mLockonCount = 0;
 
     for (i = 0; i < (s32)ARRAY_SIZE(mActionList); i++) {
         mActionList[i].setActor(NULL);
-        mActionList[i].mWeight = FLOAT_MAX;
+        mActionList[i].mWeight = FLT_MAX;
     }
     mActionOffset = 0;
     mActionCount = 0;
diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp
index 2d1a33a4..7898798e 100644
--- a/src/d/d_demo.cpp
+++ b/src/d/d_demo.cpp
@@ -17,8 +17,8 @@ dDemo_actor_c::dDemo_actor_c() {
     mScale.setall(1.0f);
     mRotate.setall(0);
     mModel = NULL;
-    mAnmFrameMax = FLOAT_MAX;
-    mTexAnimationFrameMax = FLOAT_MAX;
+    mAnmFrameMax = FLT_MAX;
+    mTexAnimationFrameMax = FLT_MAX;
 }
 
 /* 80069330-800693C0       .text __dt__13dDemo_actor_cFv */
@@ -238,7 +238,7 @@ void dDemo_actor_c::JSGSetShape(u32 id) {
 /* 80069CA4-80069CC0       .text JSGSetAnimation__13dDemo_actor_cFUl */
 void dDemo_actor_c::JSGSetAnimation(u32 no) {
     mAnmId = no;
-    mAnmFrameMax = FLOAT_MAX;
+    mAnmFrameMax = FLT_MAX;
     onEnable(ENABLE_ANM_e);
 }
 
diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp
index 843bf5fe..02507a3e 100644
--- a/src/d/d_envse.cpp
+++ b/src/d/d_envse.cpp
@@ -25,7 +25,7 @@ void dEnvSe_getNearPathPos(cXyz* r30, cXyz* r31, dPath* r26) {
     BOOL spc[2] = {FALSE, FALSE};
     cXyz sp30[2];
     f32 sp8;
-    f32 f31 = FLOAT_MAX;
+    f32 f31 = FLT_MAX;
     dPnt* point = r26->m_points;
     cM3dGLin lin;
     
@@ -94,7 +94,7 @@ BOOL dEnvSe_c::execute() {
             }
             mDoAud_seaEnvSePlay(sound_data->field_0x14);
         } else if (sound_data->field_0x17 == 1) {
-            f32 f31 = FLOAT_MAX;
+            f32 f31 = FLT_MAX;
             int r27;
             mPos = sp2c;
             path = dPath_GetRoomPath(sound_data->field_0x18, roomNo);
@@ -131,7 +131,7 @@ BOOL dEnvSe_c::execute() {
             }
             mDoAud_riverSePlay(sound_data->field_0x14, dComIfGp_getReverb(roomNo));
         } else if (sound_data->field_0x17 == 3) {
-            f32 f31 = FLOAT_MAX;
+            f32 f31 = FLT_MAX;
             mPos = sp2c;
             path = dPath_GetRoomPath(sound_data->field_0x18, roomNo);
             while (path != NULL) {
diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp
index e5b6a46d..6a4c7f43 100644
--- a/src/d/d_map.cpp
+++ b/src/d/d_map.cpp
@@ -361,7 +361,7 @@ u8 dMap_GetFloorNoForDmap(dStage_dt_c* stag, int param_2, f32 param_3) {
         }
 
         if (!var3) {
-            f32 var1 = FLOAT_MAX;
+            f32 var1 = FLT_MAX;
             floorData = floor->m_entries;
 
             for (int i = 0; i < floor->num; i++, floorData++) {
diff --git a/src/d/d_vibration.cpp b/src/d/d_vibration.cpp
index 1a743b6f..4ecdfdc0 100644
--- a/src/d/d_vibration.cpp
+++ b/src/d/d_vibration.cpp
@@ -151,7 +151,7 @@ int dVibration_c::Run() {
             loopLen = mMotor.mQuake.mLength;
             pattern = rollshift(mMotor.mQuake.mPattern, loopLen, mFrameIdx);
             pattern |= randombit(mMotor.mQuake.mRounds, loopLen);
-            mMotor.mQuake.mStopFrame = INT32_MAX;
+            mMotor.mQuake.mStopFrame = INT_MAX;
             pBuf = makedata(data, pattern, loopLen);
             g_mDoCPd_gamePad[0]->startMotorWave(pBuf, JUTGamePad::CRumble::LOOP_FOREVER, 60);
             break;