From 1bbb077fcab22301f8f514c1b20415120c57e433 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 22 Nov 2014 12:34:11 +0000
Subject: [PATCH] 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
---
 polymer/eduke32/source/game.c  | 14 --------------
 polymer/eduke32/source/menus.c | 10 ----------
 2 files changed, 24 deletions(-)

diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index bbf5bc04a..1009a6d9f 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -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;
 }
 
diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index 68882e4cb..45362e2da 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -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);