diff --git a/sp/src/game/client/vscript_client.cpp b/sp/src/game/client/vscript_client.cpp index 6b386d7f..33c052af 100644 --- a/sp/src/game/client/vscript_client.cpp +++ b/sp/src/game/client/vscript_client.cpp @@ -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" ); diff --git a/sp/src/game/client/vscript_client.nut b/sp/src/game/client/vscript_client.nut index 2efd3417..5fce6ff5 100644 --- a/sp/src/game/client/vscript_client.nut +++ b/sp/src/game/client/vscript_client.nut @@ -1,3 +1,4 @@ +static char g_Script_vscript_client[] = R"vscript( //========== Copyright © 2008, Valve Corporation, All rights reserved. ======== // // Purpose: @@ -17,3 +18,5 @@ function IncludeScript( name, scope = null ) } return ::DoIncludeScript( name, scope ); } + +)vscript"; \ No newline at end of file diff --git a/sp/src/game/server/vscript_server.cpp b/sp/src/game/server/vscript_server.cpp index 0e2e6d19..7ab8c3d3 100644 --- a/sp/src/game/server/vscript_server.cpp +++ b/sp/src/game/server/vscript_server.cpp @@ -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" ); diff --git a/sp/src/game/server/vscript_server.nut b/sp/src/game/server/vscript_server.nut index 5f6c285a..aefa9b24 100644 --- a/sp/src/game/server/vscript_server.nut +++ b/sp/src/game/server/vscript_server.nut @@ -1,3 +1,4 @@ +static char g_Script_vscript_server[] = R"vscript( //========== Copyright © 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"; \ No newline at end of file