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

Improve 'ScriptFunctionBinding_t' scrutcure

Browse Source 
* Map out more fields.
* Allocate on stack within register function.
* Create dedicated initializer.
* Add compile time assert for structure size.
This commit is contained in:
Kawe Mazidjatari 2023-05-01 21:54:50 +02:00
parent 955e027ad2
commit 2083093139
2 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
r5dev/squirrel/sqscript.cpp
View File

@ -34,20 +34,10 @@ SQRESULT Script_RegisterConstant(CSquirrelVM* s, const SQChar* name, SQInteger v
SQRESULT Script_RegisterFunction(CSquirrelVM* s, const SQChar* scriptname, const SQChar* nativename,
const SQChar* helpstring, const SQChar* returntype, const SQChar* parameters, void* functor)
{
ScriptFunctionBinding_t* binding = MemAllocSingleton()->Alloc<ScriptFunctionBinding_t>(sizeof(ScriptFunctionBinding_t));
memset(binding, '\0', sizeof(ScriptFunctionBinding_t));
binding->_scriptname = scriptname;
binding->_nativename = nativename;
binding->_helpstring = helpstring;
binding->_returntype = returntype;
binding->_parameters = parameters;
binding->_functor = functor;
binding->_nparamscheck = 5;
SQRESULT results = v_Script_RegisterFunction(s, binding, 1);
MemAllocSingleton()->Free<ScriptFunctionBinding_t>(binding);
ScriptFunctionBinding_t binding;
binding.Init(scriptname, nativename, helpstring, returntype, parameters, 5, functor);
SQRESULT results = v_Script_RegisterFunction(s, &binding, 1);
return results;
}

45
r5dev/squirrel/sqscript.h
View File

@ -9,40 +9,39 @@ struct ScriptFunctionBinding_t
const SQChar* _helpstring; // 10
const SQChar* _returntype; // 18
const SQChar* _parameters; // 20
std::int16_t unk28; // 28
bool _checkparams; // 28
bool unk29; // 29
std::int16_t padding1; // 2A
std::int32_t unk2c; // 2C
SQInteger unk2c; // 2C
const SQChar* _codehook; // 30
std::int32_t unk38; // 38
SQInteger unk38; // 38
SQInteger _nparamscheck; // 3C
std::int64_t unk40; // 40
std::int64_t unk48; // 48
std::int64_t unk50; // 50
std::int32_t unk58; // 58
std::int32_t padding3; // 5C
void* _functor; // 60
CUtlVector<SQChar> _vector;// Unknown, see 'r5apex.exe+105835B'
const void* _functor; // 60
ScriptFunctionBinding_t()
void Init(
const SQChar* scriptname, const SQChar* nativename,
const SQChar* helpstring, const SQChar* returntype,
const SQChar* parameters, const SQInteger nparamscheck,
const void* functor)
{
_scriptname = nullptr;
_nativename = nullptr;
_helpstring = nullptr;
_returntype = nullptr;
_parameters = nullptr;
unk28 = 0;
_scriptname = scriptname;
_nativename = nativename;
_helpstring = helpstring;
_returntype = returntype;
_parameters = parameters;
_checkparams = false;
unk29 = false;
padding1 = 0;
unk2c = 0;
_codehook = nullptr;
unk38 = 0;
_nparamscheck = 6;
unk40 = 0;
unk48 = 0;
unk50 = 0;
unk58 = 0;
padding3 = 0;
_functor = nullptr;
_nparamscheck = nparamscheck;
_vector.Init();
_functor = functor;
}
};
static_assert(sizeof(ScriptFunctionBinding_t) == 0x68);
#pragma pack(push, 4)
class CSquirrelVM