q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2025-04-23 21:20:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: q3aql:a9ed0adf3774e4a640a138033b6faa8163dcd6a3
Branches Tags
q3aql:master
q3aql:pandora
..
compare: q3aql:698af6d1f8edb6387969c5983529c68a1e64d885
Branches Tags
q3aql:master
q3aql:pandora

No commits in common. "a9ed0adf3774e4a640a138033b6faa8163dcd6a3" and "698af6d1f8edb6387969c5983529c68a1e64d885" have entirely different histories.
a9ed0adf37 ... 698af6d1f8

2 changed files with 15 additions and 33 deletions
Show Stats Expand all files Collapse all files

9
Sources/Engine/Base/Stream.cpp
View File

@ -18,7 +18,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <filesystem>
// !!! FIXME : rcg10162001 Need this anymore, since _findfirst() is abstracted?
#ifdef PLATFORM_WIN32
@ -919,13 +918,7 @@ void CTFileStream::Open_t(const CTFileName &fnFileName, CTStream::OpenMode om/*=
static void MakeSureDirectoryPathExists(const CTFileName &fnmFullFileName)
{
CTFileName fnDirectory = fnmFullFileName.FileDir();
const char *path = (const char *) (CTString&)fnDirectory;
std::error_code ec;
std::filesystem::create_directories(path, ec);
if (ec) {
FatalError("Cannot create directory path:\n%s", path);
}
STUBBED("!!! FIXME: get the code back in from Ryan's original port.");
}
/*

39
Sources/SeriousSam/SeriousSam.cpp
View File

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