Merge pull request #702 from JoshSanch/OOBState

zEntPlayerOOBState: Match Progress

Author: JoshSanch

configure.py

@@ -573,7 +573,7 @@ def MatchingFor(*versions):
             Object(Matching, "SB/Core/x/xVolume.cpp"),
             Object(NonMatching, "SB/Core/x/xParEmitterType.cpp"),
             Object(Matching, "SB/Core/x/xRenderState.cpp"),
-            Object(NonMatching, "SB/Game/zEntPlayerOOBState.cpp"),
+            Object(NonMatching, "SB/Game/zEntPlayerOOBState.cpp", extra_cflags=["-sym on"]),
             Object(Equivalent, "SB/Core/x/xClumpColl.cpp"),
             Object(NonMatching, "SB/Core/x/xEntBoulder.cpp"),
             Object(NonMatching, "SB/Core/x/xGrid.cpp"),

src/SB/Core/x/xMath2.h

@@ -55,9 +55,22 @@ struct xVec2
     xVec2& assign(F32 x, F32 y);
     F32 length() const;
     F32 length2() const;
-    F32 normal() const;
-    xVec2& normalize();
-    F32 dot(const xVec2&) const;
+    xVec2 normal() const
+    {
+        xVec2 tmp = *this;
+        return tmp.normalize();
+    }
+
+    xVec2& normalize()
+    {
+        *this /= length();
+        return *this;
+    }
+
+    F32 dot(const xVec2& b) const
+    {
+        return (x * b.x) + (y * b.y);
+    }
 
     xVec2& operator=(F32);
     xVec2 operator*(F32) const;

src/SB/Game/zEntPlayer.h

@@ -411,6 +411,7 @@ void zEntPlayer_Init(xEnt* ent, xEntAsset* asset);
 void zEntPlayerExit(xEnt*);
 void zEntPlayerPreReset();
 void zEntPlayerReset(xEnt* ent);
+void zEntPlayerUpdateModel();
 void zEntPlayer_LoadSounds();
 void zEntPlayer_UnloadSounds();
 void zEntPlayer_ShadowModelEnable();