Fix Tails Gauge

Author: hyperbx

MarathonRecomp/api/Marathon.h

@@ -63,8 +63,8 @@
 #include "Sonicteam/Player/State/Object2.h"
 #include "Sonicteam/Player/State/SonicContext.h"
 #include "Sonicteam/Player/State/SonicObject.h"
-#include "Sonicteam/Player/State/SonicSpinDash.h"
 #include "Sonicteam/Player/State/TailsContext.h"
+#include "Sonicteam/Player/State/TailsFlight.h"
 #include "Sonicteam/Player/Zock.h"
 #include "Sonicteam/SaveDataTask.h"
 #include "Sonicteam/SaveDataTaskXENON.h"

MarathonRecomp/api/Sonicteam/Player/State/CommonFall.h

@@ -5,5 +5,9 @@
 
 namespace Sonicteam::Player::State
 {
-    class CommonFall : public CommonObject {};
+    class CommonFall : public CommonObject
+    {
+    public:
+        MARATHON_INSERT_PADDING(8);
+    };
 }

MarathonRecomp/api/Sonicteam/Player/State/SonicSpinDash.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <Marathon.inl>
+
+namespace Sonicteam::Player::State
+{
+    class TailsFlight : public CommonFall
+    {
+    public:
+        MARATHON_INSERT_PADDING(4);
+        be<float> m_FlightTime;
+    };
+}

MarathonRecomp/api/Sonicteam/Player/State/TailsFlight.h

@@ -4,18 +4,20 @@
 
 namespace Sonicteam::SoX::AI
 {
-    template <typename TState>
+    template <typename TContext>
     class StateMachine
     {
     public:
         xpointer<void> m_pVftable;
-        xpointer<StateMachine<TState>> m_pState;
-        MARATHON_INSERT_PADDING(4);
-        xpointer<Player::State::IContext> m_pContext;
-        MARATHON_INSERT_PADDING(4);
-        be<float> m_Time;
+        xpointer<StateMachine<TContext>> m_pState;
+        xpointer<TContext> m_pContext;
+
+        template <typename TState>
+        TState* GetState()
+        {
+            return (TState*)m_pState.get();
+        }
 
-        template <typename TContext = Player::State::IContext>
         TContext* GetContext()
         {
             return (TContext*)m_pContext.get();

MarathonRecomp/api/Sonicteam/SoX/AI/StateMachine.h

@@ -23,14 +23,14 @@ PPC_FUNC(sub_8221A7D8)
         pGauge->m_Value = (100.0f / pTailsContext->m_FlightDuration) * pTailsContext->m_FlightTime;
     }
 
-    auto pState = pPlayer->m_spStateMachine->GetBase()->m_pState;
+    auto pTailsFlight = pPlayer->m_spStateMachine->GetBase()->GetState<Sonicteam::Player::State::TailsFlight>();
     auto pGameImp = App::s_pApp->m_pDoc->GetDocMode<Sonicteam::GameMode>()->m_pGameImp;
 
     auto maturityValue = 1.0f;
 
     // Set maturity value if the current state is Sonicteam::Player::State::TailsFlight.
-    if (pState->m_pVftable.ptr == 0x82005404)
-        maturityValue = (1.0f / pTailsContext->m_FlightLimit) * pState->m_Time;
+    if (pTailsFlight->m_pVftable.ptr == 0x82005404)
+        maturityValue = (1.0f / pTailsContext->m_FlightLimit) * pTailsFlight->m_FlightTime;
 
     for (int i = 0; i < 4; i++)
     {