fix: linux movedata (#79)

* fix: linux movedata

* xd

* smh

Author: Nukoooo

Engine/src/cstrike/type/CMoveData.h

@@ -59,7 +59,6 @@ struct SubtickAttack
     uint64_t button;
     bool     pressed;
 };
-
 #pragma pack(push, 1)
 class CMoveData
 {
@@ -102,24 +101,32 @@ class CMoveData
     int32_t                 m_nFullMoveEndTick;        // 0xd8
     float                   m_flFullMoveStartFraction; // 0xdc
     float                   m_flFullMoveEndFraction;   // 0xe0
-
+#ifdef PLATFORM_WINDOWS
 private:
     [[maybe_unused]] uint8_t m_pad_0xe4[4]; // 0xe4
+#endif
 
 public:
-    Vector m_outWishVel;           // 0xe8
-    Vector m_vecOldAngles;         // 0xf4
-    Vector m_vecInputRotated;      // 0x100
-    Vector m_vecAccel;             // 0x10c
-    Vector m_vecAccelPerSecond;    // 0x118
-    float  m_flMaxSpeed;           // 0x124
-    float  m_flClientMaxSpeed;     // 0x128
-    float  m_flSubtickFraction;    // 0x12c
-    bool   m_bInAir;               // 0x130
-    bool   m_bGameCodeMovedPlayer; // 0x131
-
-}; // Size: 0x132
+    Vector m_outWishVel;        // Win: 0xe8  | Lin: 0xe4
+    Vector m_vecOldAngles;      // Win: 0xf4  | Lin: 0xf0
+    Vector m_vecInputRotated;   // Win: 0x100 | Lin: 0xfc
+    Vector m_vecAccel;          // Win: 0x10c | Lin: 0x108
+    Vector m_vecAccelPerSecond; // Win: 0x118 | Lin: 0x114
+    float  m_flMaxSpeed;        // Win: 0x124 | Lin: 0x120
+    float  m_flClientMaxSpeed;  // Win: 0x128 | Lin: 0x124
+    float  m_flSubtickFraction; // Win: 0x12c | Lin: 0x128
+private:
+    char pad_130[12]; // Win: 0x130 | Lin: 0x12c
+
+public:
+    bool m_bInAir;               // Win: 0x13C | Lin: 0x138
+    bool m_bGameCodeMovedPlayer; // Win: 0x13D | Lin: 0x139
+
+}; // Size Win: 0x13E | Lin: 0x13A
 #pragma pack(pop)
-static_assert(sizeof(CMoveData) == 0x132, "sizeof(CMoveData) != 0x132");
+
+#ifdef PLATFORM_WINDOWS
+static_assert(sizeof(CMoveData) == 0x13E, "sizeof(CMoveData) != 0x13E");
+#endif
 
 #endif

Engine/src/hook/extern/MovementManager.cpp

@@ -203,9 +203,9 @@ BeginMemberHookScope(CCSPlayer_MovementServices)
         g_flReplaceMaxSpeed     = CStrikeMaxSpeed;
     }
 
-    DeclareMemberDetourHook(Accelerate, void, (CCSPlayer_MovementServices * pService, CMoveData * pMoveData, float a3, float* a4, float a5, float a6))
+    DeclareMemberDetourHook(Accelerate, void, (CCSPlayer_MovementServices * pService, CMoveData * pMoveData, float flFrameTime, Vector* vecRight, float flWishSpeed, float flAccelerate))
     {
-        Accelerate(pService, pMoveData, a3, a4, a5, a6);
+        Accelerate(pService, pMoveData, flFrameTime, vecRight, flWishSpeed, flAccelerate);
 
         if (g_bInWalkMove)
         {

Sharp.Shared/Types/MoveData.cs

@@ -17,15 +17,20 @@
  * along with ModSharp. If not, see <https://www.gnu.org/licenses/>.
  */
 
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Sharp.Shared.Enums;
 using Sharp.Shared.Types.Tier;
 
 namespace Sharp.Shared.Types;
 
-[StructLayout(LayoutKind.Explicit, Pack = 1, Size = 0x132)]
+[StructLayout(LayoutKind.Explicit, Pack = 1)]
 public struct MoveData
 {
+    // Windows has a 4-byte pad at 0xe4 that Linux does not
+    private static readonly nint PlatformOffset =
+        RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? -4 : 0;
+
     [FieldOffset(0x0)]
     public byte MoveDataFlags;
 
@@ -62,17 +67,40 @@ public struct MoveData
     [FieldOffset(0xc8)]
     public Vector AbsOrigin;
 
-    [FieldOffset(0xe8)]
-    public Vector OutWishVel;
-
-    [FieldOffset(0x124)]
-    public float MaxSpeed;
-
-    [FieldOffset(0x118)]
-    public float ClientMaxSpeed;
-
-    [FieldOffset(0x130)]
-    public bool InAir;
+    private unsafe ref byte Base
+    {
+        get
+        {
+            fixed (void* ptr = &this)
+            {
+                return ref Unsafe.AsRef<byte>(ptr);
+            }
+        }
+    }
+
+    public Vector OutWishVel // Win: 0xe8
+    {
+        get => Unsafe.ReadUnaligned<Vector>(ref Unsafe.AddByteOffset(ref Base, 0xe8 + PlatformOffset));
+        set => Unsafe.WriteUnaligned(ref Unsafe.AddByteOffset(ref Base,        0xe8 + PlatformOffset), value);
+    }
+
+    public float MaxSpeed // Win: 0x124
+    {
+        get => Unsafe.ReadUnaligned<float>(ref Unsafe.AddByteOffset(ref Base, 0x124 + PlatformOffset));
+        set => Unsafe.WriteUnaligned(ref Unsafe.AddByteOffset(ref Base,       0x124 + PlatformOffset), value);
+    }
+
+    public float ClientMaxSpeed // Win: 0x128
+    {
+        get => Unsafe.ReadUnaligned<float>(ref Unsafe.AddByteOffset(ref Base, 0x128 + PlatformOffset));
+        set => Unsafe.WriteUnaligned(ref Unsafe.AddByteOffset(ref Base,       0x128 + PlatformOffset), value);
+    }
+
+    public bool InAir // Win: 0x13C
+    {
+        get => Unsafe.ReadUnaligned<bool>(ref Unsafe.AddByteOffset(ref Base, 0x13C + PlatformOffset));
+        set => Unsafe.WriteUnaligned(ref Unsafe.AddByteOffset(ref Base,      0x13C + PlatformOffset), value);
+    }
 }
 
 [StructLayout(LayoutKind.Explicit, Size = 24, Pack = 8)]