mmo-ref/og-northstar-launcher
1
0
Fork 0
mirror of https://github.com/R2Northstar/NorthstarLauncher synced 2026-08-23 20:26:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fmt

Browse source
This commit is contained in:
Allusive 2026-08-20 19:44:20 +00:00
parent c641976b83
commit ff8a9334e0
2 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
primedev/squirrel/squirrel.cpp
View file

@ -339,8 +339,7 @@ template <ScriptContext context> std::int64_t __fastcall SQCompiler_ParseDirecti
template <ScriptContext context>
bool (*SQCompiler_ResolveLocalOrConstant)(void* pFunctionState, SQObject* pIdentifier, SQObject* pValue, std::uintptr_t* pType);
template <ScriptContext context>
bool __fastcall SQCompiler_ResolveLocalOrConstantHook(
void* pFunctionState, SQObject* pIdentifier, SQObject* pValue, std::uintptr_t* pType)
bool __fastcall SQCompiler_ResolveLocalOrConstantHook(void* pFunctionState, SQObject* pIdentifier, SQObject* pValue, std::uintptr_t* pType)
{
if (SQCompiler_ResolveLocalOrConstant<context>(pFunctionState, pIdentifier, pValue, pType))
return true;
@ -823,10 +822,12 @@ ON_DLL_LOAD_RELIESON("client.dll", ClientSquirrel, ConCommand, (CModule module))
MAKEHOOK(module.Offset(0x8AD0), &sq_compiler_createHook<ScriptContext::CLIENT>, &sq_compiler_create<ScriptContext::CLIENT>);
MAKEHOOK(module.Offset(0x58590), &SQCompiler_ParseDirectiveHook<ScriptContext::CLIENT>,
&SQCompiler_ParseDirective<ScriptContext::CLIENT>);
MAKEHOOK(module.Offset(0x65CB0), &SQCompiler_ResolveLocalOrConstantHook<ScriptContext::CLIENT>,
&SQCompiler_ResolveLocalOrConstant<ScriptContext::CLIENT>);
MAKEHOOK(
module.Offset(0x58590), &SQCompiler_ParseDirectiveHook<ScriptContext::CLIENT>, &SQCompiler_ParseDirective<ScriptContext::CLIENT>);
MAKEHOOK(
module.Offset(0x65CB0),
&SQCompiler_ResolveLocalOrConstantHook<ScriptContext::CLIENT>,
&SQCompiler_ResolveLocalOrConstant<ScriptContext::CLIENT>);
MAKEHOOK(module.Offset(0x12B00), &SQPrintHook<ScriptContext::CLIENT>, &SQPrint<ScriptContext::CLIENT>);
MAKEHOOK(module.Offset(0x12BA0), &SQPrintHook<ScriptContext::UI>, &SQPrint<ScriptContext::UI>);
@ -907,10 +908,12 @@ ON_DLL_LOAD_RELIESON("server.dll", ServerSquirrel, ConCommand, (CModule module))
MAKEHOOK(module.Offset(0x8AA0), &sq_compiler_createHook<ScriptContext::SERVER>, &sq_compiler_create<ScriptContext::SERVER>);
MAKEHOOK(module.Offset(0x58530), &SQCompiler_ParseDirectiveHook<ScriptContext::SERVER>,
&SQCompiler_ParseDirective<ScriptContext::SERVER>);
MAKEHOOK(module.Offset(0x65C50), &SQCompiler_ResolveLocalOrConstantHook<ScriptContext::SERVER>,
&SQCompiler_ResolveLocalOrConstant<ScriptContext::SERVER>);
MAKEHOOK(
module.Offset(0x58530), &SQCompiler_ParseDirectiveHook<ScriptContext::SERVER>, &SQCompiler_ParseDirective<ScriptContext::SERVER>);
MAKEHOOK(
module.Offset(0x65C50),
&SQCompiler_ResolveLocalOrConstantHook<ScriptContext::SERVER>,
&SQCompiler_ResolveLocalOrConstant<ScriptContext::SERVER>);
MAKEHOOK(module.Offset(0x1FE90), &SQPrintHook<ScriptContext::SERVER>, &SQPrint<ScriptContext::SERVER>);
MAKEHOOK(module.Offset(0x260E0), &CreateNewVMHook<ScriptContext::SERVER>, &CreateNewVM<ScriptContext::SERVER>);

12
primedev/squirrel/squirrelautobind.h
View file

@ -21,16 +21,16 @@ class __squirrelautobind;
__squirrelautobind CONCAT2(__squirrelautobind, __LINE__)( \
[]() \
{ \
if constexpr ((runOnContext)&ScriptContext::UI) \
if constexpr ((runOnContext) & ScriptContext::UI) \
g_pSquirrel[ScriptContext::UI]->AddFuncRegistration( \
returnType, __STR(funcName), argTypes, helpText, CONCAT2(Script_, funcName) < ScriptContext::UI >); \
if constexpr ((runOnContext)&ScriptContext::CLIENT) \
if constexpr ((runOnContext) & ScriptContext::CLIENT) \
g_pSquirrel[ScriptContext::CLIENT]->AddFuncRegistration( \
returnType, __STR(funcName), argTypes, helpText, CONCAT2(Script_, funcName) < ScriptContext::CLIENT >); \
}, \
[]() \
{ \
if constexpr ((runOnContext)&ScriptContext::SERVER) \
if constexpr ((runOnContext) & ScriptContext::SERVER) \
g_pSquirrel[ScriptContext::SERVER]->AddFuncRegistration( \
returnType, __STR(funcName), argTypes, helpText, CONCAT2(Script_, funcName) < ScriptContext::SERVER >); \
}); \
@ -44,15 +44,15 @@ class __squirrelautobind;
__squirrelautobind CONCAT2(__squirrelautobind, __LINE__)( \
[]() \
{ \
if constexpr ((runOnContext)&ScriptContext::UI) \
if constexpr ((runOnContext) & ScriptContext::UI) \
g_pSquirrel[ScriptContext::UI]->AddFuncOverride(__STR(funcName), CONCAT2(Script_, funcName) < ScriptContext::UI >); \
if constexpr ((runOnContext)&ScriptContext::CLIENT) \
if constexpr ((runOnContext) & ScriptContext::CLIENT) \
g_pSquirrel[ScriptContext::CLIENT]->AddFuncOverride( \
__STR(funcName), CONCAT2(Script_, funcName) < ScriptContext::CLIENT >); \
}, \
[]() \
{ \
if constexpr ((runOnContext)&ScriptContext::SERVER) \
if constexpr ((runOnContext) & ScriptContext::SERVER) \
g_pSquirrel[ScriptContext::SERVER]->AddFuncOverride( \
__STR(funcName), CONCAT2(Script_, funcName) < ScriptContext::SERVER >); \
}); \