mirror of
https://github.com/mapbase-source/source-sdk-2013.git
synced 2025-07-27 07:31:49 +03:00
Remove redundant sq_resetobject() for SquirrelVM::lastError_
The function_stub() resets it when used.
This commit is contained in:
parent
be3ad93edb
commit
9c38e4e295
@ -1460,8 +1460,6 @@ SQInteger function_stub(HSQUIRRELVM vm)
|
||||
SquirrelVM* pSquirrelVM = (SquirrelVM*)sq_getsharedforeignptr(vm);
|
||||
Assert(pSquirrelVM);
|
||||
|
||||
sq_resetobject(&pSquirrelVM->lastError_);
|
||||
|
||||
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);
|
||||
Assert(call_success);
|
||||
@ -1555,11 +1553,6 @@ SQInteger constructor_stub(HSQUIRRELVM vm)
|
||||
return sqstd_throwerrorf(vm, "Unable to construct instances of %s", pClassDesc->m_pszScriptName);
|
||||
}
|
||||
|
||||
SquirrelVM* pSquirrelVM = (SquirrelVM*)sq_getsharedforeignptr(vm);
|
||||
Assert(pSquirrelVM);
|
||||
|
||||
sq_resetobject(&pSquirrelVM->lastError_);
|
||||
{
|
||||
SQUserPointer p;
|
||||
if (SQ_FAILED(sq_getinstanceup(vm, 1, &p, 0)))
|
||||
{
|
||||
@ -1573,11 +1566,14 @@ SQInteger constructor_stub(HSQUIRRELVM vm)
|
||||
|
||||
void* instance = pClassDesc->m_pfnConstruct();
|
||||
|
||||
#ifdef DBGFLAG_ASSERT
|
||||
SquirrelVM* pSquirrelVM = (SquirrelVM*)sq_getsharedforeignptr(vm);
|
||||
Assert(pSquirrelVM);
|
||||
// expect construction to always succeed
|
||||
Assert(sq_isnull(pSquirrelVM->lastError_));
|
||||
#endif
|
||||
|
||||
new(p) ClassInstanceData(instance, pClassDesc, nullptr, true);
|
||||
}
|
||||
|
||||
sq_setreleasehook(vm, 1, &destructor_stub);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user