fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

gl_vidsdl.c (VID_Init): Changed default mode to windowed. Added -w as an

Browse source 
alternative to -window command line switch. added new -f and -fullscreen
command line switches. added comments about the problems being encountered
when default mode is fullscreen.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@13 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2010-02-16 09:01:53 +00:00
parent 7e0d4bf0ca
commit 454f953008
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
quakespasm/Quake/gl_vidsdl.c
View file

@ -1209,13 +1209,18 @@ void VID_Init (void)
basenummodes = nummodes = 1; basenummodes = nummodes = 1;
VID_InitFullDIB(); VID_InitFullDIB();
if (COM_CheckParm("-window")) // Config file is not read yet, so we don't know vid_fullscreen.value
// Changed this to default to -window as otherwise it occasionally forces
// two switches of video mode (window->fullscreen->window) which is bad S.A
// It's still not perfect but, hell, this ancient code can be a pain
if (!COM_CheckParm("-fullscreen") && !COM_CheckParm ("-f"))
{ {
windowed = true; windowed = true;
vid_default = MODE_WINDOWED; vid_default = MODE_WINDOWED;
} }
else else
{ {
Cvar_Set ("vid_fullscreen", "1");
if (nummodes == 1) if (nummodes == 1)
Sys_Error ("No RGB fullscreen modes available"); Sys_Error ("No RGB fullscreen modes available");
@ -1395,11 +1400,17 @@ void VID_Init (void)
//johnfitz -- command line vid settings should override config file settings. //johnfitz -- command line vid settings should override config file settings.
//so we have to lock the vid mode from now until after all config files are read. //so we have to lock the vid mode from now until after all config files are read.
if (COM_CheckParm("-width") || COM_CheckParm("-height") || if (COM_CheckParm("-width") || COM_CheckParm("-height") ||
COM_CheckParm("-bpp") || COM_CheckParm("-window")) COM_CheckParm("-bpp") ||
COM_CheckParm("-window") || COM_CheckParm("-w") ||
COM_CheckParm("-fullscreen") || COM_CheckParm("-f"))
{ {
vid_locked = true; vid_locked = true;
} }
//johnfitz //johnfitz
// The problem here is (say) previous video mode is 1024x768 windowed
// And we call "fitzquake -w". This disables setting of 1024x768, and when video lock
// is removed, we get 800x600.
} }
/* /*