Remove xsqrt declaration from xBound.h

src/SB/Core/x/xBound.h

@@ -37,7 +37,6 @@ void xBoundHitsBound(const xBound* a, const xBound* b, xCollis* c);
 void xRayHitsBound(const xRay3* r, const xBound* b, xCollis* c);
 void xSphereHitsBound(const xSphere* o, const xBound* b, xCollis* c);
 void xVecHitsBound(const xVec3* v, const xBound* b, xCollis* c);
-F32 xsqrt(F32 x);
 
 inline xVec3* xBoundCenter(xBound* bound)
 {

src/SB/Core/x/xCamera.h

@@ -67,7 +67,6 @@ extern xMat4x3 sCameraFXMatOld;
 extern cameraFX sCameraFX[10];
 extern cameraFXTableEntry sCameraFXTable[3];
 
-
 struct xScene;
 
 enum _tagTransType

src/SB/Core/x/xEntDrive.cpp

@@ -1,6 +1,7 @@
 #include "xEntDrive.h"
 
 #include "xMath.h"
+#include "xMathInlines.h"
 
 #include <types.h>
 

src/SB/Core/x/xVolume.cpp

@@ -1,9 +1,7 @@
-#include <types.h>
-
-#include "xBound.h"
-#include "xLinkAsset.h"
 #include "xVolume.h"
 
+#include <types.h>
+
 void xVolume::Init(xVolumeAsset* asset)
 {
     xBaseInit(this, asset);

src/SB/Game/zDiscoFloor.cpp

@@ -10,6 +10,7 @@
 #include "xString.h"
 #include "xDebug.h"
 #include "xMath.h"
+#include "xMathInlines.h"
 
 #include "iModel.h"
 #include "iMath.h"

src/SB/Game/zEntPickup.cpp

@@ -10,6 +10,7 @@
 #include "zUI.h"
 
 #include "xMath.h"
+#include "xMathInlines.h"
 #include "xFX.h"
 #include "xstransvc.h"
 #include "iAnim.h"

src/SB/Game/zEntPlayerBungeeState.cpp

@@ -1,7 +1,6 @@
 #include "zEntPlayerBungeeState.h"
 
 #include "iScrFX.h"
-#include "xBound.h"
 #include "xCamera.h"
 #include "xDebug.h"
 #include "xFX.h"

src/SB/Game/zLOD.cpp

@@ -1,8 +1,10 @@
 #include "zLOD.h"
 
 #include <types.h>
-#include <../Core/x/xEnt.h>
-#include <../Core/x/xBound.h>
+
+#include "xEnt.h"
+#include "xMathInlines.h"
+
 #include "zBase.h"
 #include "zEntDestructObj.h"
 

src/SB/Game/zLasso.cpp

@@ -1,5 +1,7 @@
 #include "zLasso.h"
 
+#include "xMathInlines.h"
+
 #include "iModel.h"
 
 #include <types.h>
@@ -30,8 +32,10 @@ void zLasso_SetGuide(xEnt* ent, xAnimState* lassoAnim)
     var_r5 = sGuideList;
     u32 guideListIdx = 0;
 
-    for (u32 i = sNumGuideLists; i > 0; i--) {
-        if (var_r5->target == ent) {
+    for (u32 i = sNumGuideLists; i > 0; i--)
+    {
+        if (var_r5->target == ent)
+        {
             break;
         }
 
@@ -83,25 +87,28 @@ void zLasso_InterpToGuide(zLasso* lasso)
         xVec3Init(&lasso->tgCenter, 0.0f, 0.0f, 0.0f);
 
         S32 vertMapIdx = 0;
-        for (S32 i = 0; i < currentGuideNumTris; i++) {
-            xVec3AddTo(&lasso->tgCenter, (xVec3*) morphTargetVector + sCurrentGuide->vertMap[vertMapIdx]);
+        for (S32 i = 0; i < currentGuideNumTris; i++)
+        {
+            xVec3AddTo(&lasso->tgCenter,
+                       (xVec3*)morphTargetVector + sCurrentGuide->vertMap[vertMapIdx]);
             vertMapIdx += 1;
         }
 
-        xVec3SMul(&lasso->tgCenter, &lasso->tgCenter, 1.0f / (f32) currentGuideNumTris);
-        xVec3Sub(&sp14, (xVec3*) morphTargetVector + sCurrentGuide->vertMap[0], &lasso->tgCenter);
-        xVec3Sub(&sp8, (xVec3*) morphTargetVector + sCurrentGuide->vertMap[1], &lasso->tgCenter);
+        xVec3SMul(&lasso->tgCenter, &lasso->tgCenter, 1.0f / (f32)currentGuideNumTris);
+        xVec3Sub(&sp14, (xVec3*)morphTargetVector + sCurrentGuide->vertMap[0], &lasso->tgCenter);
+        xVec3Sub(&sp8, (xVec3*)morphTargetVector + sCurrentGuide->vertMap[1], &lasso->tgCenter);
 
         lasso->tgRadius = xVec3Normalize(&sp14, &sp14);
-        
+
         xVec3Cross(&lasso->tgNormal, &sp14, &sp8);
         xVec3Normalize(&lasso->tgNormal, &lasso->tgNormal);
 
-        if (lasso->tgNormal.y < 0.0f) {
+        if (lasso->tgNormal.y < 0.0f)
+        {
             xVec3Inv(&lasso->tgNormal, &lasso->tgNormal);
         }
 
-        xMat4x3Toworld(&lasso->tgCenter, (xMat4x3*) sCurrentGuide->poly->Mat, &lasso->tgCenter);
+        xMat4x3Toworld(&lasso->tgCenter, (xMat4x3*)sCurrentGuide->poly->Mat, &lasso->tgCenter);
     }
 }
 

src/SB/Game/zNPCSupport.cpp

@@ -15,7 +15,6 @@
 #include "xMathInlines.h"
 #include "xMath3.h"
 #include "xUtil.h"
-#include "xBound.h"
 #include "xQuickCull.h"
 #include "xCollide.h"
 

src/SB/Game/zNPCTypeAmbient.cpp

@@ -1,7 +1,6 @@
 #include <types.h>
 
 #include "xVec3.h"
-#include "xBound.h"
 #include "xMath3.h"
 
 #include "zGlobals.h"

src/SB/Game/zNPCTypeCommon.cpp

@@ -17,7 +17,6 @@
 
 #include "xString.h"
 #include "xDebug.h"
-#include "xBound.h"
 
 // Finish porting code from bfbbpc repo
 

src/SB/Game/zParCmd.cpp

@@ -6,6 +6,7 @@
 
 #include "xParCmd.h"
 #include "xMath.h"
+#include "xMathInlines.h"
 #include "xString.h"
 
 #include "zGlobals.h"