celisej567/source-sdk-2013
1
0
Fork 0
mirror of https://github.com/celisej567/source-sdk-2013.git synced 2026-09-23 20:09:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #172 from samisalreadytaken/sq-typemask

Browse Source 
vscript fixes and additions
This commit is contained in:
Blixibon
2022-04-28 13:16:23 -05:00
committed by GitHub
parent e7c61320a5 493ff43ffe
commit 1143570f3e
18 changed files with 727 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1091,7 +1091,8 @@ bool CreateParamCheck(const ScriptFunctionBinding_t& func, char* output)
switch (func.m_desc.m_Parameters[i])
{
case FIELD_FLOAT:
*output++ = 'n'; // NOTE: Can be int or float
case FIELD_INTEGER:
*output++ = 'n';
break;
case FIELD_CSTRING:
*output++ = 's';
@@ -1099,9 +1100,6 @@ bool CreateParamCheck(const ScriptFunctionBinding_t& func, char* output)
case FIELD_VECTOR:
*output++ = 'x'; // Generic instance, we validate on arrival
break;
case FIELD_INTEGER:
*output++ = 'i'; // could use 'n' also which is int or float
break;
case FIELD_BOOLEAN:
*output++ = 'b';
break;
@@ -1701,7 +1699,9 @@ struct SquirrelSafeCheck
~SquirrelSafeCheck()
{
if (top_ != (sq_gettop(vm_) - outputCount_))
SQInteger curtop = sq_gettop(vm_);
SQInteger diff = curtop - outputCount_;
if ( top_ != diff )
{
Assert(!"Squirrel VM stack is not consistent");
Error("Squirrel VM stack is not consistent\n");
@@ -2354,6 +2354,8 @@ bool SquirrelVM::ScopeIsHooked( HSCRIPT hScope, const char *pszEventName )
if (!hScope)
return true;
SquirrelSafeCheck safeCheck(vm_);
Assert(hScope != INVALID_HSCRIPT);
sq_pushroottable(vm_);
@@ -2373,7 +2375,7 @@ bool SquirrelVM::ScopeIsHooked( HSCRIPT hScope, const char *pszEventName )
return false;
}
sq_pop(vm_, 3);
sq_pop(vm_, 4);
return val ? true : false;
}
@@ -2393,6 +2395,8 @@ HSCRIPT SquirrelVM::LookupHookFunction(const char *pszEventName, HSCRIPT hScope,
if (!ScopeIsHooked(hScope, pszEventName))
return nullptr;
SquirrelSafeCheck safeCheck(vm_);
sq_pushroottable(vm_);
sq_pushstring(vm_, "Hooks", -1);
sq_get(vm_, -2);
@@ -2403,7 +2407,7 @@ HSCRIPT SquirrelVM::LookupHookFunction(const char *pszEventName, HSCRIPT hScope,
sq_resetobject(&obj);
sq_getstackobj(vm_, -1, &obj);
sq_addref(vm_, &obj);
sq_pop(vm_, 2);
sq_pop(vm_, 3);
HSQOBJECT* pObj = new HSQOBJECT;
*pObj = obj;
@@ -3527,7 +3531,7 @@ void SquirrelVM::WriteObject(CUtlBuffer* pBuffer, WriteStateMap& writeState, SQI
}
else
{
Warning("SquirrelVM::WriteObject: Unable to find instanceID for object of type %s, unable to serialize\n",
DevWarning("SquirrelVM::WriteObject: Unable to find instanceID for object of type %s, unable to serialize\n",
pClassInstanceData->desc->m_pszClassname);
pBuffer->PutString("");
}

21
sp/src/vscript/vscript_squirrel.nut
View File

@@ -215,16 +215,17 @@ Hooks <-
function Call( scope, event, ... )
{
local firstReturn = null
local firstReturn
if ( scope == null )
// global hook; call all scopes
if ( !scope )
{
// null scope = global hook; call all scopes
vargv.insert(0,this)
foreach ( t in s_List )
vargv.insert( 0, null )
foreach( sc,t in s_List )
{
if ( event in t )
{
vargv[0] = sc
foreach( context, callback in t[event] )
{
//printf( "(%.4f) Calling hook '%s' of context '%s' in static iteration\n", Time(), event, context )
@@ -241,7 +242,7 @@ Hooks <-
local t = s_List[scope]
if ( event in t )
{
vargv.insert(0,scope)
vargv.insert( 0, scope )
foreach( context, callback in t[event] )
{
//printf( "(%.4f) Calling hook '%s' of context '%s'\n", Time(), event, context )
@@ -258,13 +259,7 @@ Hooks <-
function ScopeHookedToEvent( scope, event )
{
if ( scope in s_List )
{
if (event in s_List[scope])
return true
}
return false
return ( scope in s_List ) && ( event in s_List[scope] )
}
}