From 6f4dadaa128f8190ab0ba8c17cdc5af5c451c0b6 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Mon, 9 Sep 2019 17:53:34 -0300
Subject: [PATCH] menu changes
---
src/m_menu.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/m_menu.c b/src/m_menu.c
index ba3fb4c2d7..74d685fd55 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -257,6 +257,7 @@ static void M_ChangeControl(INT32 choice);
// Video & Sound
menu_t OP_VideoOptionsDef, OP_VideoModeDef;
#ifdef HWRENDER
+static void M_OpenGLOptionsMenu(void);
menu_t OP_OpenGLOptionsDef, OP_OpenGLFogDef, OP_OpenGLColorDef;
#endif
menu_t OP_SoundOptionsDef;
@@ -1100,10 +1101,7 @@ static menuitem_t OP_VideoOptionsMenu[] =
{
{IT_STRING | IT_CALL, NULL, "Video Modes...", M_VideoModeMenu, 10},
-#ifdef HWRENDER
{IT_STRING|IT_CVAR, NULL, "Renderer", &cv_renderer, 20},
- //{IT_SUBMENU|IT_STRING, NULL, "3D Card Options...", &OP_OpenGLOptionsDef, 20},
-#endif
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
{IT_STRING|IT_CVAR, NULL, "Fullscreen", &cv_fullscreen, 30},
@@ -1119,6 +1117,10 @@ static menuitem_t OP_VideoOptionsMenu[] =
{IT_STRING | IT_CVAR, NULL, "Show FPS", &cv_ticrate, 110},
{IT_STRING | IT_CVAR, NULL, "Clear Before Redraw", &cv_homremoval, 120},
{IT_STRING | IT_CVAR, NULL, "Vertical Sync", &cv_vidwait, 130},
+
+#ifdef HWRENDER
+ {IT_STRING | IT_CALL, NULL, "3D Card Options...", M_OpenGLOptionsMenu, 150},
+#endif
};
static menuitem_t OP_VideoModeMenu[] =
@@ -1712,6 +1714,14 @@ menu_t OP_MonitorToggleDef =
};
#ifdef HWRENDER
+static void M_OpenGLOptionsMenu(void)
+{
+ if (rendermode == render_opengl)
+ M_SetupNextMenu(&OP_OpenGLOptionsDef);
+ else
+ M_StartMessage(M_GetText("You must be in OpenGL mode\nto access this menu.\n\n(Press a key)\n"), NULL, MM_NOTHING);
+}
+
menu_t OP_OpenGLOptionsDef = DEFAULTMENUSTYLE("M_VIDEO", OP_OpenGLOptionsMenu, &OP_VideoOptionsDef, 30, 30);
#ifdef ALAM_LIGHTING
menu_t OP_OpenGLLightingDef = DEFAULTMENUSTYLE("M_VIDEO", OP_OpenGLLightingMenu, &OP_OpenGLOptionsDef, 60, 40);
--
GitLab