zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing "break" to M_RunMenuInput(), revert android gltexapplyprops() menu fuckery. DONT_BUILD. 

git-svn-id: https://svn.eduke32.com/eduke32@4751 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2014-11-22 12:34:11 +00:00
parent 4abc47af9e
commit 1bbb077fca
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
polymer/eduke32/source/game.c
View File

@ -833,11 +833,6 @@ vec2_t G_ScreenText(const int32_t font,
origin.y = -(size.y / 2);
}
#if defined(USE_OPENGL) && defined(DROIDMENU)
gltexfiltermode = 1;
gltexapplyprops();
#endif
// loop through the string
while ((t = *text) && text != end)
{
@ -1116,15 +1111,6 @@ vec2_t G_ScreenText(const int32_t font,
size.y >>= 16;
}
#if defined(USE_OPENGL) && defined(DROIDMENU)
{
extern int32_t menufiltermode;
gltexfiltermode = menufiltermode ? 5 : 2;
gltexapplyprops();
}
#endif
return size;
}

10
polymer/eduke32/source/menus.c
View File

@ -4961,11 +4961,6 @@ void M_DisplayMenus(void)
if (M_UpdateScreenOK(g_currentMenu))
G_UpdateScreenArea();
#if defined(USE_OPENGL) && defined(DROIDMENU)
gltexfiltermode = 1;
gltexapplyprops();
#endif
if (totalclock < m_animation.start + m_animation.length)
{
vec2_t previousOrigin = { 0, 0 };
@ -4980,11 +4975,6 @@ void M_DisplayMenus(void)
else
M_RunMenu(m_currentMenu, origin);
#if defined(USE_OPENGL) && defined(DROIDMENU)
gltexfiltermode = menufiltermode ? 5 : 2;
gltexapplyprops();
#endif
if (VM_HaveEvent(EVENT_DISPLAYMENUREST))
VM_OnEvent(EVENT_DISPLAYMENUREST, g_player[screenpeek].ps->i, screenpeek);