Updated sqrat dependency to 3.2 squirrel version
This commit is contained in:
4
dependencies/sqrat/include/sqmodule.h
vendored
4
dependencies/sqrat/include/sqmodule.h
vendored
@@ -113,10 +113,10 @@ extern "C" {
|
|||||||
SQRESULT (*gettypetag)(HSQUIRRELVM v,SQInteger idx,SQUserPointer *typetag);
|
SQRESULT (*gettypetag)(HSQUIRRELVM v,SQInteger idx,SQUserPointer *typetag);
|
||||||
void (*setreleasehook)(HSQUIRRELVM v,SQInteger idx,SQRELEASEHOOK hook);
|
void (*setreleasehook)(HSQUIRRELVM v,SQInteger idx,SQRELEASEHOOK hook);
|
||||||
SQChar* (*getscratchpad)(HSQUIRRELVM v,SQInteger minsize);
|
SQChar* (*getscratchpad)(HSQUIRRELVM v,SQInteger minsize);
|
||||||
SQRESULT (*getclosureinfo)(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger *nparams,SQUnsignedInteger *nfreevars);
|
SQRESULT (*getclosureinfo)(HSQUIRRELVM v,SQInteger idx,SQInteger *nparams,SQInteger *nfreevars);
|
||||||
SQRESULT (*setnativeclosurename)(HSQUIRRELVM v,SQInteger idx,const SQChar *name);
|
SQRESULT (*setnativeclosurename)(HSQUIRRELVM v,SQInteger idx,const SQChar *name);
|
||||||
SQRESULT (*setinstanceup)(HSQUIRRELVM v, SQInteger idx, SQUserPointer p);
|
SQRESULT (*setinstanceup)(HSQUIRRELVM v, SQInteger idx, SQUserPointer p);
|
||||||
SQRESULT (*getinstanceup)(HSQUIRRELVM v, SQInteger idx, SQUserPointer *p,SQUserPointer typetag);
|
SQRESULT (*getinstanceup)(HSQUIRRELVM v, SQInteger idx, SQUserPointer *p,SQUserPointer typetag, SQBool throwerror);
|
||||||
SQRESULT (*setclassudsize)(HSQUIRRELVM v, SQInteger idx, SQInteger udsize);
|
SQRESULT (*setclassudsize)(HSQUIRRELVM v, SQInteger idx, SQInteger udsize);
|
||||||
SQRESULT (*newclass)(HSQUIRRELVM v,SQBool hasbase);
|
SQRESULT (*newclass)(HSQUIRRELVM v,SQBool hasbase);
|
||||||
SQRESULT (*createinstance)(HSQUIRRELVM v,SQInteger idx);
|
SQRESULT (*createinstance)(HSQUIRRELVM v,SQInteger idx);
|
||||||
|
|||||||
@@ -216,7 +216,7 @@ public:
|
|||||||
classType = getStaticClassData().Lock().Get();
|
classType = getStaticClassData().Lock().Get();
|
||||||
|
|
||||||
#if !defined (SCRAT_NO_ERROR_CHECKING)
|
#if !defined (SCRAT_NO_ERROR_CHECKING)
|
||||||
if (SQ_FAILED(sq_getinstanceup(vm, idx, (SQUserPointer*)&instance, classType))) {
|
if (SQ_FAILED(sq_getinstanceup(vm, idx, (SQUserPointer*)&instance, classType, SQTrue))) {
|
||||||
SQTHROW(vm, FormatTypeError(vm, idx, ClassName()));
|
SQTHROW(vm, FormatTypeError(vm, idx, ClassName()));
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1279,8 +1279,8 @@ public:
|
|||||||
sq_pushobject(vm, env);
|
sq_pushobject(vm, env);
|
||||||
|
|
||||||
#if !defined (SCRAT_NO_ERROR_CHECKING)
|
#if !defined (SCRAT_NO_ERROR_CHECKING)
|
||||||
SQUnsignedInteger nparams;
|
SQInteger nparams;
|
||||||
SQUnsignedInteger nfreevars;
|
SQInteger nfreevars;
|
||||||
if (obj._type != OT_NATIVECLOSURE &&
|
if (obj._type != OT_NATIVECLOSURE &&
|
||||||
SQ_SUCCEEDED(sq_getclosureinfo(vm, -2, &nparams, &nfreevars)) && (nparams != 1)) {
|
SQ_SUCCEEDED(sq_getclosureinfo(vm, -2, &nparams, &nfreevars)) && (nparams != 1)) {
|
||||||
sq_pop(vm, 2);
|
sq_pop(vm, 2);
|
||||||
|
|||||||
Reference in New Issue
Block a user