Library: speedometer mode: fixed working in demo playback

SNMetamorph · Mar 7, 2023 · 5a85a7c · 5a85a7c
1 parent 3de1698
commit 5a85a7c
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 23 deletions.
diff --git a/sources/library/displaymode_angletracking.cpp b/sources/library/displaymode_angletracking.cpp
@@ -13,6 +13,9 @@ CModeAngleTracking::CModeAngleTracking()
 
 void CModeAngleTracking::Render2D(float frameTime, int scrWidth, int scrHeight, CStringStack &screenText)
 {
+    if (!g_LocalPlayer.PlayerMoveAvailable())
+        return;
+
     const float threshold = 0.001f;
     const vec3_t &currAngles = g_LocalPlayer.GetAngles();
     float pitchVelocity = (currAngles.x - m_vecLastAngles.x) / g_pPlayerMove->frametime;

diff --git a/sources/library/displaymode_entityreport.cpp b/sources/library/displaymode_entityreport.cpp
@@ -20,6 +20,9 @@ CModeEntityReport::CModeEntityReport()
 
 void CModeEntityReport::Render2D(float frameTime, int scrWidth, int scrHeight, CStringStack &screenText)
 {
+    if (!g_LocalPlayer.PlayerMoveAvailable())
+        return;
+
     int debugMode = ConVars::gsm_debug->value;
     if (!g_EntityDictionary.IsInitialized())
         g_EntityDictionary.Initialize();

diff --git a/sources/library/displaymode_facereport.cpp b/sources/library/displaymode_facereport.cpp
@@ -22,6 +22,9 @@ CModeFaceReport::CModeFaceReport()
 
 void CModeFaceReport::Render2D(float frameTime, int scrWidth, int scrHeight, CStringStack &screenText)
 {
+    if (!g_LocalPlayer.PlayerMoveAvailable())
+        return;
+
     const float lineLen = 11590.0f;
     vec3_t intersectPoint;
     vec3_t viewOrigin = g_LocalPlayer.GetViewOrigin();

diff --git a/sources/library/displaymode_full.cpp b/sources/library/displaymode_full.cpp
@@ -13,6 +13,9 @@ CModeFull::CModeFull()
 
 void CModeFull::Render2D(float frameTime, int scrWidth, int scrHeight, CStringStack &screenText)
 {
+    if (!g_LocalPlayer.PlayerMoveAvailable())
+        return;
+
     float timeDelta             = GetSmoothSystemFrametime();
     float velocityNum           = g_LocalPlayer.GetVelocityHorz();
     const vec3_t &origin        = g_LocalPlayer.GetOrigin();

diff --git a/sources/library/displaymode_measurement.cpp b/sources/library/displaymode_measurement.cpp
@@ -271,6 +271,9 @@ void CModeMeasurement::LoadLineSprite()
 
 void CModeMeasurement::Render2D(float frameTime, int screenWidth, int screenHeight, CStringStack &screenText)
 {
+    if (!g_LocalPlayer.PlayerMoveAvailable())
+        return;
+
     const vec3_t &originPointA = GetPointOriginA();
     const vec3_t &originPointB = GetPointOriginB();
     float pointsDistance = GetPointsDistance();

diff --git a/sources/library/displaymode_speedometer.cpp b/sources/library/displaymode_speedometer.cpp
@@ -30,7 +30,7 @@ void CModeSpeedometer::Render2D(float frameTime, int scrWidth, int scrHeight, CS
     );
 }
 
-void CModeSpeedometer::DrawVelocityBar(int centerX, int centerY, float velocity)
+void CModeSpeedometer::DrawVelocityBar(int centerX, int centerY, float velocity) const
 {
     const int barHeight = 15;
     const int barMargin = 60;
@@ -46,14 +46,56 @@ void CModeSpeedometer::DrawVelocityBar(int centerX, int centerY, float velocity)
 
 void CModeSpeedometer::CalculateVelocity(float frameTime)
 {
-    if (g_LocalPlayer.IsSpectate())
-    {
-        int targetIndex = g_LocalPlayer.GetSpectateTargetIndex();
-        if (g_pClientEngfuncs->GetEntityByIndex(targetIndex) != nullptr) {
-            m_flVelocity = Utils::GetEntityVelocityApprox(targetIndex).Length2D();
-        }
+    if (LocalPlayerSpectating()) {
+        m_flVelocity = GetEntityVelocityApprox(GetSpectatedTargetIndex());
     }
     else {
-        m_flVelocity = (g_pPlayerMove->velocity + g_pPlayerMove->basevelocity).Length2D();
+        m_flVelocity = GetLocalPlayerVelocity();
+    }
+}
+
+float CModeSpeedometer::GetEntityVelocityApprox(int entityIndex) const
+{           
+    if (g_pClientEngfuncs->GetEntityByIndex(entityIndex)) {
+        return Utils::GetEntityVelocityApprox(entityIndex).Length2D();
+    }
+    return 0.0f;
+}
+
+int CModeSpeedometer::GetSpectatedTargetIndex() const
+{
+    if (g_LocalPlayer.PlayerMoveAvailable()) {
+        return g_LocalPlayer.GetSpectateTargetIndex();
+    }
+    else 
+    {
+        cl_entity_t *localPlayer = g_pClientEngfuncs->GetLocalPlayer();
+        return localPlayer->curstate.iuser2;
+    }
+}
+
+bool CModeSpeedometer::LocalPlayerSpectating() const
+{
+    if (g_LocalPlayer.PlayerMoveAvailable()) {
+        return g_LocalPlayer.IsSpectate();
+    }
+    else 
+    {
+        cl_entity_t *localPlayer = g_pClientEngfuncs->GetLocalPlayer();
+        int specMode = localPlayer->curstate.iuser1;
+        int targetIndex = localPlayer->curstate.iuser2;
+        return specMode != 0 && targetIndex != 0;
+    }
+}
+
+float CModeSpeedometer::GetLocalPlayerVelocity() const
+{
+    if (g_LocalPlayer.PlayerMoveAvailable()) {
+        return (g_pPlayerMove->velocity + g_pPlayerMove->basevelocity).Length2D();
+    }
+    else 
+    {
+        cl_entity_t *localPlayer = g_pClientEngfuncs->GetLocalPlayer();
+        return Utils::GetEntityVelocityApprox(localPlayer->index).Length2D();
     }
 }
diff --git a/sources/library/displaymode_speedometer.h b/sources/library/displaymode_speedometer.h
@@ -16,7 +16,11 @@ class CModeSpeedometer : public IDisplayMode
 
 private:
     void CalculateVelocity(float frameTime);
-    void DrawVelocityBar(int scrWidth, int scrHeight, float velocity);
+    float GetEntityVelocityApprox(int entityIndex) const;
+    int GetSpectatedTargetIndex() const;
+    bool LocalPlayerSpectating() const;
+    float GetLocalPlayerVelocity() const;
+    void DrawVelocityBar(int scrWidth, int scrHeight, float velocity) const;
 
     float m_flVelocity;
     float m_flLastUpdateTime;

diff --git a/sources/library/hooks.cpp b/sources/library/hooks.cpp
@@ -17,26 +17,22 @@ NOINLINE static int __cdecl HookRedraw(float time, int intermission)
 {
     // call original function
     PLH::FnCast(g_hookRedraw.GetTrampolineAddr(), CHooks::pfnRedraw_t())(time, intermission);
-    if (g_pPlayerMove)
-    {
-        bool isIntermission = intermission != 0;
-        g_Application.DisplayModeRender2D();
-    }
+    g_Application.DisplayModeRender2D();
     return 1;
 }
 
 NOINLINE static void __cdecl HookPlayerMove(playermove_t *pmove, int server)
 {
     PLH::FnCast(g_hookPlayerMove.GetTrampolineAddr(), CHooks::pfnPlayerMove_t())(pmove, server);
-    g_LocalPlayer.Setup(pmove);
+    g_LocalPlayer.UpdatePlayerMove(pmove);
 }
 
 NOINLINE static int __cdecl HookKeyEvent(int keyDown, int keyCode, const char *bindName)
 {
     int returnCode = PLH::FnCast(g_hookKeyEvent.GetTrampolineAddr(), CHooks::pfnKeyEvent_t())(
         keyDown, keyCode, bindName
     );
-    return returnCode && g_Application.KeyInput(keyDown, keyCode, bindName);
+    return (returnCode && g_Application.KeyInput(keyDown, keyCode, bindName)) ? 1 : 0;
 }
 
 NOINLINE static void __cdecl HookDrawTriangles()
@@ -48,7 +44,7 @@ NOINLINE static void __cdecl HookDrawTriangles()
 NOINLINE static int __cdecl HookIsThirdPerson()
 {
     int returnCode = PLH::FnCast(g_hookIsThirdPerson.GetTrampolineAddr(), CHooks::pfnIsThirdPerson_t())();
-    return returnCode || g_LocalPlayer.IsThirdPersonForced();
+    return (returnCode || g_LocalPlayer.IsThirdPersonForced()) ? 1 : 0;
 }
 
 NOINLINE static void __cdecl HookCameraOffset(float *cameraOffset)

diff --git a/sources/library/local_player.cpp b/sources/library/local_player.cpp
@@ -10,7 +10,7 @@ CLocalPlayer &CLocalPlayer::GetInstance()
     return instance;
 }
 
-void CLocalPlayer::Setup(playermove_t *pmove)
+void CLocalPlayer::UpdatePlayerMove(playermove_t *pmove)
 {
     m_pPlayerMove = pmove;
 }
@@ -83,12 +83,17 @@ float CLocalPlayer::GetThirdPersonCameraDist() const
     return maxDist * traceInfo.fraction;
 }
 
+bool CLocalPlayer::PlayerMoveAvailable() const
+{
+    // we can't use player move when demo playing
+    bool demoPlaying = g_pClientEngfuncs->pDemoAPI->IsPlayingback() != 0;
+    return m_pPlayerMove != nullptr && !demoPlaying;
+}
+
 bool CLocalPlayer::IsSpectate() const
 {
-    /*
-    assume that it's valid only for cs 1.6/hl1
-    because other mods can use iuser variables for other purposes
-    */
+    // assume that it's valid only for cs 1.6/hl1
+    // because other mods can use iuser variables for other purposes
     int specMode = m_pPlayerMove->iuser1;
     int targetIndex = m_pPlayerMove->iuser2;
     return specMode != 0 && targetIndex != 0;

diff --git a/sources/library/local_player.h b/sources/library/local_player.h
@@ -6,7 +6,7 @@ class CLocalPlayer
 {
 public:
     static CLocalPlayer &GetInstance();
-    void Setup(playermove_t *pmove);
+    void UpdatePlayerMove(playermove_t *pmove);
     playermove_t* &GetPlayerMove();
 
     const vec3_t &GetOrigin() const;
@@ -19,10 +19,12 @@ class CLocalPlayer
     vec3_t GetViewOrigin() const;
     vec3_t GetViewDirection() const;
 
+    bool PlayerMoveAvailable() const;
     bool IsSpectate() const;
     int GetSpectateTargetIndex() const;
     bool IsThirdPersonForced() const;
     float GetThirdPersonCameraDist() const;
+
 private:
     CLocalPlayer() : m_pPlayerMove(nullptr) {};
     ~CLocalPlayer() {};