Skip to content

Commit 6d45d95

Browse files
authored
Merge pull request #69 from ReDucTor/vscript-fix-vector-in-table
Vscript fix vector in table
2 parents eb014cc + 782721e commit 6d45d95

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

sp/src/public/vscript/ivscript.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,8 +1579,6 @@ struct ScriptHook_t
15791579
{
15801580
extern IScriptVM *g_pScriptVM;
15811581

1582-
Assert( ARRAYSIZE(pArgs) == m_desc.m_Parameters.Count() );
1583-
15841582
// Make sure we have a function in this scope
15851583
if (!m_hFunc && !CanRunInScope(hScope))
15861584
return false;
@@ -1638,6 +1636,7 @@ class CScriptFuncHolder
16381636
if ( !m_hScriptFunc_##FuncName.IsNull() ) \
16391637
{ \
16401638
ScriptVariant_t returnVal; \
1639+
Assert( N == m_desc.m_Parameters.Count() ); \
16411640
ScriptStatus_t result = Call( m_hScriptFunc_##FuncName.hFunction, &returnVal, FUNC_CALL_ARGS_##N ); \
16421641
if ( result != SCRIPT_ERROR ) \
16431642
{ \
@@ -1662,6 +1661,7 @@ class CScriptFuncHolder
16621661
\
16631662
if ( !m_hScriptFunc_##FuncName.IsNull() ) \
16641663
{ \
1664+
Assert( N == m_desc.m_Parameters.Count() ); \
16651665
ScriptStatus_t result = Call( m_hScriptFunc_##FuncName.hFunction, NULL, FUNC_CALL_ARGS_##N ); \
16661666
if ( result != SCRIPT_ERROR ) \
16671667
{ \

sp/src/vscript/vscript_squirrel.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3182,6 +3182,8 @@ void SquirrelVM::ReadObject(CUtlBuffer* pBuffer, ReadStateMap& readState)
31823182
if (classType == VectorClassType)
31833183
{
31843184
sq_pushobject(vm_, vectorClass_);
3185+
sq_getstackobj(vm_, -1, obj);
3186+
sq_addref(vm_, obj);
31853187
}
31863188
else if (classType == NativeClassType)
31873189
{

0 commit comments

Comments
 (0)