Fix Shadow Bike Projectile for HFR (#157)

* Clean-up (#164)

* API: vehicle research

* Api #2

* BulletCollisionFix

* Clean-up and fixed 60fps not spawning in weapons

---------

Co-authored-by: ReimousTH <reimousth@gmail.com>
Co-authored-by: Hyper <34012267+hyperbx@users.noreply.github.com>

Author: 3 people

MarathonRecomp/api/Marathon.h

@@ -30,6 +30,9 @@
 #include "Sonicteam/CsdResource.h"
 #include "Sonicteam/DocMarathonImp.h"
 #include "Sonicteam/DocMarathonState.h"
+#include "Sonicteam/Enemy/EnemyShot.h"
+#include "Sonicteam/Enemy/EnemyShotNormal.h"
+#include "Sonicteam/Enemy/EnemyShotPoint.h"
 #include "Sonicteam/GameImp.h"
 #include "Sonicteam/GameMode.h"
 #include "Sonicteam/Globals.h"
@@ -59,7 +62,11 @@
 #include "Sonicteam/MyPhantom.h"
 #include "Sonicteam/MyTexture.h"
 #include "Sonicteam/MyTransforms.h"
+#include "Sonicteam/NamedActor.h"
+#include "Sonicteam/NamedTask.h"
 #include "Sonicteam/NoSyncThread.h"
+#include "Sonicteam/ObjectVehicle.h"
+#include "Sonicteam/ObjectVehicleBike.h"
 #include "Sonicteam/Player/IDynamicLink.h"
 #include "Sonicteam/Player/IExportExternalFlag.h"
 #include "Sonicteam/Player/IExportPostureRequestFlag.h"
@@ -115,6 +122,7 @@
 #include "Sonicteam/SoX/IResource2.h"
 #include "Sonicteam/SoX/IResourceMgr.h"
 #include "Sonicteam/SoX/Input/Manager.h"
+#include "Sonicteam/SoX/LinkNode.h"
 #include "Sonicteam/SoX/Math/Matrix.h"
 #include "Sonicteam/SoX/Math/Quaternion.h"
 #include "Sonicteam/SoX/Math/Vector.h"
@@ -149,18 +157,27 @@
 #include "Sonicteam/TextFontPicture.h"
 #include "Sonicteam/TextFontPictureMgr.h"
 #include "Sonicteam/TitleTask.h"
+#include "Sonicteam/VehicleMissileCtrl.h"
+#include "Sonicteam/VehicleMissileCtrlAutomatic.h"
+#include "Sonicteam/VehicleMissileCtrlSingle.h"
 #include "boost/smart_ptr/make_shared_object.h"
 #include "boost/smart_ptr/shared_ptr.h"
 #include "hk330/hkArray.h"
 #include "hk330/hkReferencedObject.h"
 #include "hk330/hkpBroadPhaseHandle.h"
 #include "hk330/hkpCdBody.h"
 #include "hk330/hkpCollidable.h"
+#include "hk330/hkpCollidableCollidableFilter.h"
+#include "hk330/hkpCollisionFilter.h"
 #include "hk330/hkpEntity.h"
 #include "hk330/hkpLinkedCollidable.h"
+#include "hk330/hkpPhantom.h"
 #include "hk330/hkpProperty.h"
+#include "hk330/hkpRayCollidableFilter.h"
+#include "hk330/hkpRayShapeCollectionFilter.h"
 #include "hk330/hkpRigidBody.h"
 #include "hk330/hkpShape.h"
+#include "hk330/hkpShapeCollectionFilter.h"
 #include "hk330/hkpTypedBroadPhaseHandle.h"
 #include "hk330/hkpWorld.h"
 #include "hk330/hkpWorldObject.h"

MarathonRecomp/api/Sonicteam/Enemy/EnemyShot.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <Marathon.inl>
+
+namespace Sonicteam::Enemy
+{
+    class EnemyShot : public SoX::Engine::Task
+    {
+    public:
+        MARATHON_INSERT_PADDING(0x1C);
+    };
+}

MarathonRecomp/api/Sonicteam/Enemy/EnemyShotNormal.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/Enemy/EnemyShotPoint.h>
+
+namespace Sonicteam::Enemy
+{
+    class EnemyShotNormal : public EnemyShotPoint {};
+}

MarathonRecomp/api/Sonicteam/Enemy/EnemyShotPoint.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/MyPhantom.h>
+#include <Sonicteam/SoX/RefCountObject.h>
+#include <Sonicteam/SoX/RefSharedPointer.h>
+
+namespace Sonicteam::Enemy
+{
+    class EnemyShotPoint : public EnemyShot
+    {
+    public:
+        MARATHON_INSERT_PADDING(0x20);
+        SoX::RefSharedPointer<MyPhantom> m_spPhantom;
+        MARATHON_INSERT_PADDING(0xD4);
+    };
+}

MarathonRecomp/api/Sonicteam/NamedActor.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/Actor.h>
+#include <stdx/string.h>
+
+namespace Sonicteam
+{
+    class NamedActor : public Actor
+    {
+    public:
+        stdx::string m_Name;
+    };
+}

MarathonRecomp/api/Sonicteam/NamedTask.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/SoX/Engine/Task.h>
+#include <stdx/string.h>
+
+namespace Sonicteam
+{
+    class NamedTask : public SoX::Engine::Task
+    {
+    public:
+        stdx::string m_Name;
+    };
+}

MarathonRecomp/api/Sonicteam/ObjectVehicle.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <Marathon.inl>
+
+namespace Sonicteam
+{
+    class ObjectVehicle : public Actor
+    {
+    public:
+        MARATHON_INSERT_PADDING(0x180);
+    };
+}

MarathonRecomp/api/Sonicteam/ObjectVehicleBike.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <Marathon.inl>
+#include <Sonicteam/VehicleMissileCtrlAutomatic.h>
+
+namespace Sonicteam
+{
+    class ObjectVehicleBike : public ObjectVehicle
+    {
+    public:
+        MARATHON_INSERT_PADDING(0xD8);
+        xpointer<VehicleMissileCtrlAutomatic> m_pVehicleMissileCtrlAutomatic;
+    };
+}

MarathonRecomp/api/Sonicteam/SoX/Engine/Doc.h

@@ -2,6 +2,7 @@
 
 #include <Marathon.inl>
 #include <Sonicteam/SoX/Engine/DocMode.h>
+#include <Sonicteam/SoX/Engine/Task.h>
 
 namespace Sonicteam::SoX::Engine
 {

MarathonRecomp/api/Sonicteam/SoX/Engine/Task.h

@@ -2,13 +2,41 @@
 
 #include <Marathon.inl>
 #include <Sonicteam/SoX/Component.h>
+#include <Sonicteam/SoX/LinkNode.h>
 #include <Sonicteam/SoX/MessageReceiver.h>
 
 namespace Sonicteam::SoX::Engine
 {
+    class Doc;
+
     class Task : public Component, public MessageReceiver
     {
     public:
-        MARATHON_INSERT_PADDING(0x28);
+        be<uint32_t> m_Flags;
+        be<uint32_t> m_Timestamp;
+        xpointer<Task> m_pPrevSibling;
+        xpointer<Task> m_pNextSibling;
+        xpointer<Task> m_pDependency;
+        xpointer<Task> m_pDependencies;
+        xpointer<Doc> m_pDoc;
+        LinkNode<Task> m_lnTask;
+
+        Task* GetFirstDependency() const 
+        {
+            if (!m_pDependencies)
+                return nullptr;
+
+            auto pCurrent = m_pDependencies.get();
+
+            while (pCurrent->m_pPrevSibling && pCurrent->m_pPrevSibling != m_pDependencies.get())
+                pCurrent = pCurrent->m_pPrevSibling.get();
+
+            return pCurrent;
+        }
+
+        Task* GetLastDependency() const
+        {
+            return m_pDependencies.get();
+        }
     };
 }