Build fixes

Signed-off-by: Isaac Marovitz <[email protected]>

Author: IsaacMarovitz

MarathonRecomp/api/Sonicteam/GE1PE/ParticleEngine.h

@@ -29,7 +29,7 @@ namespace Sonicteam::GE1PE
         stdx::vector<xpointer<TextureBank>> m_vpTextureBank;
         stdx::vector<xpointer<TextureBank>> m_vpMaterialBank;
         SoX::LinkNode<Manager> m_lnManager;
-        stdx::vector<void> m_vField6C;
+        stdx::vector<xpointer<void>> m_vField6C;
     };
 
     MARATHON_ASSERT_OFFSETOF(ParticleEngine, m_vpEffectBank, 0x30);

MarathonRecomp/api/Sonicteam/RaderMapManager.h

@@ -1,6 +1,8 @@
 #pragma once
 
 #include <Marathon.inl>
+#include <Sonicteam/SoX/Graphics/FrameGP.h>
+#include <Sonicteam/SoX/Math/Vector.h>
 
 namespace Sonicteam
 {

MarathonRecomp/api/Sonicteam/SoX/Graphics/Texture.h

@@ -3,12 +3,12 @@
 #include <Marathon.inl>
 #include <Sonicteam/SoX/IResource.h>
 #include <Sonicteam/SoX/RefSharedPointer.h>
-#include <Sonicteam/SoX/Graphics/Surface.h>
 #include <Sonicteam/SoX/Array.h>
 #include <gpu/video.h>
 
 namespace Sonicteam::SoX::Graphics
 {
+    class Surface;
     class Device;
 
     class Texture : public IResource

MarathonRecomp/api/stdx/vector.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <kernel/heap.h>
-#include <kernel/function.h>
 #include <utility>
 #include <algorithm>
 

MarathonRecomp/app.cpp

@@ -94,7 +94,7 @@ PPC_FUNC(sub_825EA610)
     }
 
     // Allow variable FPS when config is not 60 FPS.
-    App::s_pApp->m_pDoc->m_VFrame = Config::FPS != 60;
+    App::s_pApp->m_pDocState->m_VFrame = Config::FPS != 60;
 
     AudioPatches::Update(App::s_deltaTime);
 

MarathonRecomp/patches/TitleTask_patches.cpp

@@ -110,7 +110,7 @@ PPC_FUNC(sub_825126A0)
             if (g_isSecretDone)
                 break;
 
-            if (auto& spInputManager = App::s_pApp->m_pDoc->m_vspInputManager[0])
+            if (auto& spInputManager = App::s_pApp->m_pDocState->m_vspInputManager[0])
             {
                 auto& rPadState = spInputManager->m_PadState;
 
@@ -138,7 +138,7 @@ PPC_FUNC(sub_825126A0)
 
         case Sonicteam::TitleTask::TitleState_OptionsWait:
         {
-            if (auto& spInputManager = App::s_pApp->m_pDoc->m_vspInputManager[0])
+            if (auto& spInputManager = App::s_pApp->m_pDocState->m_vspInputManager[0])
             {
                 auto& rPadState = spInputManager->m_PadState;
 
@@ -196,7 +196,7 @@ PPC_FUNC(sub_825126A0)
     }
     else
     {
-        if (auto& spInputManager = App::s_pApp->m_pDoc->m_vspInputManager[0])
+        if (auto& spInputManager = App::s_pApp->m_pDocState->m_vspInputManager[0])
         {
             auto& rPadState = spInputManager->m_PadState;
 

MarathonRecomp/patches/camera_patches.cpp

@@ -9,7 +9,7 @@ static class MainMenuCameraUpdateEvent : public ContextHookEvent<Sonicteam::Main
 public:
     void Update(Sonicteam::MainMenuTask* pThis, float deltaTime) override
     {
-        auto pMainMode = pThis->GetDocMode<Sonicteam::MainMode>();
+        auto pMainMode = pThis->GetDoc<Sonicteam::MainMode>();
 
         if (!pMainMode)
             return;

MarathonRecomp/patches/misc_patches.cpp

@@ -43,8 +43,8 @@ void SetLifeBarAnimation(PPCRegister& r3, PPCRegister& r4, PPCRegister& r5, PPCR
 
     // Redirect "life_ber_anime" to "life_bar_anime", as they
     // actually spelt "bar" correctly in the tag XNCP scene names...
-    if ((pCsdObject->m_pCsdResource->m_FilePath == "sprite/tagdisplay_1p" ||
-        pCsdObject->m_pCsdResource->m_FilePath == "sprite/tagdisplay_2p") &&
+    if ((pCsdObject->m_pCsdResource->m_MgrResourceName == "sprite/tagdisplay_1p" ||
+        pCsdObject->m_pCsdResource->m_MgrResourceName == "sprite/tagdisplay_2p") &&
         strcmp(pSceneName, "life_ber_anime") == 0)
     {
         r4.u32 = g_memory.MapVirtual(s_lifeBarSceneName);

MarathonRecomp/ui/message_window.cpp

@@ -325,7 +325,7 @@ void MessageWindow::Draw()
         // Always assume keyboard to prevent mouse from blocking control in-game.
         isKeyboard = true;
 
-        if (auto& spInputManager = App::s_pApp->m_pDoc->m_vspInputManager[0])
+        if (auto& spInputManager = App::s_pApp->m_pDocState->m_vspInputManager[0])
         {
             auto& rPadState = spInputManager->m_PadState;
 

MarathonRecomp/ui/options_menu.cpp

@@ -1034,7 +1034,7 @@ void OptionsMenu::Draw()
         {
             if (s_commonMenu.IsOpen())
             {
-                for (auto& spInputManager : App::s_pApp->m_pDoc->m_vspInputManager)
+                for (auto& spInputManager : App::s_pApp->m_pDocState->m_vspInputManager)
                 {
                     auto& rPadState = spInputManager->m_PadState;