Clean-up

Author: hyperbx

MarathonRecomp/api/Sonicteam/GameImp.h

@@ -37,13 +37,14 @@ namespace Sonicteam
         template <typename T>
         inline T* GetPhysicsWorld();
 
-        int32_t PlayerActorIDToIndex(int32_t ActorID)
+        int32_t PlayerActorIDToIndex(int32_t actorId) const
         {
             for (int i = 0; i < 4; i++)
             {
-                if (m_PlayerData[i].ActorID == ActorID)
+                if (m_PlayerData[i].ActorID == actorId)
                     return i;
             }
+
             return -1;
         }
     };

MarathonRecomp/api/Sonicteam/Player/Object.h

@@ -13,12 +13,12 @@ namespace Sonicteam::Player
         MARATHON_INSERT_PADDING(0x2C);
         bool m_IsPlayer;
         bool m_IsPosture;
-        bool m_IsAmigo; //AI::Amigo
+        bool m_IsAmigo;
         MARATHON_INSERT_PADDING(0x19);
         boost::shared_ptr<State::Machine2> m_spStateMachine;
         MARATHON_INSERT_PADDING(0x10);
-        be<uint32_t> m_SetupModuleIndexPre;
-        be<uint32_t> m_SetupModuleIndexPost;
+        be<uint32_t> m_SetupModuleIndexPrefix;
+        be<uint32_t> m_SetupModuleIndexPostfix;
         boost::shared_ptr<IGauge> m_spGauge;
         MARATHON_INSERT_PADDING(0x204);
 

MarathonRecomp/api/Sonicteam/SoX/Input/Manager.h

@@ -4,7 +4,6 @@
 
 namespace Sonicteam::SoX::Input
 {
-
     enum KeyState
     {
         KeyState_DpadUp = 0x40,
@@ -26,7 +25,7 @@ namespace Sonicteam::SoX::Input
     struct PadState
     {
         be<uint32_t> LastButtons;
-        be<uint32_t> InvertedLastButtons; // ~wLastButtons
+        be<uint32_t> InvertedLastButtons;
         MARATHON_INSERT_PADDING(8);
 
         be<float> LeftStickHorizontal;

MarathonRecomp/api/stdx/vector.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#include <kernel/heap.h>
-#include <kernel/function.h>
-
 namespace stdx
 {
     template <typename Type>

MarathonRecomp/patches/player_patches.cpp

@@ -133,17 +133,18 @@ PPC_FUNC(sub_82195500)
         return;
     }
 
-    auto pDoc = App::s_pApp->m_pDoc;
-    auto pGameImp = App::s_pApp->m_pDoc->GetDocMode<Sonicteam::GameMode>()->m_pGameImp;
     auto pPlayer = (Sonicteam::Player::Object*)(base + ctx.r3.u32);
+    auto pDoc = App::s_pApp->m_pDoc;
 
-    if (pPlayer->m_SetupModuleIndexPost != -2 && pPlayer->m_IsPlayer)
+    if (auto pGameMode = pDoc->GetDocMode<Sonicteam::GameMode>())
     {
-        auto PIndex = pGameImp->PlayerActorIDToIndex(pPlayer->m_ActorID);
-        auto PManager = pDoc->m_vspInputManager[pDoc->m_PlayerControllerID[PIndex].get()].get();
-        if ((PManager->m_PadState.LastButtons.get() & Sonicteam::SoX::Input::KeyState_Select) != 0)
+        if (pPlayer->m_SetupModuleIndexPostfix != -2 && pPlayer->m_IsPlayer)
         {
-            pPlayer->m_SetupModuleIndexPost = 2;
+            auto playerIndex = pGameMode->m_pGameImp->PlayerActorIDToIndex(pPlayer->m_ActorID);
+            auto& spManager = pDoc->m_vspInputManager[pDoc->m_PlayerControllerID[playerIndex]];
+
+            if ((spManager->m_PadState.LastButtons.get() & Sonicteam::SoX::Input::KeyState_Select) != 0)
+                pPlayer->m_SetupModuleIndexPostfix = 2;
         }
     }