valve/source-sdk-2013
0
0
Fork 0
mirror of https://github.com/ValveSoftware/source-sdk-2013.git synced 2025-04-08 11:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 00939cd33e into 65aa7c910e

Browse source
This commit is contained in:
Braindawg 2025-04-01 02:39:15 +02:00 committed by GitHub
commit 8a75304f6f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/game/client/vscript_client.cpp
View file

@ -186,6 +186,9 @@ bool VScriptClientInit()
g_pScriptVM->Run( g_Script_vscript_client );
}
// ignore map-packed serverspawn files, allows server owners to run scripts before the map
VScriptRunScript( "serverspawn", false );
VScriptRunScript( "mapspawn", false );
VMPROF_SHOW( pszScriptLanguage, "virtual machine startup" );

3
src/game/server/vscript_server.cpp
View file

@ -3503,6 +3503,9 @@ REGISTER_SCRIPT_CONST_TABLE( Server )
}
g_VScriptGameEventListener.Init();
// ignore map-packed serverspawn files, allows server owners to run scripts before the map
VScriptRunScript( "serverspawn", false );
VScriptRunScript( "mapspawn", false );
if ( script_connect_debugger_on_mapspawn.GetBool() )

14
src/game/shared/vscript_shared.cpp
View file

@ -1,4 +1,4 @@
//========== Copyright © 2008, Valve Corporation, All rights reserved. ========
//========== Copyright <EFBFBD> 2008, Valve Corporation, All rights reserved. ========
//
// Purpose:
//
@ -102,7 +102,17 @@ HSCRIPT VScriptCompileScript( const char *pszScriptName, bool bWarnMissing )
}
else
{
bool bResult = filesystem->ReadFile( scriptPath, "GAME", bufferScript );
bool bResult = false;
// ignore map-packed serverspawn files, allows server owners to run scripts before the map
if ( V_strcmp( pszScriptName, "serverspawn" ) == 0 || V_strcmp( pszScriptName, CFmtStr( "serverspawn%s", pszVMExtension ) ) == 0 )
{
bResult = filesystem->ReadFile( scriptPath, "MOD", bufferScript );
}
else
{
bResult = filesystem->ReadFile( scriptPath, "GAME", bufferScript );
}
if( !bResult )
{