fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-13 23:40:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

gl_vidsdl.c: make VID_Test independent from modelist

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@811 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Sander van Dijk 2013-02-19 19:00:19 +00:00
parent 5c09de09ee
commit 88b0694432
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Quake/gl_vidsdl.c
View file

@ -367,14 +367,17 @@ VID_Test -- johnfitz -- like vid_restart, but asks for confirmation after switch
*/ */
static void VID_Test (void) static void VID_Test (void)
{ {
vmode_t oldmode; int old_width, old_height, old_bpp, old_fullscreen;
if (vid_locked || !vid_changed) if (vid_locked || !vid_changed)
return; return;
// //
// now try the switch // now try the switch
// //
oldmode = modelist[vid_default]; old_width = draw_context->w;
old_height = draw_context->h;
old_bpp = draw_context->format->BitsPerPixel;
old_fullscreen = draw_context->flags & SDL_FULLSCREEN;
VID_Restart (); VID_Restart ();
SCR_UpdateScreen (); SCR_UpdateScreen ();
@ -383,10 +386,10 @@ static void VID_Test (void)
if (!SCR_ModalMessage("Would you like to keep this\nvideo mode? (y/n)\n", 5.0f)) if (!SCR_ModalMessage("Would you like to keep this\nvideo mode? (y/n)\n", 5.0f))
{ {
//revert cvars and mode //revert cvars and mode
Cvar_SetValueQuick (&vid_width, oldmode.width); Cvar_SetValueQuick (&vid_width, old_width);
Cvar_SetValueQuick (&vid_height, oldmode.height); Cvar_SetValueQuick (&vid_height, old_height);
Cvar_SetValueQuick (&vid_bpp, oldmode.bpp); Cvar_SetValueQuick (&vid_bpp, old_bpp);
Cvar_SetQuick (&vid_fullscreen, (oldmode.type == MS_WINDOWED) ? "0" : "1"); Cvar_SetQuick (&vid_fullscreen, old_fullscreen ? "1" : "0");
VID_Restart (); VID_Restart ();
} }
} }