mirror of
https://github.com/Shpoike/Quakespasm.git
synced 2025-03-13 06:13:39 +00:00
revert r612, fix VID_Test blackscreen properly
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@826 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
parent
3de9422114
commit
e5ddd9a89a
3 changed files with 5 additions and 3 deletions
|
@ -652,7 +652,7 @@ void Draw_ConsoleBackground (void)
|
||||||
|
|
||||||
alpha = (con_forcedup) ? 1.0 : scr_conalpha.value;
|
alpha = (con_forcedup) ? 1.0 : scr_conalpha.value;
|
||||||
|
|
||||||
// GL_SetCanvas (CANVAS_CONSOLE); //in case this is called from weird places
|
GL_SetCanvas (CANVAS_CONSOLE); //in case this is called from weird places
|
||||||
|
|
||||||
if (alpha > 0.0)
|
if (alpha > 0.0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1035,6 +1035,9 @@ void SCR_UpdateScreen (void)
|
||||||
|
|
||||||
if (scr_drawdialog) //new game confirm
|
if (scr_drawdialog) //new game confirm
|
||||||
{
|
{
|
||||||
|
if (con_forcedup)
|
||||||
|
Draw_ConsoleBackground ();
|
||||||
|
else
|
||||||
Sbar_Draw ();
|
Sbar_Draw ();
|
||||||
Draw_FadeScreen ();
|
Draw_FadeScreen ();
|
||||||
SCR_DrawNotifyString ();
|
SCR_DrawNotifyString ();
|
||||||
|
|
|
@ -379,7 +379,6 @@ static void VID_Test (void)
|
||||||
old_fullscreen = draw_context->flags & SDL_FULLSCREEN ? true : false;
|
old_fullscreen = draw_context->flags & SDL_FULLSCREEN ? true : false;
|
||||||
|
|
||||||
VID_Restart ();
|
VID_Restart ();
|
||||||
SCR_UpdateScreen ();
|
|
||||||
|
|
||||||
//pop up confirmation dialoge
|
//pop up confirmation dialoge
|
||||||
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))
|
||||||
|
|
Loading…
Reference in a new issue