xParMgr: enable match

bfbbdecomp · Oct 9, 2024 · 408acfb · 408acfb
1 parent fb4dd6e
commit 408acfb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/configure.py b/configure.py
@@ -317,7 +317,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(NonMatching, "SB/Core/x/xPar.cpp"),
             Object(NonMatching, "SB/Core/x/xParCmd.cpp"),
             Object(NonMatching, "SB/Core/x/xParGroup.cpp"),
-            Object(NonMatching, "SB/Core/x/xParMgr.cpp"),
+            Object(Matching, "SB/Core/x/xParMgr.cpp"),
             Object(NonMatching, "SB/Core/x/xPartition.cpp"),
             Object(NonMatching, "SB/Core/x/xpkrsvc.cpp"),
             Object(NonMatching, "SB/Core/x/xQuickCull.cpp"),

diff --git a/src/SB/Core/x/xParMgr.cpp b/src/SB/Core/x/xParMgr.cpp
@@ -5,8 +5,8 @@
 
 #include <types.h>
 
-U32 sFrameCount;
-S32 sParMgrInit;
+volatile static U32 sFrameCount;
+static S32 sParMgrInit;
 
 void xParMgrInit()
 {
@@ -27,22 +27,21 @@ void xParMgrKillAllParticles()
 {
 }
 
-#if 0
-// If statement and statement above are wrong.
 void xParMgrUpdate(F32 elapsedTime)
 {
     iParMgrUpdate(elapsedTime);
-    sFrameCount = (S32)sFrameCount;
-    if (++sFrameCount > 10)
+
+    sFrameCount++;
+
+    if (sFrameCount > 10)
     {
         sFrameCount = 1;
     }
-    while (sFrameCount >= 1)
-    {
-        sFrameCount--;
-    }
+
+    U32 i;
+    for (i = sFrameCount; i >= 1; i--);
+    sFrameCount = i;
 }
-#endif
 
 void xParMgrRender()
 {