zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 18:50:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move EVENT_DISPLAYMENU to after the black translucent background is drawn when in-game.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4966 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-02-08 08:02:51 +00:00
parent a7bea4f6bc
commit 2cbd80ad90
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
polymer/eduke32/source/menus.c
View file

@ -5510,6 +5510,20 @@ void M_DisplayMenus(void)
M_RunMenuInput(m_currentMenu); M_RunMenuInput(m_currentMenu);
g_player[myconnectindex].ps->gm &= (0xff-MODE_TYPE);
g_player[myconnectindex].ps->fta = 0;
if (((g_player[myconnectindex].ps->gm&MODE_GAME) || ud.recstat==2) && M_BlackTranslucentBackgroundOK(g_currentMenu))
fade_screen_black(1);
if (M_UpdateScreenOK(g_currentMenu))
G_UpdateScreenArea();
#if !defined EDUKE32_TOUCH_DEVICES
if (m_menuchange_watchpoint > 0)
m_menuchange_watchpoint++;
#endif
// Determine animation values. // Determine animation values.
if (totalclock < m_animation.start + m_animation.length) if (totalclock < m_animation.start + m_animation.length)
{ {
@ -5527,20 +5541,6 @@ 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;
g_player[myconnectindex].ps->gm &= (0xff-MODE_TYPE);
g_player[myconnectindex].ps->fta = 0;
if (((g_player[myconnectindex].ps->gm&MODE_GAME) || ud.recstat==2) && M_BlackTranslucentBackgroundOK(g_currentMenu))
fade_screen_black(1);
if (M_UpdateScreenOK(g_currentMenu))
G_UpdateScreenArea();
#if !defined EDUKE32_TOUCH_DEVICES
if (m_menuchange_watchpoint > 0)
m_menuchange_watchpoint++;
#endif
// Display the menu, with a transition animation if applicable. // Display the menu, with a transition animation if applicable.
if (totalclock < m_animation.start + m_animation.length) if (totalclock < m_animation.start + m_animation.length)
{ {