mirror of
https://github.com/VCMP-SqMod/SqMod.git
synced 2025-02-20 19:57:12 +01:00
Backport some squirrel changes.
This commit is contained in:
parent
79bba3682f
commit
81e96c2c81
2
external/Squirrel/sqapi.cpp
vendored
2
external/Squirrel/sqapi.cpp
vendored
@ -978,7 +978,7 @@ SQRESULT sq_setdelegate(HSQUIRRELVM v,SQInteger idx)
|
||||
case OT_TABLE:
|
||||
if(sq_type(mt) == OT_TABLE) {
|
||||
if(!_table(self)->SetDelegate(_table(mt))) {
|
||||
return sq_throwerror(v, _SC("delagate cycle"));
|
||||
return sq_throwerror(v, _SC("delegate cycle"));
|
||||
}
|
||||
v->Pop();
|
||||
}
|
||||
|
4
external/Squirrel/sqfuncstate.cpp
vendored
4
external/Squirrel/sqfuncstate.cpp
vendored
@ -481,7 +481,6 @@ void SQFuncState::AddInstruction(SQInstruction &i)
|
||||
break;
|
||||
case _OP_GET:
|
||||
if( pi.op == _OP_LOAD && pi._arg0 == i._arg2 && (!IsLocal(pi._arg0))){
|
||||
pi._arg1 = pi._arg1;
|
||||
pi._arg2 = (unsigned char)i._arg1;
|
||||
pi.op = _OP_GETK;
|
||||
pi._arg0 = i._arg0;
|
||||
@ -493,7 +492,6 @@ void SQFuncState::AddInstruction(SQInstruction &i)
|
||||
if( pi.op == _OP_LOAD && pi._arg0 == i._arg1 && (!IsLocal(pi._arg0))){
|
||||
pi.op = _OP_PREPCALLK;
|
||||
pi._arg0 = i._arg0;
|
||||
pi._arg1 = pi._arg1;
|
||||
pi._arg2 = i._arg2;
|
||||
pi._arg3 = i._arg3;
|
||||
return;
|
||||
@ -511,7 +509,6 @@ void SQFuncState::AddInstruction(SQInstruction &i)
|
||||
if(aat != -1 && pi._arg0 == i._arg1 && (!IsLocal(pi._arg0))){
|
||||
pi.op = _OP_APPENDARRAY;
|
||||
pi._arg0 = i._arg0;
|
||||
pi._arg1 = pi._arg1;
|
||||
pi._arg2 = (unsigned char)aat;
|
||||
pi._arg3 = MAX_FUNC_STACKSIZE;
|
||||
return;
|
||||
@ -553,7 +550,6 @@ void SQFuncState::AddInstruction(SQInstruction &i)
|
||||
{
|
||||
pi.op = i.op;
|
||||
pi._arg0 = i._arg0;
|
||||
pi._arg1 = pi._arg1;
|
||||
pi._arg2 = i._arg2;
|
||||
pi._arg3 = MAX_FUNC_STACKSIZE;
|
||||
return;
|
||||
|
Loading…
x
Reference in New Issue
Block a user