From e42eb9aba81b5cffd9a3bb6003c8ad950fea95d1 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Fri, 2 Oct 2020 15:37:23 -0700
Subject: [PATCH] Revert "Warn when going to OpenGL from the menu"
This reverts commit 3883d44bb57d8a68dd1c15fad69a631463a5de52.
And one line from 5c1b3baf18.
---
src/d_netcmd.c | 3 ---
src/m_menu.c | 50 +----------------------------------------------
src/screen.c | 5 +----
src/screen.h | 6 ------
src/sdl/i_video.c | 1 -
5 files changed, 2 insertions(+), 63 deletions(-)
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 62b93bba26..4208e4c4f4 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -865,9 +865,6 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_fullscreen);
CV_RegisterVar(&cv_renderview);
CV_RegisterVar(&cv_renderer);
-#ifdef HWRENDER
- CV_RegisterVar(&cv_newrenderer);
-#endif
CV_RegisterVar(&cv_scr_depth);
CV_RegisterVar(&cv_scr_width);
CV_RegisterVar(&cv_scr_height);
diff --git a/src/m_menu.c b/src/m_menu.c
index 49acc0666b..c7786a4965 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -406,9 +406,6 @@ static void M_ResetCvars(void);
// Consvar onchange functions
static void Newgametype_OnChange(void);
-#ifdef HWRENDER
-static void Newrenderer_OnChange(void);
-#endif
static void Dummymares_OnChange(void);
// ==========================================================================
@@ -433,11 +430,6 @@ CV_PossibleValue_t gametype_cons_t[NUMGAMETYPES+1];
consvar_t cv_newgametype = {"newgametype", "Co-op", CV_HIDEN|CV_CALL, gametype_cons_t, Newgametype_OnChange, 0, NULL, NULL, 0, 0, NULL};
-#ifdef HWRENDER
-consvar_t cv_newrenderer = {"newrenderer", "Software", CV_HIDEN|CV_CALL, cv_renderer_t, Newrenderer_OnChange, 0, NULL, NULL, 0, 0, NULL};
-static int newrenderer_set = 1;/* Software doesn't need confirmation! */
-#endif
-
static CV_PossibleValue_t serversort_cons_t[] = {
{0,"Ping"},
{1,"Modified State"},
@@ -1347,7 +1339,7 @@ static menuitem_t OP_VideoOptionsMenu[] =
#endif
{IT_STRING | IT_CVAR, NULL, "Vertical Sync", &cv_vidwait, 16},
#ifdef HWRENDER
- {IT_STRING | IT_CVAR, NULL, "Renderer", &cv_newrenderer, 21},
+ {IT_STRING | IT_CVAR, NULL, "Renderer", &cv_renderer, 21},
#else
{IT_TRANSTEXT | IT_PAIR, "Renderer", "Software", &cv_renderer, 21},
#endif
@@ -2458,46 +2450,6 @@ static void Newgametype_OnChange(void)
}
}
-#ifdef HWRENDER
-static void Newrenderer_AREYOUSURE(INT32 c)
-{
- int n;
- switch (c)
- {
- case 'y':
- case KEY_ENTER:
- n = cv_newrenderer.value;
- newrenderer_set |= n;
- CV_SetValue(&cv_renderer, n);
- break;
- default:
- CV_StealthSetValue(&cv_newrenderer, cv_renderer.value);
- }
-}
-
-static void Newrenderer_OnChange(void)
-{
- /* Well this works for now because there's only two options. */
- int n;
- n = cv_newrenderer.value;
- newrenderer_set |= cv_renderer.value;
- if (( newrenderer_set & n ))
- CV_SetValue(&cv_renderer, n);
- else
- {
- M_StartMessage(
- "The OpenGL renderer is incomplete.\n"
- "Some visuals may fail to appear, or\n"
- "appear incorrectly.\n"
- "Do you still want to switch to it?\n"
- "\n"
- "(Press 'y' or 'n')",
- Newrenderer_AREYOUSURE, MM_YESNO
- );
- }
-}
-#endif/*HWRENDER*/
-
void Screenshot_option_Onchange(void)
{
OP_ScreenshotOptionsMenu[op_screenshot_folder].status =
diff --git a/src/screen.c b/src/screen.c
index e7ff9e7355..6dadd25c3c 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -64,7 +64,7 @@ consvar_t cv_scr_depth = {"scr_depth", "16 bits", CV_SAVE, scr_depth_cons_t, NUL
consvar_t cv_renderview = {"renderview", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
static void SCR_ActuallyChangeRenderer(void);
-CV_PossibleValue_t cv_renderer_t[] = {
+static CV_PossibleValue_t cv_renderer_t[] = {
{1, "Software"},
#ifdef HWRENDER
{2, "OpenGL"},
@@ -499,9 +499,6 @@ void SCR_ChangeRendererCVars(INT32 mode)
CV_StealthSetValue(&cv_renderer, 1);
else if (mode == render_opengl)
CV_StealthSetValue(&cv_renderer, 2);
-#ifdef HWRENDER
- CV_StealthSetValue(&cv_newrenderer, cv_renderer.value);
-#endif
}
boolean SCR_IsAspectCorrect(INT32 width, INT32 height)
diff --git a/src/screen.h b/src/screen.h
index 91ec175f42..2cb2cf8391 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -168,7 +168,6 @@ extern boolean R_SSE2;
// ----------------
// screen variables
// ----------------
-
extern viddef_t vid;
extern INT32 setmodeneeded; // mode number to set if needed, or 0
@@ -179,12 +178,7 @@ extern UINT8 setrenderneeded;
extern INT32 scr_bpp;
extern UINT8 *scr_borderpatch; // patch used to fill the view borders
-extern CV_PossibleValue_t cv_renderer_t[];
-
extern consvar_t cv_scr_width, cv_scr_height, cv_scr_depth, cv_renderview, cv_renderer, cv_fullscreen;
-#ifdef HWRENDER
-extern consvar_t cv_newrenderer;
-#endif
// wait for page flipping to end or not
extern consvar_t cv_vidwait;
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 5c5b6119c6..c8f67da77b 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1489,7 +1489,6 @@ void VID_CheckGLLoaded(rendermode_t oldrender)
if (setrenderneeded)
{
CV_StealthSetValue(&cv_renderer, oldrender);
- CV_StealthSetValue(&cv_newrenderer, oldrender);
setrenderneeded = 0;
}
}
--
GitLab