celisej567/BCWSsrc
1
0
Fork 0
mirror of https://github.com/celisej567/BCWSsrc.git synced 2026-09-21 20:15:08 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/vscript' of https://github.com/mapbase-source/source-sdk-2013 into feature/vscript

Browse Source
This commit is contained in:
Blixibon
2020-05-31 08:57:35 -05:00
parent 4225e9d570 528a2815e4
commit 82b0460d8f
6 changed files with 198 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,9 +13,7 @@
#include "characterset.h"
#include "isaverestore.h"
#include "gamerules.h"
#ifdef _WIN32
//#include "vscript_client_nut.h"
#endif
#include "vscript_client.nut"
#ifdef MAPBASE_VSCRIPT
#include "c_world.h"
#include "proxyentity.h"
@@ -405,13 +403,13 @@ bool VScriptClientInit()
IGameSystem::RegisterVScriptAllSystems();
RegisterSharedScriptFunctions();
#else
if ( scriptLanguage == SL_SQUIRREL )
{
//g_pScriptVM->Run( g_Script_vscript_client );
}
#endif
if (scriptLanguage == SL_SQUIRREL)
{
g_pScriptVM->Run( g_Script_vscript_client );
}
VScriptRunScript( "mapspawn", false );
VMPROF_SHOW( pszScriptLanguage, "virtual machine startup" );

3
sp/src/game/client/vscript_client.nut
View File

@@ -1,3 +1,4 @@
static char g_Script_vscript_client[] = R"vscript(
//========== Copyright <20> 2008, Valve Corporation, All rights reserved. ========
//
// Purpose:
@@ -17,3 +18,5 @@ function IncludeScript( name, scope = null )
}
return ::DoIncludeScript( name, scope );
}
)vscript";

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

@@ -15,9 +15,7 @@
#include "sceneentity.h" // for exposing scene precache function
#include "isaverestore.h"
#include "gamerules.h"
#ifdef _WIN32
//#include "vscript_server_nut.h"
#endif
#include "vscript_server.nut"
#ifdef MAPBASE_VSCRIPT
#include "world.h"
#endif
@@ -555,13 +553,13 @@ bool VScriptServerInit()
IGameSystem::RegisterVScriptAllSystems();
RegisterSharedScriptFunctions();
#else
if ( scriptLanguage == SL_SQUIRREL )
{
//g_pScriptVM->Run( g_Script_vscript_server );
}
#endif
if (scriptLanguage == SL_SQUIRREL)
{
g_pScriptVM->Run( g_Script_vscript_server );
}
VScriptRunScript( "mapspawn", false );
VMPROF_SHOW( pszScriptLanguage, "virtual machine startup" );

4
sp/src/game/server/vscript_server.nut
View File

@@ -1,3 +1,4 @@
static char g_Script_vscript_server[] = R"vscript(
//========== Copyright <20> 2008, Valve Corporation, All rights reserved. ========
//
// Purpose:
@@ -38,7 +39,7 @@ function __ReplaceClosures( script, scope )
local tempParent = { getroottable = function() { return null; } };
local temp = { runscript = script };
delegate tempParent : temp;
temp.set_delegate(tempParent);
temp.runscript()
foreach( key,val in temp )
@@ -125,3 +126,4 @@ function __DumpScope( depth, table )
}
}
)vscript";

2
sp/src/game/shared/mapbase/vscript_funcs_shared.cpp
View File

@@ -343,7 +343,7 @@ public:
private:
} g_ScriptConvarLookup;
BEGIN_SCRIPTDESC_ROOT_NAMED( CScriptConvarLookup, "Convars", SCRIPT_SINGLETON "Provides an interface for getting and setting convars." )
BEGIN_SCRIPTDESC_ROOT_NAMED( CScriptConvarLookup, "CConvars", SCRIPT_SINGLETON "Provides an interface for getting and setting convars." )
#ifndef CLIENT_DLL
DEFINE_SCRIPTFUNC( GetClientConvarValue, "Returns the convar value for the entindex as a string. Only works with client convars with the FCVAR_USERINFO flag." )
#endif