R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix CBaseAnimating and CPlayer structure alignment

Browse Source 
This change creates correct assembly output.
This commit is contained in:
Kawe Mazidjatari 2023-01-19 02:02:42 +01:00
parent c0d9d4462b
commit b21fa6b665
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/game/server/baseanimating.h
View File

@ -16,7 +16,7 @@
class CBaseAnimating : public CBaseEntity 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_markedForServerInterpolation;
bool m_animRemoveFromServerInterpolationNextFrame; bool m_animRemoveFromServerInterpolationNextFrame;
char gap_b12[2]; char gap_b12[2];

5
r5dev/public/baseentity.h
View File

@ -32,7 +32,7 @@ class CBaseEntity : public IServerEntity
CServerNetworkProperty m_Network; CServerNetworkProperty m_Network;
__int64 m_ModelName; __int64 m_ModelName;
int m_entIndex; 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; __int64 m_iClassname;
float m_flAnimTime; float m_flAnimTime;
float m_flSimulationTime; float m_flSimulationTime;
@ -121,7 +121,7 @@ class CBaseEntity : public IServerEntity
char gap_3ad[3]; char gap_3ad[3];
int m_baseSolidType; int m_baseSolidType;
char gap_3b4[4]; char gap_3b4[4];
char m_pPhysicsObject[8]; void* m_pPhysicsObject;
float m_flNavIgnoreUntilTime; float m_flNavIgnoreUntilTime;
int m_hGroundEntity; int m_hGroundEntity;
float m_flGroundChangeTime; float m_flGroundChangeTime;
@ -238,5 +238,4 @@ class CBaseEntity : public IServerEntity
int m_realmsTransmitMaskCachedSerialNumber; int m_realmsTransmitMaskCachedSerialNumber;
}; };
#endif // BASEENTITY_H #endif // BASEENTITY_H