From 02744e25694edd8c54bf55552c86797d72eab722 Mon Sep 17 00:00:00 2001 From: Amos Date: Thu, 19 May 2022 10:56:27 +0200 Subject: [PATCH] Fix alignment for SQVM struct --- r5dev/squirrel/sqvm.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/r5dev/squirrel/sqvm.h b/r5dev/squirrel/sqvm.h index cadfc681..68053aef 100644 --- a/r5dev/squirrel/sqvm.h +++ b/r5dev/squirrel/sqvm.h @@ -7,23 +7,6 @@ struct SQVM { - char pad0[0x8]; - SQVM* _vftable; - _BYTE gap0[12]; -#if !defined (GAMEDLL_S0) && !defined (GAMEDLL_S1) && !defined (GAMEDLL_S2) - _BYTE gap1[4]; - SQCONTEXT _contextidx; - _BYTE gap2[8]; -#endif - _BYTE gap3[30]; - void* _callstack; - void* unk0; - SQInteger _stackbase; - SQInteger unk5c; - SQSharedState* _sharedstate; - char gap4[16]; - int _top; - SQVM* GetVTable() const { return _vftable; @@ -34,6 +17,23 @@ struct SQVM return _contextidx; } #endif + + char pad0[0x8]; + SQVM* _vftable; + _BYTE gap0[12]; +#if !defined (GAMEDLL_S0) && !defined (GAMEDLL_S1) && !defined (GAMEDLL_S2) + _BYTE gap1[4]; + SQCONTEXT _contextidx; + _BYTE gap2[8]; +#endif + _BYTE gap3[22]; + void* _callstack; + void* unk0; + SQInteger _stackbase; + SQInteger unk5c; + SQSharedState* _sharedstate; + char gap4[16]; + int _top; }; typedef SQVM* HSQUIRRELVM;