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

Fallback if IScriptInstanceHelper::Get/Set are not implemented

Browse Source
This commit is contained in:
samisalreadytaken 2025-07-01 20:09:45 +03:00
parent 985ebc0dbb
commit 69b68fa2ac
1 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1604,7 +1604,19 @@ SQInteger get_stub(HSQUIRRELVM vm)
} }
else else
{ {
sq_retval = sqstd_throwerrorf(vm, "the index '%.50s' does not exist", key); // Fallback
// Extra stack variables don't need to be popped, they are cleaned up on exit
sq_pushroottable(vm);
sq_push(vm, -2);
if ( SQ_SUCCEEDED( sq_rawget(vm, -2) ) )
{
sq_retval = 1;
}
else
{
sq_retval = sqstd_throwerrorf(vm, "the index '%.50s' does not exist", key);
}
} }
var.Free(); var.Free();
@ -1635,11 +1647,24 @@ SQInteger set_stub(HSQUIRRELVM vm)
classInstanceData->desc->pHelper->Set(classInstanceData->instance, key, var) classInstanceData->desc->pHelper->Set(classInstanceData->instance, key, var)
)) ))
{ {
sq_retval = sqstd_throwerrorf(vm, "the index '%.50s' does not exist", key); // Fallback
sq_pushroottable(vm);
sq_push(vm, -3);
sq_push(vm, -3);
if ( SQ_SUCCEEDED( sq_rawset(vm, -3) ) )
{
// rawset doesn't return correctly, pop env to return val
sq_pop(vm, 1);
sq_retval = 1;
}
else
{
sq_retval = sqstd_throwerrorf(vm, "the index '%.50s' does not exist", key);
}
} }
var.Free(); var.Free();
sq_pop(vm, 1);
return sq_retval; return sq_retval;
} }
@ -2515,13 +2540,16 @@ bool SquirrelVM::RegisterClass(ScriptClassDesc_t* pClassDesc)
sq_newclosure(vm_, tostring_stub, 0); sq_newclosure(vm_, tostring_stub, 0);
sq_newslot(vm_, -3, SQFalse); sq_newslot(vm_, -3, SQFalse);
sq_pushstring(vm_, "_get", -1); if ( pClassDesc->pHelper )
sq_newclosure(vm_, get_stub, 0); {
sq_newslot(vm_, -3, SQFalse); sq_pushstring(vm_, "_get", -1);
sq_newclosure(vm_, get_stub, 0);
sq_newslot(vm_, -3, SQFalse);
sq_pushstring(vm_, "_set", -1); sq_pushstring(vm_, "_set", -1);
sq_newclosure(vm_, set_stub, 0); sq_newclosure(vm_, set_stub, 0);
sq_newslot(vm_, -3, SQFalse); sq_newslot(vm_, -3, SQFalse);
}
sq_pushstring(vm_, "IsValid", -1); sq_pushstring(vm_, "IsValid", -1);
sq_newclosure(vm_, IsValid_stub, 0); sq_newclosure(vm_, IsValid_stub, 0);