TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move SysMissionDir to CGameArg

Browse source 
Both games support SysMissionDir.  Move it to the common structure.
This commit is contained in:
Kp 2015-11-24 04:05:35 +00:00
parent 64dee5d52a
commit 9981dc622e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/include/args.h
View file

@ -71,13 +71,13 @@ struct CArg : prohibit_void_ptr<CArg>
bool DbgSafelog;
int DbgVerbose;
int SysMaxFPS;
std::string SysMissionDir;
};
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
struct Arg : prohibit_void_ptr<Arg>
{
std::string SysHogDir;
std::string SysMissionDir;
std::string SysPilot;
std::string SysRecordDemoNameTemplate;
bool SysShowCmdHelp;

6
similar/misc/args.cpp
View file

@ -202,7 +202,7 @@ static void ReadCmdArgs(Inilist &ini, Arglist &Args)
GameArg.SysHogDir = arg_string(pp, end);
#if PHYSFS_VER_MAJOR >= 2
else if (!d_stricmp(p, "-add-missions-dir"))
GameArg.SysMissionDir = arg_string(pp, end);
CGameArg.SysMissionDir = arg_string(pp, end);
#endif
else if (!d_stricmp(p, "-nohogdir"))
{
@ -400,8 +400,8 @@ static void PostProcessGameArg()
else if (CGameArg.SysMaxFPS > MAXIMUM_FPS)
CGameArg.SysMaxFPS = MAXIMUM_FPS;
#if PHYSFS_VER_MAJOR >= 2
if (!GameArg.SysMissionDir.empty())
PHYSFS_mount(GameArg.SysMissionDir.c_str(), MISSION_DIR, 1);
if (!CGameArg.SysMissionDir.empty())
PHYSFS_mount(CGameArg.SysMissionDir.c_str(), MISSION_DIR, 1);
#endif
static char sdl_disable_lock_keys[] = "SDL_DISABLE_LOCK_KEYS=0";