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

Align and use SQVM struct for builds below S3

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-05-27 14:39:29 +02:00
parent e6ef3d71f1
commit 7db3e16a97
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
r5dev/squirrel/sqapi.cpp
View File

@ -11,17 +11,13 @@
//---------------------------------------------------------------------------------
SQChar* sq_getstring(HSQUIRRELVM v, SQInteger i)
{
std::uintptr_t thisptr = reinterpret_cast<std::uintptr_t>(v);
return *(char**)(*(std::int64_t*)(thisptr + 0x58) + 0x10 * i + 0x8) + 0x40;
return *(char**)(*(std::int64_t*)(v->_stackbase) + 0x10 * i + 0x8) + 0x40;
}
//---------------------------------------------------------------------------------
SQInteger sq_getinteger(HSQUIRRELVM v, SQInteger i)
{
std::uintptr_t thisptr = reinterpret_cast<std::uintptr_t>(v);
return *(SQInteger*)(*(std::int64_t*)(thisptr + 0x58) + 0x10 * i + 0x8);
return *(SQInteger*)(*(std::int64_t*)(v->_stackbase) + 0x10 * i + 0x8);
}
//---------------------------------------------------------------------------------

2
r5dev/squirrel/sqvm.h
View File

@ -23,8 +23,8 @@ struct SQVM
#if !defined (GAMEDLL_S0) && !defined (GAMEDLL_S1) && !defined (GAMEDLL_S2)
SQCONTEXT _contextidx;
_BYTE gap001[8];
#endif
_BYTE gap002[4];
#endif
void* _ncvftable;
void* _table;
_BYTE gap003[14];