MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2024-12-28 07:45:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33 from ReDucTor/vscript/register-all-classes

Browse Source 
Making vscript register all classes
This commit is contained in:
Blixibon 2020-07-16 10:40:45 -05:00 committed by GitHub
commit b0739b8296
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sp/src/game/client/vscript_client.cpp
View File

@ -487,6 +487,8 @@ bool VScriptClientInit()
} }
#ifdef MAPBASE_VSCRIPT #ifdef MAPBASE_VSCRIPT
g_pScriptVM->RegisterAllClasses();
g_pScriptVM->RegisterInstance( &g_ScriptEntityIterator, "Entities" ); g_pScriptVM->RegisterInstance( &g_ScriptEntityIterator, "Entities" );
IGameSystem::RegisterVScriptAllSystems(); IGameSystem::RegisterVScriptAllSystems();

2
sp/src/game/server/vscript_server.cpp
View File

@ -569,6 +569,8 @@ bool VScriptServerInit()
g_pScriptVM->RegisterInstance( &g_ScriptEntityIterator, "Entities" ); g_pScriptVM->RegisterInstance( &g_ScriptEntityIterator, "Entities" );
#ifdef MAPBASE_VSCRIPT #ifdef MAPBASE_VSCRIPT
g_pScriptVM->RegisterAllClasses();
IGameSystem::RegisterVScriptAllSystems(); IGameSystem::RegisterVScriptAllSystems();
RegisterSharedScriptFunctions(); RegisterSharedScriptFunctions();

25
sp/src/public/vscript/ivscript.h
View File

@ -297,7 +297,12 @@ public:
struct ScriptClassDesc_t struct ScriptClassDesc_t
{ {
ScriptClassDesc_t() : m_pszScriptName( 0 ), m_pszClassname( 0 ), m_pszDescription( 0 ), m_pBaseDesc( 0 ), m_pfnConstruct( 0 ), m_pfnDestruct( 0 ), pHelper(NULL) {} ScriptClassDesc_t() : m_pszScriptName( 0 ), m_pszClassname( 0 ), m_pszDescription( 0 ), m_pBaseDesc( 0 ), m_pfnConstruct( 0 ), m_pfnDestruct( 0 ), pHelper(NULL)
{
#ifdef MAPBASE_VSCRIPT
AllClassesDesc().AddToTail(this);
#endif
}
const char * m_pszScriptName; const char * m_pszScriptName;
const char * m_pszClassname; const char * m_pszClassname;
@ -308,6 +313,14 @@ struct ScriptClassDesc_t
void *(*m_pfnConstruct)(); void *(*m_pfnConstruct)();
void (*m_pfnDestruct)( void *); void (*m_pfnDestruct)( void *);
IScriptInstanceHelper * pHelper; // optional helper IScriptInstanceHelper * pHelper; // optional helper
#ifdef MAPBASE_VSCRIPT
static CUtlVector<ScriptClassDesc_t*>& AllClassesDesc()
{
static CUtlVector<ScriptClassDesc_t*> classes;
return classes;
}
#endif
}; };
//--------------------------------------------------------- //---------------------------------------------------------
@ -875,6 +888,16 @@ public:
return ExecuteFunction( hFunction, args, ARRAYSIZE(args), pReturn, hScope, bWait ); return ExecuteFunction( hFunction, args, ARRAYSIZE(args), pReturn, hScope, bWait );
} }
#ifdef MAPBASE_VSCRIPT
void RegisterAllClasses()
{
CUtlVector<ScriptClassDesc_t*>& classDescs = ScriptClassDesc_t::AllClassesDesc();
FOR_EACH_VEC(classDescs, i)
{
RegisterClass(classDescs[i]);
}
}
#endif
}; };