From b21fa6b665dfe57203d8ba92748d1288aae08021 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Thu, 19 Jan 2023 02:02:42 +0100
Subject: [PATCH] Fix CBaseAnimating and CPlayer structure alignment

This change creates correct assembly output.
---
 r5dev/game/server/baseanimating.h | 2 +-
 r5dev/public/baseentity.h         | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/r5dev/game/server/baseanimating.h b/r5dev/game/server/baseanimating.h
index a997a779..86c2a9c7 100644
--- a/r5dev/game/server/baseanimating.h
+++ b/r5dev/game/server/baseanimating.h
@@ -16,7 +16,7 @@
 
 class CBaseAnimating : public CBaseEntity
 {
-	char gap_b04[12];
+	char gap_b04[8]; // Aligns properly in IDA and generated code after setting from 12 to 8.
 	bool m_markedForServerInterpolation;
 	bool m_animRemoveFromServerInterpolationNextFrame;
 	char gap_b12[2];
diff --git a/r5dev/public/baseentity.h b/r5dev/public/baseentity.h
index b89643f1..6e5fc501 100644
--- a/r5dev/public/baseentity.h
+++ b/r5dev/public/baseentity.h
@@ -32,7 +32,7 @@ class CBaseEntity : public IServerEntity
 	CServerNetworkProperty m_Network;
 	__int64 m_ModelName;
 	int m_entIndex;
-	char gap_74[8];
+	char gap_74[8]; // Aligns properly in IDA and generated code after setting from 4 to 8.
 	__int64 m_iClassname;
 	float m_flAnimTime;
 	float m_flSimulationTime;
@@ -121,7 +121,7 @@ class CBaseEntity : public IServerEntity
 	char gap_3ad[3];
 	int m_baseSolidType;
 	char gap_3b4[4];
-	char m_pPhysicsObject[8];
+	void* m_pPhysicsObject;
 	float m_flNavIgnoreUntilTime;
 	int m_hGroundEntity;
 	float m_flGroundChangeTime;
@@ -238,5 +238,4 @@ class CBaseEntity : public IServerEntity
 	int m_realmsTransmitMaskCachedSerialNumber;
 };
 
-
 #endif // BASEENTITY_H