From 1a7d92a082e24a2cc05dd90854e32c9fb98ec6bb Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 11 Jan 2024 00:50:26 +0100 Subject: [PATCH] Revert "Revert "fix some things"" This reverts commit a65e586de5452c23854d8abafa0e1d261d3107ac. --- src/m_menu.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 14c8834a1..2d467dee9 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1361,27 +1361,27 @@ static menuitem_t OP_VideoOptionsMenu[] = NULL, "Brightness", &cv_globalgamma, 30}, {IT_STRING | IT_CVAR | IT_CV_SLIDER, - NULL, "Saturation", &cv_globalsaturation , 35}, + NULL, "Saturation", &cv_globalsaturation , 40}, - {IT_SUBMENU|IT_STRING, NULL, "Advanced Color Settings...", &OP_ColorOptionsDef, 40}, + {IT_SUBMENU|IT_STRING, NULL, "Advanced Color Settings...", &OP_ColorOptionsDef, 50}, - {IT_STRING | IT_CVAR, NULL, "Draw Distance", &cv_drawdist, 45}, + {IT_STRING | IT_CVAR, NULL, "Draw Distance", &cv_drawdist, 65}, //{IT_STRING | IT_CVAR, NULL, "NiGHTS Draw Dist", &cv_drawdist_nights, 55}, - {IT_STRING | IT_CVAR, NULL, "Weather Draw Distance",&cv_drawdist_precip, 55}, + {IT_STRING | IT_CVAR, NULL, "Weather Draw Distance",&cv_drawdist_precip, 75}, //{IT_STRING | IT_CVAR, NULL, "Weather Density", &cv_precipdensity, 65}, - {IT_STRING | IT_CVAR, NULL, "Skyboxes", &cv_skybox, 65}, - {IT_STRING | IT_CVAR, NULL, "Field of View", &cv_fov, 75}, + {IT_STRING | IT_CVAR, NULL, "Skyboxes", &cv_skybox, 85}, + {IT_STRING | IT_CVAR, NULL, "Field of View", &cv_fov, 95}, - {IT_STRING | IT_CVAR, NULL, "Show FPS", &cv_ticrate, 90}, - {IT_STRING | IT_CVAR, NULL, "Vertical Sync", &cv_vidwait, 100}, - {IT_STRING | IT_CVAR, NULL, "FPS Cap", &cv_fpscap, 110}, - {IT_STRING | IT_CVAR, NULL, "Drift spark pulse size",&cv_driftsparkpulse, 120}, - {IT_STRING | IT_CVAR, NULL, "Uppercase Menu", &cv_menucaps, 130}, + {IT_STRING | IT_CVAR, NULL, "Show FPS", &cv_ticrate, 105}, + {IT_STRING | IT_CVAR, NULL, "Vertical Sync", &cv_vidwait, 115}, + {IT_STRING | IT_CVAR, NULL, "FPS Cap", &cv_fpscap, 125}, + {IT_STRING | IT_CVAR, NULL, "Drift spark pulse size",&cv_driftsparkpulse, 135}, + {IT_STRING | IT_CVAR, NULL, "Uppercase Menu", &cv_menucaps, 145}, #ifdef HWRENDER - {IT_SUBMENU|IT_STRING, NULL, "OpenGL Options...", &OP_OpenGLOptionsDef, 140}, + {IT_SUBMENU|IT_STRING, NULL, "OpenGL Options...", &OP_OpenGLOptionsDef, 155}, #endif - {IT_SUBMENU|IT_STRING, NULL, "Experimental Options...", &OP_ExpOptionsDef, 150}, + {IT_SUBMENU|IT_STRING, NULL, "Experimental Options...", &OP_ExpOptionsDef, 165}, }; @@ -2825,7 +2825,8 @@ menu_t OP_ColorOptionsDef = M_DrawColorMenu, 30, 30, 0, - NULL + NULL, + {NULL} }; menu_t OP_SoundOptionsDef =