zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add -usecwd parameter on Windows, to disable searching for Megaton Edition or GOG.com game data

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4057 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2013-09-10 22:41:19 +00:00
parent f64fdf3384
commit 1baf9fa275
1 changed files with 24 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
polymer/eduke32/source/game.c
View file

@ -85,12 +85,12 @@ extern int32_t G_GetVersionFromWebsite(char *buffer);
# define UPDATEINTERVAL 604800 // 1w # define UPDATEINTERVAL 604800 // 1w
# include "winbits.h" # include "winbits.h"
#else #else
static int32_t usecwd = 0;
# ifndef GEKKO # ifndef GEKKO
# include <sys/ioctl.h> # include <sys/ioctl.h>
# endif # endif
#endif /* _WIN32 */ #endif /* _WIN32 */
static int32_t usecwd = 0;
int32_t g_quitDeadline = 0; int32_t g_quitDeadline = 0;
#ifdef LUNATIC #ifdef LUNATIC
@ -9027,9 +9027,7 @@ static void G_ShowParameterHelp(void)
"-setup/nosetup\tEnables/disables startup window\n" "-setup/nosetup\tEnables/disables startup window\n"
#endif #endif
"-t#\t\tSet respawn mode: 1 = Monsters, 2 = Items, 3 = Inventory, x = All\n" "-t#\t\tSet respawn mode: 1 = Monsters, 2 = Items, 3 = Inventory, x = All\n"
#if !defined(_WIN32)
"-usecwd\t\tRead game data and configuration file from working directory\n" "-usecwd\t\tRead game data and configuration file from working directory\n"
#endif
"-u#########\tUser's favorite weapon order (default: 3425689071)\n" "-u#########\tUser's favorite weapon order (default: 3425689071)\n"
"-v#\t\tWarp to volume #, see -l\n" "-v#\t\tWarp to volume #, see -l\n"
"-ww2gi\t\tRun in WWII GI compatibility mode\n" "-ww2gi\t\tRun in WWII GI compatibility mode\n"
@ -9519,16 +9517,18 @@ const char **g_argv;
const char **g_elModules; const char **g_elModules;
#endif #endif
#ifdef __APPLE__
// Early checking for "-usecwd" switch. // Early checking for "-usecwd" switch.
static void G_CheckUseCWD(int32_t argc, const char **argv) static int32_t G_CheckCmdSwitch(int32_t argc, const char **argv, const char *str)
{ {
int32_t i; int32_t i;
for (i=0; i<argc; i++) for (i=0; i<argc; i++)
if (!Bstrcasecmp(argv[i], "-usecwd")) {
usecwd = 1; if (str && !Bstrcasecmp(argv[i], str))
return 1;
}
return 0;
} }
#endif
static void G_CheckCommandLine(int32_t argc, const char **argv) static void G_CheckCommandLine(int32_t argc, const char **argv)
{ {
@ -9871,14 +9871,12 @@ static void G_CheckCommandLine(int32_t argc, const char **argv)
i++; i++;
continue; continue;
} }
#if !defined(_WIN32)
if (!Bstrcasecmp(c+1,"usecwd")) if (!Bstrcasecmp(c+1,"usecwd"))
{ {
usecwd = 1; usecwd = 1;
i++; i++;
continue; continue;
} }
#endif
if (!Bstrcasecmp(c+1,"cachesize")) if (!Bstrcasecmp(c+1,"cachesize"))
{ {
if (argc > i+1) if (argc > i+1)
@ -11060,36 +11058,25 @@ int32_t app_main(int32_t argc, const char **argv)
{ {
int32_t i = 0, j; int32_t i = 0, j;
char cwd[BMAX_PATH]; char cwd[BMAX_PATH];
// extern char datetimestring[];
ENetCallbacks callbacks = { NULL, NULL, NULL };
G_ExtPreInit(); G_ExtPreInit();
#ifdef _WIN32 #ifndef NETCODE_DISABLE
if (argc > 1) if (enet_initialize() != 0)
{ initprintf("An error occurred while initializing ENet.\n");
for (; i<argc; i++) else atexit(enet_deinitialize);
{ #endif
if (Bstrcasecmp("-noinstancechecking", argv[i]) == 0)
break;
}
}
if (i == argc && win_checkinstance()) usecwd = G_CheckCmdSwitch(argc, argv, "-usecwd");
#ifdef _WIN32
if (!G_CheckCmdSwitch(argc, argv, "-noinstancechecking") && win_checkinstance())
{ {
if (!wm_ynbox("EDuke32","Another Build game is currently running. " if (!wm_ynbox("EDuke32","Another Build game is currently running. "
"Do you wish to continue starting this copy?")) "Do you wish to continue starting this copy?"))
return 3; return 3;
} }
#endif
#ifndef NETCODE_DISABLE
if (enet_initialize_with_callbacks(ENET_VERSION, &callbacks) != 0)
initprintf("An error occurred while initializing ENet.\n");
else atexit(enet_deinitialize);
#endif
#ifdef _WIN32
backgroundidle = 0; backgroundidle = 0;
{ {
@ -11104,10 +11091,10 @@ int32_t app_main(int32_t argc, const char **argv)
getcwd(g_rootDir,BMAX_PATH); getcwd(g_rootDir,BMAX_PATH);
strcat(g_rootDir,"/"); strcat(g_rootDir,"/");
#endif #endif
OSD_SetParameters(0,0, 0,12, 2,12);
#ifdef __APPLE__
G_CheckUseCWD(argc, argv);
OSD_SetParameters(0,0, 0,12, 2,12);
#ifdef __APPLE__
if (!usecwd) if (!usecwd)
{ {
char *homedir = Bgethomedir(); char *homedir = Bgethomedir();
@ -11145,7 +11132,8 @@ int32_t app_main(int32_t argc, const char **argv)
); );
initprintf("Compiled %s\n", __DATE__" "__TIME__); initprintf("Compiled %s\n", __DATE__" "__TIME__);
G_AddSearchPaths(); if (!usecwd)
G_AddSearchPaths();
g_numSkills = 4; g_numSkills = 4;
ud.multimode = 1; ud.multimode = 1;
@ -11468,7 +11456,8 @@ int32_t app_main(int32_t argc, const char **argv)
pathsearchmode = 0; pathsearchmode = 0;
} }
G_CleanupSearchPaths(); if (!usecwd)
G_CleanupSearchPaths();
if (SHAREWARE) if (SHAREWARE)
g_Shareware = 1; g_Shareware = 1;