MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2024-10-16 15:27:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Converted VScript library to DLL

Browse Source
This commit is contained in:
Blixibon 2021-04-22 01:36:41 -05:00
parent 30bc88375a
commit df918b3d88
11 changed files with 52 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sp/src/game/client/cdll_client_int.cpp
View File

@ -459,6 +459,9 @@ public:
{
AddAppSystem( "soundemittersystem" DLL_EXT_STRING, SOUNDEMITTERSYSTEM_INTERFACE_VERSION );
AddAppSystem( "scenefilecache" DLL_EXT_STRING, SCENE_FILE_CACHE_INTERFACE_VERSION );
#ifdef MAPBASE
AddAppSystem( "vscript_mapbase" DLL_EXT_STRING, VSCRIPT_INTERFACE_VERSION );
#endif
}
virtual int Count()
@ -971,10 +974,18 @@ int CHLClient::Init( CreateInterfaceFn appSystemFactory, CreateInterfaceFn physi
{
scriptmanager = (IScriptManager *)appSystemFactory( VSCRIPT_INTERFACE_VERSION, NULL );
if (scriptmanager == NULL)
{
Error( "Can't load script manager" );
return false;
}
/*
if (scriptmanager == nullptr)
{
scriptmanager = (IScriptManager*)Sys_GetFactoryThis()(VSCRIPT_INTERFACE_VERSION, NULL);
}
*/
}
#ifdef WORKSHOP_IMPORT_ENABLED

2
sp/src/game/client/client_mapbase.vpc
View File

@ -83,7 +83,7 @@ $Project
$Folder "Link Libraries"
{
$Lib "vscript" [$MAPBASE_VSCRIPT]
$ImpLib "vscript_mapbase" [$MAPBASE_VSCRIPT]
$Lib "raytrace"
}
}

3
sp/src/game/server/gameinterface.cpp
View File

@ -3540,6 +3540,9 @@ public:
{
AddAppSystem( "soundemittersystem" DLL_EXT_STRING, SOUNDEMITTERSYSTEM_INTERFACE_VERSION );
AddAppSystem( "scenefilecache" DLL_EXT_STRING, SCENE_FILE_CACHE_INTERFACE_VERSION );
#ifdef MAPBASE
AddAppSystem( "vscript_mapbase" DLL_EXT_STRING, VSCRIPT_INTERFACE_VERSION );
#endif
}
virtual int Count()

2
sp/src/game/server/server_mapbase.vpc
View File

@ -110,7 +110,7 @@ $Project
$Folder "Link Libraries"
{
$Lib "vscript" [$MAPBASE_VSCRIPT]
$ImpLib "vscript_mapbase" [$MAPBASE_VSCRIPT]
$Lib "responserules" [$NEW_RESPONSE_SYSTEM]
}
}

4
sp/src/game/shared/vscript_shared.cpp
View File

@ -36,8 +36,8 @@ extern ScriptClassDesc_t * GetScriptDesc( CBaseEntity * );
#ifdef MAPBASE_VSCRIPT
// This is to ensure a dependency exists between the vscript library and the game DLLs
extern int vscript_token;
int vscript_token_hack = vscript_token;
//extern int vscript_token;
//int vscript_token_hack = vscript_token;
#endif

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

@ -1643,6 +1643,10 @@ struct ScriptHook_t
return false;
}
};
// TEMP LOCATION
extern template VSCRIPT_CLASS ScriptClassDesc_t* GetScriptDesc<matrix3x4_t>( matrix3x4_t* );
extern template VSCRIPT_CLASS ScriptClassDesc_t* GetScriptDesc<Color>( Color* );
#endif
//-----------------------------------------------------------------------------

13
sp/src/utils/vbsp/vbsp.cpp
View File

@ -1397,10 +1397,21 @@ int RunVBSP( int argc, char **argv )
#ifdef MAPBASE_VSCRIPT
if (g_iScripting)
{
scriptmanager = (IScriptManager*)Sys_GetFactoryThis()(VSCRIPT_INTERFACE_VERSION, NULL);
static CSysModule *pVScriptModule = NULL;
CreateInterfaceFn vscriptFactory = NULL;
if ( !pVScriptModule )
{
pVScriptModule = g_pFullFileSystem->LoadModule( "vscript_mapbase.dll" );
vscriptFactory = Sys_GetFactory( pVScriptModule );
}
if (vscriptFactory)
{
scriptmanager = (IScriptManager*)vscriptFactory( VSCRIPT_INTERFACE_VERSION, NULL );
VScriptVBSPInit();
}
}
#endif
// delete portal and line files

2
sp/src/utils/vbsp/vbsp.vpc
View File

@ -189,7 +189,7 @@ $Project "Vbsp"
$Lib mathlib
$Lib tier2
$Lib vtf
$Lib vscript [$MAPBASE_VSCRIPT]
$ImpLib "vscript_mapbase" [$MAPBASE_VSCRIPT]
}
$File "notes.txt"

4
sp/src/utils/vbsp/vscript_vbsp.cpp
View File

@ -40,8 +40,8 @@ extern ScriptClassDesc_t * GetScriptDesc( CBaseEntity * );
#endif // VMPROFILE
// This is to ensure a dependency exists between the vscript library and the game DLLs
extern int vscript_token;
int vscript_token_hack = vscript_token;
//extern int vscript_token;
//int vscript_token_hack = vscript_token;
HSCRIPT VScriptCompileScript( const char *pszScriptName, bool bWarnMissing )
{

5
sp/src/vscript/vscript.cpp
View File

@ -18,6 +18,9 @@ IScriptVM* makeSquirrelVM();
int vscript_token = 0;
// HACKHACK: The last-created script VM (for accessing VM from bound functions)
IScriptVM *g_pScriptVM;
class CScriptManager : public CTier1AppSystem<IScriptManager>
{
public:
@ -47,6 +50,8 @@ public:
// Register base bindings for all VMs
RegisterBaseBindings( pScriptVM );
g_pScriptVM = pScriptVM;
return pScriptVM;
}

10
sp/src/vscript/vscript.vpc
View File

@ -5,14 +5,17 @@
//-----------------------------------------------------------------------------
$macro SRCDIR ".."
$Macro OUTBINNAME "vscript_mapbase"
$Macro OUTBINDIR "$SRCDIR\..\game\bin"
$include "$SRCDIR\vpc_scripts\source_lib_base.vpc"
$include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
$Configuration
{
$Compiler
{
$AdditionalIncludeDirectories "$BASE;.\squirrel\include"
$PreprocessorDefinitions "$BASE;VSCRIPT_DLL_EXPORT"
$PreprocessorDefinitions "$BASE;MAPBASE_VSCRIPT" [$MAPBASE_VSCRIPT]
}
}
@ -66,4 +69,9 @@ $Project "VScript"
}
}
}
$Folder "Link Libraries"
{
$Lib mathlib
}
}