H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2024-12-22 14:16:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #208 from tyabus/multirun

Browse Source 
launcher: multirun should work on POSIX now
This commit is contained in:
nillerusr 2023-03-18 17:06:47 +03:00 committed by GitHub
commit d56e855742
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
launcher/launcher.cpp
View File

@ -104,6 +104,7 @@ static IEngineAPI *g_pEngineAPI;
static IHammer *g_pHammer; static IHammer *g_pHammer;
bool g_bTextMode = false; bool g_bTextMode = false;
bool g_MultiRun = false;
static char g_szBasedir[MAX_PATH]; static char g_szBasedir[MAX_PATH];
static char g_szGamedir[MAX_PATH]; static char g_szGamedir[MAX_PATH];
@ -922,6 +923,9 @@ char g_lockFilename[MAX_PATH];
#endif #endif
bool GrabSourceMutex() bool GrabSourceMutex()
{ {
if( g_MultiRun )
return true;
#ifdef WIN32 #ifdef WIN32
if ( IsPC() ) if ( IsPC() )
{ {
@ -1016,6 +1020,9 @@ bool GrabSourceMutex()
void ReleaseSourceMutex() void ReleaseSourceMutex()
{ {
if( g_MultiRun )
return;
#ifdef WIN32 #ifdef WIN32
if ( IsPC() && g_hMutex ) if ( IsPC() && g_hMutex )
{ {
@ -1278,6 +1285,10 @@ DLL_EXPORT int LauncherMain( int argc, char **argv )
// Figure out the directory the executable is running from // Figure out the directory the executable is running from
UTIL_ComputeBaseDir(); UTIL_ComputeBaseDir();
// Allow the user to explicitly say they want to be able to run multiple instances of the source mutex.
// Useful for side-by-side comparisons of different renderers.
g_MultiRun = CommandLine()->CheckParm( "-multirun" ) != NULL;
#if defined( _X360 ) #if defined( _X360 )
bool bSpewDllInfo = CommandLine()->CheckParm( "-dllinfo" ); bool bSpewDllInfo = CommandLine()->CheckParm( "-dllinfo" );
bool bWaitForConsole = CommandLine()->CheckParm( "-vxconsole" ); bool bWaitForConsole = CommandLine()->CheckParm( "-vxconsole" );
@ -1389,10 +1400,6 @@ DLL_EXPORT int LauncherMain( int argc, char **argv )
// Can only run one windowed source app at a time // Can only run one windowed source app at a time
if ( !GrabSourceMutex() ) if ( !GrabSourceMutex() )
{ {
// Allow the user to explicitly say they want to be able to run multiple instances of the source mutex.
// Useful for side-by-side comparisons of different renderers.
bool multiRun = CommandLine()->CheckParm( "-multirun" ) != NULL;
// We're going to hijack the existing session and load a new savegame into it. This will mainly occur when users click on links in Bugzilla that will automatically copy saves and load them // We're going to hijack the existing session and load a new savegame into it. This will mainly occur when users click on links in Bugzilla that will automatically copy saves and load them
// directly from the web browser. The -hijack command prevents the launcher from objecting that there is already an instance of the game. // directly from the web browser. The -hijack command prevents the launcher from objecting that there is already an instance of the game.
if (CommandLine()->CheckParm( "-hijack" )) if (CommandLine()->CheckParm( "-hijack" ))
@ -1430,12 +1437,12 @@ DLL_EXPORT int LauncherMain( int argc, char **argv )
} }
else else
{ {
if (!multiRun) { if (!g_MultiRun) {
::MessageBox(NULL, "Only one instance of the game can be running at one time.", "Source - Warning", MB_ICONINFORMATION | MB_OK); ::MessageBox(NULL, "Only one instance of the game can be running at one time.", "Source - Warning", MB_ICONINFORMATION | MB_OK);
} }
} }
if (!multiRun) { if (!g_MultiRun) {
return retval; return retval;
} }
} }
@ -1443,7 +1450,7 @@ DLL_EXPORT int LauncherMain( int argc, char **argv )
#elif defined( POSIX ) #elif defined( POSIX )
else else
{ {
if ( !GrabSourceMutex() ) if ( !GrabSourceMutex() && !g_MultiRun )
{ {
::MessageBox(NULL, "Only one instance of the game can be running at one time.", "Source - Warning", 0 ); ::MessageBox(NULL, "Only one instance of the game can be running at one time.", "Source - Warning", 0 );
return -1; return -1;