Completed and Linked xUpdateCull, and xPtankPool (#677)

* Completed and Linked xUpdateCull, and xPtankPool

* Review Fixes

Author: LivewireCB

configure.py

@@ -602,7 +602,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "SB/Game/zNPCGoalVillager.cpp", extra_cflags=["-sym on"]),
             Object(Matching, "SB/Game/zNPCGoalSubBoss.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Core/x/xShadowSimple.cpp"),
-            Object(NonMatching, "SB/Core/x/xUpdateCull.cpp"),
+            Object(Matching, "SB/Core/x/xUpdateCull.cpp"),
             Object(NonMatching, "SB/Game/zDiscoFloor.cpp"),
             Object(NonMatching, "SB/Game/zNPCTypeBossSandy.cpp"),
             Object(NonMatching, "SB/Game/zNPCTypeKingJelly.cpp"),
@@ -621,7 +621,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "SB/Core/x/xDecal.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Core/x/xLaserBolt.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Game/zCameraTweak.cpp"),
-            Object(NonMatching, "SB/Core/x/xPtankPool.cpp"),
+            Object(Matching, "SB/Core/x/xPtankPool.cpp"),
             Object(Equivalent, "SB/Core/gc/iTRC.cpp"),
             Object(NonMatching, "SB/Game/zNPCSupplement.cpp"),
             Object(NonMatching, "SB/Game/zNPCGlyph.cpp", extra_cflags=["-sym on"]),

include/rwsdk/rwplcore.h

@@ -485,6 +485,7 @@ struct RwStringFunctions
 };
 
 #define RwMalloc(_s) ((RWSRCGLOBAL(memoryFuncs).rwmalloc)((_s)))
+#define RwMallocL(_s, _h, _l) ((RWSRCGLOBAL(memoryFuncs).rwmalloc)((_s), (_h)))
 #define RwFree(_p) ((RWSRCGLOBAL(memoryFuncs).rwfree)((_p)))
 #define RwCalloc(_n, _s) ((RWSRCGLOBAL(memoryFuncs).rwcalloc)((_n), (_s)))
 #define RwRealloc(_p, _s) ((RWSRCGLOBAL(memoryFuncs).rwrealloc)((_p), (_s)))
@@ -796,22 +797,22 @@ struct rwGameCube2DVertex
     RwReal u;
     RwReal v;
 
-	rwGameCube2DVertex& operator=(const rwGameCube2DVertex& rhs)
-	{
-		this->x = rhs.x;
-		this->y = rhs.y;
-		this->z = rhs.z;
+    rwGameCube2DVertex& operator=(const rwGameCube2DVertex& rhs)
+    {
+        this->x = rhs.x;
+        this->y = rhs.y;
+        this->z = rhs.z;
 
-		this->emissiveColor.red = rhs.emissiveColor.red;
-		this->emissiveColor.green = rhs.emissiveColor.green;
-		this->emissiveColor.blue = rhs.emissiveColor.blue;
-		this->emissiveColor.alpha = rhs.emissiveColor.alpha;
+        this->emissiveColor.red = rhs.emissiveColor.red;
+        this->emissiveColor.green = rhs.emissiveColor.green;
+        this->emissiveColor.blue = rhs.emissiveColor.blue;
+        this->emissiveColor.alpha = rhs.emissiveColor.alpha;
 
-		this->u = rhs.u;
-		this->v = rhs.v;
+        this->u = rhs.u;
+        this->v = rhs.v;
 
-		return *this;
-	}
+        return *this;
+    }
 };
 
 typedef rwGameCube2DVertex RwIm2DVertex;

src/SB/Core/x/xPtankPool.cpp

@@ -152,22 +152,14 @@ namespace
         }
 
         const F32 f1 = 1.0f;
-        frame->modelling.at.z = f1;
-        frame->modelling.up.y = f1;
-        frame->modelling.right.x = f1;
+        frame->modelling.right.x = frame->modelling.up.y = frame->modelling.at.z = f1;
 
         const F32 f0 = 0.0f;
-        frame->modelling.up.x = f0;
-        frame->modelling.right.z = f0;
-        frame->modelling.right.y = f0;
+        frame->modelling.right.y = frame->modelling.right.z = frame->modelling.up.x = f0;
 
-        frame->modelling.at.y = f0;
-        frame->modelling.at.x = f0;
-        frame->modelling.up.z = f0;
+        frame->modelling.up.z = frame->modelling.at.x = frame->modelling.at.y = f0;
 
-        frame->modelling.pos.z = f0;
-        frame->modelling.pos.y = f0;
-        frame->modelling.pos.x = f0;
+        frame->modelling.pos.x = frame->modelling.pos.y = frame->modelling.pos.z = f0;
 
         frame->modelling.flags = frame->modelling.flags | rpPTANKDFLAGCNS2DROTATE |
                                  rpPTANKDFLAGCOLOR | rpPTANKDFLAGPOSITION;
@@ -243,7 +235,29 @@ namespace
         return 0;
     }
 
-    U32 create_ptanks(group_data& group, unsigned long count)
+    U32 create_ptanks(group_data& group, u32 count);
+} // namespace
+
+void xPTankPoolSceneEnter()
+{
+    inited = 1;
+    init_groups();
+
+    group_data* it = groups;
+    group_data* end = groups + MAX_PGT;
+    while (it != end)
+    {
+        F64 f = it->max_size - 0.f;
+        F32 scaled = F32(f) * 0.25f + 0.5f;
+        create_ptanks(*it, (U32)scaled);
+
+        it++;
+    }
+}
+
+namespace
+{
+    U32 create_ptanks(group_data& group, u32 count)
     {
         U32 initial_size = group.size;
         if (initial_size + count > group.max_size)
@@ -275,23 +289,6 @@ namespace
 
 } // namespace
 
-void xPTankPoolSceneEnter()
-{
-    inited = 1;
-    init_groups();
-
-    group_data* it = groups;
-    group_data* end = groups + MAX_PGT;
-    while (it != end)
-    {
-        double f = it->max_size - 0.f;
-        float scaled = float(f) * 0.25f + 0.5f;
-        create_ptanks(*it, (unsigned long)scaled);
-
-        it++;
-    }
-}
-
 void xPTankPoolSceneExit()
 {
     inited = 0;