Addressed review comments

hyperbx · hyperbx · commit 4d45b437bf78 · 2025-10-29T19:03:03.000Z
diff --git a/MarathonRecomp/api/Sonicteam/Camera/CameraModeManager.h b/MarathonRecomp/api/Sonicteam/Camera/CameraModeManager.h
@@ -10,7 +10,15 @@ namespace Sonicteam::Camera
     class CameraModeManager
     {
     public:
+        // TODO: research these fields (processed by 0x8218C100).
+        struct UnknownStruct
+        {
+            MARATHON_INSERT_PADDING(0x14);
+        };
+
         xpointer<Cameraman> m_pCameraman;
         boost::shared_ptr<CameraMode> m_spCameraMode;
+        MARATHON_INSERT_PADDING(8);
+        stdx::vector<UnknownStruct> m_vUnkStructs;
     };
 }
diff --git a/MarathonRecomp/api/Sonicteam/MainMenuTask.h b/MarathonRecomp/api/Sonicteam/MainMenuTask.h
@@ -39,7 +39,7 @@ namespace Sonicteam
         MARATHON_INSERT_PADDING(0x20);
         xpointer<ButtonWindowTask> m_pButtonWindowTask;
         MARATHON_INSERT_PADDING(4);
-        be<uint32_t> m_SelectedIndex;
+        be<uint32_t> m_MainMenuSelectedIndex;
         MARATHON_INSERT_PADDING(0x1D8);
         be<uint32_t> m_PressedButtons;
         MARATHON_INSERT_PADDING(0x18);
diff --git a/MarathonRecomp/api/Sonicteam/Player/Object.h b/MarathonRecomp/api/Sonicteam/Player/Object.h
@@ -79,5 +79,18 @@ namespace Sonicteam::Player
 
             return nullptr;
         }
+
+        SoX::Input::Manager* GetInputManager()
+        {
+            if (!m_IsPlayer)
+                return nullptr;
+
+            auto pDoc = GetDoc<DocMarathonState>();
+            auto pGame = pDoc->GetDocMode<GameMode>()->GetGame();
+            auto playerIndex = pGame->PlayerActorIDToIndex(m_ActorID);
+            auto controllerID = pDoc->m_PlayerControllerID[playerIndex];
+
+            return pDoc->m_vspInputManager[controllerID].get();
+        }
     };
 }
diff --git a/MarathonRecomp/api/Sonicteam/Player/State/CommonContext.h b/MarathonRecomp/api/Sonicteam/Player/State/CommonContext.h
@@ -35,9 +35,7 @@ namespace Sonicteam::Player::State
             if (!m_spScore.get())
                 return nullptr;
 
-            auto pPlayer = m_spScore->m_pPlayer;
-            
-            return pPlayer->GetDoc<DocMarathonImp>()->m_vspInputManager[pPlayer->m_ControllerIndex].get();
+            return m_spScore->m_pPlayer->GetInputManager();
         }
     };
 }
diff --git a/MarathonRecomp/patches/MainMenuTask_patches.cpp b/MarathonRecomp/patches/MainMenuTask_patches.cpp
@@ -10,7 +10,7 @@ PPC_FUNC(sub_824FFCF8)
     auto pHUDMainMenu = pMainMenuTask->m_pHUDMainMenu;
 
 #ifdef MARATHON_RECOMP_OPTIONS_MENU
