q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2025-02-22 17:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #75 from twolife/execv

Browse Source 
reload ourself when selecting a Mod
This commit is contained in:
ptitSeb 2025-02-17 09:31:32 +01:00 committed by GitHub
commit a9ed0adf37
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Sources/SeriousSam/SeriousSam.cpp
View File

@ -1364,8 +1364,11 @@ int SubMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int
void CheckModReload(void) void CheckModReload(void)
{ {
#ifdef PLATFORM_WIN32
if (_fnmModToLoad!="") { if (_fnmModToLoad!="") {
CTString strMod = _fnmModToLoad.FileName();
const char *argv[9];
int i = 0;
#ifdef PLATFORM_WIN32
#ifndef NDEBUG #ifndef NDEBUG
CTString strDebug = "Debug\\"; CTString strDebug = "Debug\\";
#else #else
@ -1373,26 +1376,34 @@ void CheckModReload(void)
#endif #endif
CTString strCommand = _fnmApplicationPath+"Bin\\"+strDebug+"SeriousSam.exe"; CTString strCommand = _fnmApplicationPath+"Bin\\"+strDebug+"SeriousSam.exe";
//+mod "+_fnmModToLoad.FileName()+"\""; //+mod "+_fnmModToLoad.FileName()+"\"";
CTString strMod = _fnmModToLoad.FileName(); argv[i++] = strCommand;
const char *argv[7]; #else
argv[0] = strCommand; argv[i++] = argv0;
argv[1] = "+game"; #endif
argv[2] = strMod; argv[i++] = "+game";
argv[3] = NULL; argv[i++] = strMod;
argv[i] = NULL;
if (_fnmCDPath!="") {
argv[i++] = "+cdpath";
argv[i++] = _fnmCDPath;
argv[i] = NULL;
}
if (_strModServerJoin!="") { if (_strModServerJoin!="") {
argv[3] = "+connect"; argv[i++] = "+connect";
argv[4] = _strModServerJoin; argv[i++] = _strModServerJoin;
argv[5] = "+quickjoin"; argv[i++] = "+quickjoin";
argv[6] = NULL; argv[i] = NULL;
} }
#ifdef PLATFORM_WIN32
_execv(strCommand, argv); _execv(strCommand, argv);
MessageBoxA(0, "Error launching the Mod!\n", "Serious Sam", MB_OK|MB_ICONERROR); MessageBoxA(0, "Error launching the Mod!\n", "Serious Sam", MB_OK|MB_ICONERROR);
}
#else #else
STUBBED("reload ourself?"); execv(argv0, (char* const*)argv);
fprintf(stderr, "Error launching Mod '%s'! execv(%s, ...)\n", strMod, argv0);
#endif #endif
} }
}
void CheckTeaser(void) void CheckTeaser(void)
{ {