Move SysWindow to CArg

This commit is contained in:
Kp 2015-12-24 04:01:27 +00:00
parent 2629b5b3d9
commit 4ac7055928
4 changed files with 4 additions and 4 deletions

View file

@ -75,6 +75,7 @@ struct CArg : prohibit_void_ptr<CArg>
bool SysLowMem;
bool SysUsePlayersDir;
bool SysAutoRecordDemo;
bool SysWindow;
bool GfxSkipHiresFNT;
bool SndNoSound;
bool SndNoMusic;
@ -112,7 +113,6 @@ extern CArg CGameArg;
namespace dsx {
struct Arg : prohibit_void_ptr<Arg>
{
bool SysWindow;
bool SysNoBorders;
bool SysNoTitles;
bool SysAutoDemo;

View file

@ -766,7 +766,7 @@ int gr_init()
ogl_init_load_library();
#endif
if (!CGameCfg.WindowMode && !GameArg.SysWindow)
if (!CGameCfg.WindowMode && !CGameArg.SysWindow)
sdl_video_flags|=SDL_FULLSCREEN;
if (GameArg.SysNoBorders)

View file

@ -176,7 +176,7 @@ int gr_init()
grd_curscreen = make_unique<grs_screen, grs_screen>({});
if (!CGameCfg.WindowMode && !GameArg.SysWindow)
if (!CGameCfg.WindowMode && !CGameArg.SysWindow)
sdl_video_flags|=SDL_FULLSCREEN;
if (GameArg.SysNoBorders)

View file

@ -227,7 +227,7 @@ static void ReadCmdArgs(Inilist &ini, Arglist &Args)
else if (!d_stricmp(p, "-auto-record-demo"))
CGameArg.SysAutoRecordDemo = true;
else if (!d_stricmp(p, "-window"))
GameArg.SysWindow = 1;
CGameArg.SysWindow = true;
else if (!d_stricmp(p, "-noborders"))
GameArg.SysNoBorders = 1;
else if (!d_stricmp(p, "-notitles"))