-    if (pMainMenuTask->m_State == Sonicteam::MainMenuTask::MainMenuState_MainMenu && pMainMenuTask->m_SelectedIndex == 3)
+    if (pMainMenuTask->m_State == Sonicteam::MainMenuTask::MainMenuState_MainMenu && pMainMenuTask->m_MainMenuSelectedIndex == 3)
     {
         if (!OptionsMenu::s_isVisible && (pMainMenuTask->m_PressedButtons.get() & 0x10) != 0)
         {
@@ -25,7 +25,7 @@ PPC_FUNC(sub_824FFCF8)
             guest_stack_var<Sonicteam::Message::MsgHUDMainMenuSetCursor> msgHUDMainMenuSetCursor
             (
                 Sonicteam::HUDMainMenu::HUDMainMenuState_MainCursorOutro,
-                pMainMenuTask->m_SelectedIndex
+                pMainMenuTask->m_MainMenuSelectedIndex
             );
 
             // Play cursor outro animation.
diff --git a/MarathonRecomp/patches/player_patches.cpp b/MarathonRecomp/patches/player_patches.cpp
@@ -8,12 +8,10 @@
 PPC_FUNC_IMPL(__imp__sub_82195500);
 PPC_FUNC(sub_82195500)
 {
-    auto* pPlayer = (Sonicteam::Player::Object*)(base + ctx.r3.u32);
-    auto* pDocMarathonImp = pPlayer->GetDoc<Sonicteam::DocMarathonImp>();
-    auto* pGame = pDocMarathonImp->GetDocMode<Sonicteam::GameMode>()->GetGame();
-    auto& spManager = pDocMarathonImp->m_vspInputManager[pPlayer->m_ControllerIndex];
+    auto pPlayer = (Sonicteam::Player::Object*)(base + ctx.r3.u32);
+    auto pInputManager = pPlayer->GetInputManager();
 
-    if (pPlayer->m_IsPlayer && spManager.get())
+    if (pPlayer->m_IsPlayer && pInputManager)
     {
         if (Config::EnableDebugMode)
         {
@@ -22,20 +20,27 @@ PPC_FUNC(sub_82195500)
                 case 1:
                 {
                     // Toggle debug posture on Select press.
-                    if (pPlayer->m_SetupModuleIndexPrefix == 1 && spManager->m_PadState.IsPressed(Sonicteam::SoX::Input::KeyState_Select))
+                    if (pPlayer->m_SetupModuleIndexPrefix == 1 && pInputManager->m_PadState.IsPressed(Sonicteam::SoX::Input::KeyState_Select))
+                    {
                         pPlayer->m_SetupModuleIndexPostfix = 2;
 
+                        LOGFN("Debug Mode: Enabled");
+                    }
+
                     break;
                 }
 
                 case 2:
                 {
                     // Toggle camera volume collision on B press.
-                    if (spManager->m_PadState.IsPressed(Sonicteam::SoX::Input::KeyState_B))
+                    if (pInputManager->m_PadState.IsPressed(Sonicteam::SoX::Input::KeyState_B))
                     {
+                        auto pGame = App::s_pApp->m_pDoc->GetDocMode<Sonicteam::GameMode>()->GetGame();
                         auto pZock = pPlayer->GetPlugin<Sonicteam::Player::Zock>("zock");
                         auto collisionFilterInfo = pZock->m_spPhantomA->m_pRigidBody->m_collidable.m_broadPhaseHandle.m_collisionFilterInfo == 6 ? 0x383 : 6;
 
+                        LOGFN("Camera Volumes: {}", collisionFilterInfo != 6 ? "Enabled" : "Disabled");
+
                         pZock->m_spPhantomA->m_pRigidBody->m_collidable.m_broadPhaseHandle.m_collisionFilterInfo = collisionFilterInfo;
                         pGame->GetPhysicsWorld<Sonicteam::SoX::Physics::Havok::WorldHavok>()->m_pWorld->updateCollisionFilterOnWorld(1, 1);
                     }
@@ -46,17 +51,19 @@ PPC_FUNC(sub_82195500)
         }
 
         // Toggle demo camera on right stick press.
-        if (Config::RestoreDemoCameraMode && spManager->m_PadState.IsPressed(Sonicteam::SoX::Input::KeyState_RightStick))
+        if (Config::RestoreDemoCameraMode && pInputManager->m_PadState.IsPressed(Sonicteam::SoX::Input::KeyState_RightStick))
         {
             auto pCameraman = static_cast<Sonicteam::Camera::Cameraman*>(pPlayer->m_pCameraman.get());
 
             if (auto pCameraMode = pCameraman->m_spCameraModeManager->m_spCameraMode.get())
             {
                 guest_stack_var<Sonicteam::Message::MsgCameramanChangeMode> msgCameramanChangeMode;
-                msgCameramanChangeMode->ControllerIndex = spManager->m_ControllerIndex;
+                msgCameramanChangeMode->ControllerIndex = pInputManager->m_ControllerIndex;
                 msgCameramanChangeMode->TargetActorID = pPlayer->m_ActorID;
                 msgCameramanChangeMode->IsDemoCamera = pCameraMode->m_pVftable.ptr != 0x82002004;
 
+                LOGFN("Demo Camera: {}", msgCameramanChangeMode->IsDemoCamera ? "Enabled" : "Disabled");
+
                 pCameraman->ProcessMessage(msgCameramanChangeMode.get());
             }
         }
@@ -160,7 +167,13 @@ bool PlayerDebugMode_RemapDebugExitButton(PPCRegister& r30)
 {
     auto pPadState = (Sonicteam::SoX::Input::PadState*)g_memory.Translate(r30.u32);
 
-    return pPadState->IsPressed(Sonicteam::SoX::Input::KeyState_Select);
+    if (pPadState->IsPressed(Sonicteam::SoX::Input::KeyState_Select))
+    {
+        LOGFN("Debug Mode: Disabled");
+        return true;
+    }
+
+    return false;
 }
 
 bool AntigravityRetainsMomentum()
diff --git a/MarathonRecomp/ui/options_menu.cpp b/MarathonRecomp/ui/options_menu.cpp
@@ -1095,7 +1095,7 @@ void OptionsMenu::Draw()
                     guest_stack_var<Sonicteam::Message::MsgHUDMainMenuSetCursor> msgHUDMainMenuSetCursor
                     (
                         Sonicteam::HUDMainMenu::HUDMainMenuState_MainCursorIntro,
-                        s_pMainMenuTask->m_SelectedIndex
+                        s_pMainMenuTask->m_MainMenuSelectedIndex
                     );
 
                     // Play cursor intro animation.

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,7 @@ namespace Sonicteam::Player::State`
`35`	`35`	`if (!m_spScore.get())`
`36`	`36`	`return nullptr;`
`37`	`37`
`38`		`- auto pPlayer = m_spScore->m_pPlayer;`
`39`		`-`
`40`		`- return pPlayer->GetDoc<DocMarathonImp>()->m_vspInputManager[pPlayer->m_ControllerIndex].get();`
	`38`	`+ return m_spScore->m_pPlayer->GetInputManager();`
`41`	`39`	`}`
`42`	`40`	`};`
`43`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ PPC_FUNC(sub_824FFCF8)`
`10`	`10`	`auto pHUDMainMenu = pMainMenuTask->m_pHUDMainMenu;`
`11`	`11`
`12`	`12`	`#ifdef MARATHON_RECOMP_OPTIONS_MENU`
`13`		`- if (pMainMenuTask->m_State == Sonicteam::MainMenuTask::MainMenuState_MainMenu && pMainMenuTask->m_SelectedIndex == 3)`
	`13`	`+ if (pMainMenuTask->m_State == Sonicteam::MainMenuTask::MainMenuState_MainMenu && pMainMenuTask->m_MainMenuSelectedIndex == 3)`
`14`	`14`	`{`
`15`	`15`	`if (!OptionsMenu::s_isVisible && (pMainMenuTask->m_PressedButtons.get() & 0x10) != 0)`
`16`	`16`	`{`
`@@ -25,7 +25,7 @@ PPC_FUNC(sub_824FFCF8)`
`25`	`25`	`guest_stack_var<Sonicteam::Message::MsgHUDMainMenuSetCursor> msgHUDMainMenuSetCursor`
`26`	`26`	`(`
`27`	`27`	`Sonicteam::HUDMainMenu::HUDMainMenuState_MainCursorOutro,`
`28`		`- pMainMenuTask->m_SelectedIndex`
	`28`	`+ pMainMenuTask->m_MainMenuSelectedIndex`
`29`	`29`	`);`
`30`	`30`
`31`	`31`	`// Play cursor outro animation.`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,10 @@`
`8`	`8`	`PPC_FUNC_IMPL(__imp__sub_82195500);`
`9`	`9`	`PPC_FUNC(sub_82195500)`
`10`	`10`	`{`
`11`		`- auto* pPlayer = (Sonicteam::Player::Object*)(base + ctx.r3.u32);`
`12`		`- auto* pDocMarathonImp = pPlayer->GetDoc<Sonicteam::DocMarathonImp>();`
`13`		`- auto* pGame = pDocMarathonImp->GetDocMode<Sonicteam::GameMode>()->GetGame();`
`14`		`- auto& spManager = pDocMarathonImp->m_vspInputManager[pPlayer->m_ControllerIndex];`
	`11`	`+ auto pPlayer = (Sonicteam::Player::Object*)(base + ctx.r3.u32);`
	`12`	`+ auto pInputManager = pPlayer->GetInputManager();`
`15`	`13`
`16`		`- if (pPlayer->m_IsPlayer && spManager.get())`
	`14`	`+ if (pPlayer->m_IsPlayer && pInputManager)`
`17`	`15`	`{`
`18`	`16`	`if (Config::EnableDebugMode)`
`19`	`17`	`{`
`@@ -22,20 +20,27 @@ PPC_FUNC(sub_82195500)`
`22`	`20`	`case 1:`
`23`	`21`	`{`
`24`	`22`	`// Toggle debug posture on Select press.`
`25`		`- if (pPlayer->m_SetupModuleIndexPrefix == 1 && spManager->m_PadState.IsPressed(Sonicteam::SoX::Input::KeyState_Select))`
	`23`	`+ if (pPlayer->m_SetupModuleIndexPrefix == 1 && pInputManager->m_PadState.IsPressed(Sonicteam::SoX::Input::KeyState_Select))`
	`24`	`+ {`
`26`	`25`	`pPlayer->m_SetupModuleIndexPostfix = 2;`
`27`	`26`
	`27`	`+ LOGFN("Debug Mode: Enabled");`
	`28`	`+ }`
	`29`	`+`
`28`	`30`	`break;`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`case 2:`
`32`	`34`	`{`
`33`	`35`	`// Toggle camera volume collision on B press.`
`34`		`- if (spManager->m_PadState.IsPressed(Sonicteam::SoX::Input::KeyState_B))`
	`36`	`+ if (pInputManager->m_PadState.IsPressed(Sonicteam::SoX::Input::KeyState_B))`
`35`	`37`	`{`
	`38`	`+ auto pGame = App::s_pApp->m_pDoc->GetDocMode<Sonicteam::GameMode>()->GetGame();`
`36`	`39`	`auto pZock = pPlayer->GetPlugin<Sonicteam::Player::Zock>("zock");`
`37`	`40`	`auto collisionFilterInfo = pZock->m_spPhantomA->m_pRigidBody->m_collidable.m_broadPhaseHandle.m_collisionFilterInfo == 6 ? 0x383 : 6;`
`38`	`41`
	`42`	`+ LOGFN("Camera Volumes: {}", collisionFilterInfo != 6 ? "Enabled" : "Disabled");`
	`43`	`+`
`39`	`44`	`pZock->m_spPhantomA->m_pRigidBody->m_collidable.m_broadPhaseHandle.m_collisionFilterInfo = collisionFilterInfo;`
`40`	`45`	`pGame->GetPhysicsWorld<Sonicteam::SoX::Physics::Havok::WorldHavok>()->m_pWorld->updateCollisionFilterOnWorld(1, 1);`
`41`	`46`	`}`
`@@ -46,17 +51,19 @@ PPC_FUNC(sub_82195500)`
`46`	`51`	`}`
`47`	`52`
`48`	`53`	`// Toggle demo camera on right stick press.`
`49`		`- if (Config::RestoreDemoCameraMode && spManager->m_PadState.IsPressed(Sonicteam::SoX::Input::KeyState_RightStick))`
	`54`	`+ if (Config::RestoreDemoCameraMode && pInputManager->m_PadState.IsPressed(Sonicteam::SoX::Input::KeyState_RightStick))`
`50`	`55`	`{`
`51`	`56`	`auto pCameraman = static_cast<Sonicteam::Camera::Cameraman*>(pPlayer->m_pCameraman.get());`
`52`	`57`
`53`	`58`	`if (auto pCameraMode = pCameraman->m_spCameraModeManager->m_spCameraMode.get())`
`54`	`59`	`{`
`55`	`60`	`guest_stack_var<Sonicteam::Message::MsgCameramanChangeMode> msgCameramanChangeMode;`
`56`		`- msgCameramanChangeMode->ControllerIndex = spManager->m_ControllerIndex;`
	`61`	`+ msgCameramanChangeMode->ControllerIndex = pInputManager->m_ControllerIndex;`
`57`	`62`	`msgCameramanChangeMode->TargetActorID = pPlayer->m_ActorID;`
`58`	`63`	`msgCameramanChangeMode->IsDemoCamera = pCameraMode->m_pVftable.ptr != 0x82002004;`
`59`	`64`
	`65`	`+ LOGFN("Demo Camera: {}", msgCameramanChangeMode->IsDemoCamera ? "Enabled" : "Disabled");`
	`66`	`+`
`60`	`67`	`pCameraman->ProcessMessage(msgCameramanChangeMode.get());`
`61`	`68`	`}`
`62`	`69`	`}`
`@@ -160,7 +167,13 @@ bool PlayerDebugMode_RemapDebugExitButton(PPCRegister& r30)`
`160`	`167`	`{`
`161`	`168`	`auto pPadState = (Sonicteam::SoX::Input::PadState*)g_memory.Translate(r30.u32);`
`162`	`169`
`163`		`- return pPadState->IsPressed(Sonicteam::SoX::Input::KeyState_Select);`
	`170`	`+ if (pPadState->IsPressed(Sonicteam::SoX::Input::KeyState_Select))`
	`171`	`+ {`
	`172`	`+ LOGFN("Debug Mode: Disabled");`
	`173`	`+ return true;`
	`174`	`+ }`
	`175`	`+`
	`176`	`+ return false;`
`164`	`177`	`}`
`165`	`178`
`166`	`179`	`bool AntigravityRetainsMomentum()`
Original file line number	Diff line number	Diff line change
`@@ -1095,7 +1095,7 @@ void OptionsMenu::Draw()`
`1095`	`1095`	`guest_stack_var<Sonicteam::Message::MsgHUDMainMenuSetCursor> msgHUDMainMenuSetCursor`
`1096`	`1096`	`(`
`1097`	`1097`	`Sonicteam::HUDMainMenu::HUDMainMenuState_MainCursorIntro,`
`1098`		`- s_pMainMenuTask->m_SelectedIndex`
	`1098`	`+ s_pMainMenuTask->m_MainMenuSelectedIndex`
`1099`	`1099`	`);`
`1100`	`1100`
`1101`	`1101`	`// Play cursor intro animation.`