From f832202059fc2ddd43bd8499519fa3fc0e01e466 Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Sun, 20 Aug 2023 19:48:28 +0200 Subject: [PATCH] Move secbright to OpenGl menu & remove downloadspeed from saturn menu eeeh secbright a Opengl only thing anyways and having it in Saturn options just made the game sigsegv in Saturn menu downloadspeed can stay at max, it barely reaches the value ever anyways aswell as why would anyone ever want to lower it --- src/m_menu.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 4015665e2..9b25cb7ab 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1342,21 +1342,22 @@ static menuitem_t OP_VideoModeMenu[] = #ifdef HWRENDER static menuitem_t OP_OpenGLOptionsMenu[] = { - {IT_STRING | IT_CVAR, NULL, "3D Models", &cv_grmdls, 10}, - {IT_STRING | IT_CVAR, NULL, "Fallback Player 3D Model", &cv_grfallbackplayermodel, 20}, - {IT_STRING|IT_CVAR, NULL, "Shaders", &cv_grshaders, 30}, - {IT_STRING|IT_CVAR, NULL, "Use custom Shaders", &cv_grusecustomshaders, 40}, + {IT_STRING | IT_CVAR, NULL, "3D Models", &cv_grmdls, 5}, + {IT_STRING | IT_CVAR, NULL, "Fallback Player 3D Model", &cv_grfallbackplayermodel, 15}, + {IT_STRING|IT_CVAR, NULL, "Shaders", &cv_grshaders, 25}, + {IT_STRING|IT_CVAR, NULL, "Use custom Shaders", &cv_grusecustomshaders, 35}, + {IT_STRING | IT_CVAR, NULL, "Min Shader Brightness", &cv_secbright, 45}, - {IT_STRING|IT_CVAR, NULL, "Texture Quality", &cv_scr_depth, 60}, - {IT_STRING|IT_CVAR, NULL, "Texture Filter", &cv_grfiltermode, 70}, - {IT_STRING|IT_CVAR, NULL, "Anisotropic", &cv_granisotropicmode, 80}, + {IT_STRING|IT_CVAR, NULL, "Texture Quality", &cv_scr_depth, 65}, + {IT_STRING|IT_CVAR, NULL, "Texture Filter", &cv_grfiltermode, 75}, + {IT_STRING|IT_CVAR, NULL, "Anisotropic", &cv_granisotropicmode, 85}, - {IT_STRING|IT_CVAR, NULL, "Visual Portals", &cv_grportals, 90}, + {IT_STRING|IT_CVAR, NULL, "Visual Portals", &cv_grportals, 95}, - {IT_STRING|IT_CVAR, NULL, "Wall Contrast Style", &cv_grfakecontrast, 110}, - {IT_STRING|IT_CVAR, NULL, "Sprite Billboarding", &cv_grspritebillboarding, 120}, - {IT_STRING|IT_CVAR, NULL, "Software Perspective", &cv_grshearing, 130}, - {IT_STRING|IT_CVAR, NULL, "Rendering Distance", &cv_grrenderdistance, 140}, + {IT_STRING|IT_CVAR, NULL, "Wall Contrast Style", &cv_grfakecontrast, 115}, + {IT_STRING|IT_CVAR, NULL, "Sprite Billboarding", &cv_grspritebillboarding, 125}, + {IT_STRING|IT_CVAR, NULL, "Software Perspective", &cv_grshearing, 135}, + {IT_STRING|IT_CVAR, NULL, "Rendering Distance", &cv_grrenderdistance, 145}, {IT_SUBMENU|IT_STRING, NULL, "Gamma...", &OP_OpenGLColorDef, 160}, }; @@ -1688,12 +1689,9 @@ static menuitem_t OP_SaturnMenu[] = { {IT_HEADER, NULL, "Saturn Options", NULL, 0}, {IT_STRING | IT_CVAR, NULL, "Serverqueue waittime", &cv_connectawaittime, 40}, - {IT_STRING | IT_CVAR, NULL, "Addon Download Speed", &cv_downloadspeed, 55}, + //{IT_STRING | IT_CVAR, NULL, "Addon Download Speed", &cv_downloadspeed, 55}, {IT_STRING | IT_CVAR, NULL, "Less Flicker effects", &cv_lessflicker, 70}, {IT_STRING | IT_CVAR, NULL, "Skin Select Spinning Speed", &cv_skinselectspin, 80}, -#ifdef HWRENDER - {IT_STRING | IT_CVAR, NULL, "Min Shader Brightness", &cv_secbright, 90}, -#endif {IT_SUBMENU|IT_STRING, NULL, "Player distortion...", &OP_PlayerDistortDef, 110}, {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 125},