zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 19:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Menus: Improve handling of the color correction screen.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6314 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-07-05 05:37:43 +00:00
parent 150eb8fd7c
commit d032721aa1
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/duke3d/src/menus.cpp
View file

@ -6157,7 +6157,9 @@ void M_DisplayMenus(void)
g_player[myconnectindex].ps->gm &= (0xff-MODE_TYPE); g_player[myconnectindex].ps->gm &= (0xff-MODE_TYPE);
// g_player[myconnectindex].ps->fta = 0; // g_player[myconnectindex].ps->fta = 0;
if (!KXDWN && ((g_player[myconnectindex].ps->gm&MODE_GAME) || ud.recstat==2) && Menu_BlackTranslucentBackgroundOK(g_currentMenu)) int32_t const backgroundOK = Menu_BlackTranslucentBackgroundOK(g_currentMenu);
if (!KXDWN && ((g_player[myconnectindex].ps->gm&MODE_GAME) || ud.recstat==2) && backgroundOK)
fade_screen_black(1); fade_screen_black(1);
if (Menu_UpdateScreenOK(g_currentMenu)) if (Menu_UpdateScreenOK(g_currentMenu))
@ -6192,12 +6194,12 @@ void M_DisplayMenus(void)
VM_OnEventWithReturn(EVENT_DISPLAYMENU, g_player[screenpeek].ps->i, screenpeek, g_currentMenu); VM_OnEventWithReturn(EVENT_DISPLAYMENU, g_player[screenpeek].ps->i, screenpeek, g_currentMenu);
origin = ud.m_origin; origin = ud.m_origin;
if (m_parentMenu) if (m_parentMenu && backgroundOK)
{ {
Menu_Run(m_parentMenu, origin); Menu_Run(m_parentMenu, origin);
} }
if (KXDWN && ((g_player[myconnectindex].ps->gm&MODE_GAME) || ud.recstat==2 || m_parentMenu != NULL) && Menu_BlackTranslucentBackgroundOK(g_currentMenu)) if (KXDWN && ((g_player[myconnectindex].ps->gm&MODE_GAME) || ud.recstat==2 || m_parentMenu != NULL) && backgroundOK)
fade_screen_black(1); fade_screen_black(1);
// Display the menu, with a transition animation if applicable. // Display the menu, with a transition animation if applicable.