adjustments #1

Author: ReimousTH

MarathonRecomp/api/Marathon.h

@@ -104,8 +104,8 @@
 #include "Sonicteam/SoX/Math/Vector.h"
 #include "Sonicteam/SoX/MessageReceiver.h"
 #include "Sonicteam/SoX/Object.h"
+#include "Sonicteam/SoX/LinkNode.h"
 #include "Sonicteam/SoX/Physics/Entity.h"
-#include "Sonicteam/SoX/Physics/EntityRef.h"
 #include "Sonicteam/SoX/Physics/IntersectEvent.h"
 #include "Sonicteam/SoX/Physics/IntersectListener.h"
 #include "Sonicteam/SoX/Physics/ShapeCastEvent.h"

MarathonRecomp/api/Sonicteam/Player/GroundRayListener.h

@@ -6,19 +6,18 @@
 #include <Sonicteam/SoX/Physics/IntersectEvent.h>
 #include <Sonicteam/SoX/Math/Vector.h>
 #include <Sonicteam/SoX/Physics/Entity.h>
-#include <Sonicteam/SoX/Physics/EntityRef.h>
+#include <Sonicteam/SoX/LinkNode.h>
 
 namespace Sonicteam::Player
 {
-    //Sonicteam::Player::ICollisionListener, Sonicteam::Player::ICollisionListenerTemplate<Sonicteam::SoX::Physics::IntersectListener,Sonicteam::SoX::Physics::IntersectEvent>
     class GroundRayListener:public ICollisionListenerTemplate<Sonicteam::SoX::Physics::IntersectListener, Sonicteam::SoX::Physics::IntersectEvent>
     {
     public:
         SoX::Math::Vector m_ContactPosition;
         SoX::Math::Vector m_ContactNormal;
         be<float> m_RayDistance; //not sure
         be<uint32_t> m_RayFlag; //not sure
-        SoX::Physics::EntityRef m_ContactEntity;
+        SoX::LinkRef<Sonicteam::SoX::Physics::Entity> m_ContactEntity;
         MARATHON_INSERT_PADDING(0xC);
     };
 }

MarathonRecomp/api/Sonicteam/Player/ICollisionListener.h

@@ -5,7 +5,6 @@
 
 namespace Sonicteam::Player
 {
-    //Sonicteam::Player::ICollisionListener, Sonicteam::Player::ICollisionListenerTemplate<Sonicteam::SoX::Physics::IntersectListener,Sonicteam::SoX::Physics::IntersectEvent>
     class ICollisionListener
     {
     public:

MarathonRecomp/api/Sonicteam/Player/ICollisionListenerTemplate.h

@@ -5,13 +5,6 @@
 
 namespace Sonicteam::Player
 {
-    //Sonicteam::Player::ICollisionListener, Sonicteam::Player::ICollisionListenerTemplate<Sonicteam::SoX::Physics::IntersectListener,Sonicteam::SoX::Physics::IntersectEvent>
-    
     template <typename Cast, typename Event>
-    class ICollisionListenerTemplate:ICollisionListener,Cast
-    {
-    public:
-   
-
-    };
+    class ICollisionListenerTemplate:ICollisionListener,Cast {};
 }

MarathonRecomp/api/Sonicteam/Player/IPostureSupportRayTemplate.h

@@ -6,7 +6,6 @@
 #include <Sonicteam/SoX/RefSharedPointer.h>
 #include <Sonicteam/Player/RootFrame.h>
 
-
 namespace Sonicteam::Player
 {
     template <typename TCollisionListener>

MarathonRecomp/api/Sonicteam/Player/Object.inl

@@ -8,13 +8,13 @@ namespace Sonicteam::Player
     }
 
     template<typename T>
-
-    T* Object::GetPlugin(const char* pluginName)
+    inline T* Object::GetPlugin(const char* pluginName)
     {
         for (auto& spPlugin : m_vspPlayerPlugins)
         {
             if (spPlugin->m_Name == pluginName)
                 return static_cast<T*>(spPlugin.get());
         }
+        return nullptr;
 	}
 }

MarathonRecomp/api/Sonicteam/Player/Weapon/SonicWeapons.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <Marathon.inl>
 #include <Sonicteam/Player/IPlugIn.h>
 #include <Sonicteam/Player/IFlagCommunicator.h>
@@ -7,32 +8,15 @@
 #include <Sonicteam/Player/IVariable.h>
 #include <Sonicteam/Player/INotification.h>
 #include <Sonicteam/SoX/Engine/Task.h>
-
-
-
+#include <Sonicteam/SoX/LinkNode.h>
 
 namespace Sonicteam::Player::Weapon
-{
-    template <typename Type>
-    struct LinkSoxNode
-    {
-        xpointer<LinkSoxNode<Type>> m_Prev;
-        xpointer<LinkSoxNode<Type>> m_Next;
-        Type* m_This;
-    };
-
-    template <typename Type>
-    struct EntityContainer
-    {
-        xpointer<Type> Entity;
-        LinkSoxNode<Type> m_Link;
-    };
-  
+{  
     class SonicWeapons : public IPlugIn, public IFlagCommunicator, public IStepable, public IDynamicLink, public IVariable, public INotification
     {
     public:
         MARATHON_INSERT_PADDING(0x4C);
-        EntityContainer<Sonicteam::SoX::Engine::Task> m_GunDrive;
+        SoX::LinkRef<SoX::Engine::Task> m_GunDrive;
         MARATHON_INSERT_PADDING(0x24);
     };
 }

MarathonRecomp/api/Sonicteam/SoX/LinkNode.h

@@ -5,15 +5,23 @@ namespace Sonicteam::SoX
     template <typename T>
     class LinkNodeTemplate
     {
-    public: 
+    public:
         xpointer<T> m_pPrev;
         xpointer<T> m_pNext;
-    };  
+    };
 
     template <typename T>
-    class LinkNode : public LinkNodeTemplate<LinkNode<T>> 
+    class LinkNode : public LinkNodeTemplate<LinkNode<T>>
     {
     public:
         xpointer<LinkNode<T>> m_pThis;
     };
+
+    template <typename T>
+    class LinkRef
+    {
+    public:
+        xpointer<T> m_pElement;
+        SoX::LinkNode<LinkRef> m_lnElement;
+    };
 }

MarathonRecomp/api/Sonicteam/SoX/Physics/EntityRef.h

@@ -379,7 +379,7 @@ void SonicGaugeRestorationGaugeFlagFix(PPCRegister& r_gauge, PPCRegister& r_cont
         return;
 
     auto weapons = PContext->m_pScore->m_pPlayer->GetPlugin<Sonicteam::Player::Weapon::SonicWeapons>("sonic_weapons");
-    if (PContext->m_Tornado != 0 || PContext->m_AnimationID == 0xCB || PContext->m_AnimationID == 0xCC || PContext->m_AnimationID == 0x46 || PContext->m_AnimationID == 0xCE ||  weapons->m_GunDrive.Entity != 0)
+    if (PContext->m_Tornado != 0 || PContext->m_AnimationID == 0xCB || PContext->m_AnimationID == 0xCC || PContext->m_AnimationID == 0x46 || PContext->m_AnimationID == 0xCE ||  weapons->m_GunDrive.m_pElement.get() != nullptr)
     {
         pGauge->m_GroundedFlags = 1; // Lock gauge
     }