MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-07-27 07:31:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant sq_resetobject() for SquirrelVM::lastError_

Browse Source 
The function_stub() resets it when used.
This commit is contained in:
Alexander 'z33ky' Hirsch 2025-06-24 20:56:26 +02:00
parent be3ad93edb
commit 9c38e4e295
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sp/src/vscript/vscript_squirrel.cpp
View File

@ -1460,8 +1460,6 @@ SQInteger function_stub(HSQUIRRELVM vm)
SquirrelVM* pSquirrelVM = (SquirrelVM*)sq_getsharedforeignptr(vm); SquirrelVM* pSquirrelVM = (SquirrelVM*)sq_getsharedforeignptr(vm);
Assert(pSquirrelVM); Assert(pSquirrelVM);
sq_resetobject(&pSquirrelVM->lastError_);
bool call_success = (*pFunc->m_pfnBinding)(pFunc->m_pFunction, instance, params.Base(), nargs, bool call_success = (*pFunc->m_pfnBinding)(pFunc->m_pFunction, instance, params.Base(), nargs,
pFunc->m_desc.m_ReturnType == FIELD_VOID ? nullptr : &script_retval, script_retval_storage); pFunc->m_desc.m_ReturnType == FIELD_VOID ? nullptr : &script_retval, script_retval_storage);
Assert(call_success); Assert(call_success);
@ -1555,29 +1553,27 @@ SQInteger constructor_stub(HSQUIRRELVM vm)
return sqstd_throwerrorf(vm, "Unable to construct instances of %s", pClassDesc->m_pszScriptName); return sqstd_throwerrorf(vm, "Unable to construct instances of %s", pClassDesc->m_pszScriptName);
} }
SQUserPointer p;
if (SQ_FAILED(sq_getinstanceup(vm, 1, &p, 0)))
{
return SQ_ERROR;
}
if (!p)
{
return sq_throwerror(vm, "Accessed null instance");
}
void* instance = pClassDesc->m_pfnConstruct();
#ifdef DBGFLAG_ASSERT
SquirrelVM* pSquirrelVM = (SquirrelVM*)sq_getsharedforeignptr(vm); SquirrelVM* pSquirrelVM = (SquirrelVM*)sq_getsharedforeignptr(vm);
Assert(pSquirrelVM); Assert(pSquirrelVM);
// expect construction to always succeed
Assert(sq_isnull(pSquirrelVM->lastError_));
#endif
sq_resetobject(&pSquirrelVM->lastError_); new(p) ClassInstanceData(instance, pClassDesc, nullptr, true);
{
SQUserPointer p;
if (SQ_FAILED(sq_getinstanceup(vm, 1, &p, 0)))
{
return SQ_ERROR;
}
if (!p)
{
return sq_throwerror(vm, "Accessed null instance");
}
void* instance = pClassDesc->m_pfnConstruct();
// expect construction to always succeed
Assert(sq_isnull(pSquirrelVM->lastError_));
new(p) ClassInstanceData(instance, pClassDesc, nullptr, true);
}
sq_setreleasehook(vm, 1, &destructor_stub); sq_setreleasehook(vm, 1, &destructor_stub);