Clean up graphic menus

- Renamed Experimental Options to Advanced Options
- Fixed the tooltips not displaying
- Made it look good again
This commit is contained in:
Alug committed 2024-07-10 19:26:40 +02:00
1 parent 561fc2d01a
commit 8effdc1615
1 file changed
+32 -30
+32 -30
View File
@@ -1355,7 +1355,7 @@ static menuitem_t OP_VideoOptionsMenu[] =
#ifdef HWRENDER
{IT_SUBMENU|IT_STRING, NULL, "OpenGL Options...", &OP_OpenGLOptionsDef, 155},
#endif
{IT_SUBMENU|IT_STRING, NULL, "Experimental Options...", &OP_ExpOptionsDef, 165},
{IT_SUBMENU|IT_STRING, NULL, "Advanced Options...", &OP_ExpOptionsDef, 165},
};
@@ -1379,7 +1379,7 @@ static const char* OP_VideoTooltips[] =
#ifdef HWRENDER
"Options for OpenGL renderer.",
#endif
"Experimental graphical options.",
"Advanced graphical options.",
};
@@ -1454,20 +1454,20 @@ static menuitem_t OP_ColorOptionsMenu[] =
static menuitem_t OP_ExpOptionsMenu[] =
{
{IT_HEADER, NULL, "Experimental Options", NULL, 10},
{IT_HEADER, NULL, "Advanced Options", NULL, 10},
{IT_STRING|IT_CVAR, NULL, "Interpolation Distance", &cv_grmaxinterpdist, 20},
{IT_STRING | IT_CVAR, NULL, "Weather Interpolation", &cv_precipinterp, 30},
{IT_STRING | IT_CVAR, NULL, "Less Weather Effects", &cv_lessprecip, 35},
{IT_STRING | IT_CVAR, NULL, "Skyboxes", &cv_skybox, 42},
{IT_STRING | IT_CVAR, NULL, "Skyboxes", &cv_skybox, 45},
#ifdef HWRENDER
{IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_grscreentextures, 68},
{IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_grscreentextures, 55},
#ifdef USE_FBO_OGL
{IT_STRING | IT_CVAR, NULL, "FBO Downsampling support", &cv_grframebuffer, 73},
{IT_STRING | IT_CVAR, NULL, "FBO Downsampling support", &cv_grframebuffer, 60},
#endif
{IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_grpalettedepth, 80},
{IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_grpalettedepth, 70},
#endif
};
@@ -1507,23 +1507,24 @@ enum
#ifdef HWRENDER
static menuitem_t OP_OpenGLOptionsMenu[] =
{
{IT_STRING | IT_CVAR, NULL, "3D Models", &cv_grmdls, 15},
{IT_STRING | IT_CVAR, NULL, "Fallback Player 3D Model", &cv_grfallbackplayermodel, 20},
{IT_STRING | IT_CVAR, NULL, "Shaders", &cv_grshaders, 25},
{IT_STRING | IT_CVAR, NULL, "Palette Rendering", &cv_grpaletterendering, 30},
{IT_STRING | IT_CVAR, NULL, "Flashpals in Palette Renderer", &cv_grflashpal, 35},
{IT_STRING | IT_CVAR, NULL, "Min Shader Brightness", &cv_secbright, 40},
{IT_STRING | IT_CVAR, NULL, "3D Models", &cv_grmdls, 15},
{IT_STRING | IT_CVAR, NULL, "Fallback Player 3D Model", &cv_grfallbackplayermodel, 20},
{IT_STRING | IT_CVAR, NULL, "Shaders", &cv_grshaders, 25},
{IT_STRING | IT_CVAR, NULL, "Palette Rendering", &cv_grpaletterendering, 30},
{IT_STRING | IT_CVAR, NULL, "Flashpals in Palette Renderer", &cv_grflashpal, 35},
{IT_STRING | IT_CVAR, NULL, "Min Shader Brightness", &cv_secbright, 40},
{IT_STRING|IT_CVAR, NULL, "Texture Quality", &cv_scr_depth, 50},
{IT_STRING|IT_CVAR, NULL, "Texture Filter", &cv_grfiltermode, 55},
{IT_STRING|IT_CVAR, NULL, "Anisotropic", &cv_granisotropicmode, 60},
{IT_STRING|IT_CVAR, NULL, "Visual Portals", &cv_grportals, 65},
{IT_STRING|IT_CVAR, NULL, "Texture Quality", &cv_scr_depth, 50},
{IT_STRING|IT_CVAR, NULL, "Texture Filter", &cv_grfiltermode, 55},
{IT_STRING|IT_CVAR, NULL, "Anisotropic", &cv_granisotropicmode, 60},
{IT_STRING|IT_CVAR, NULL, "Visual Portals", &cv_grportals, 65},
{IT_STRING|IT_CVAR, NULL, "Wall Contrast Style", &cv_grfakecontrast, 75},
{IT_STRING|IT_CVAR, NULL, "Slope Contrast", &cv_grslopecontrast, 80},
{IT_STRING|IT_CVAR, NULL, "Sprite Billboarding", &cv_grspritebillboarding, 85},
{IT_STRING|IT_CVAR, NULL, "Software Perspective", &cv_grshearing, 90},
{IT_STRING|IT_CVAR, NULL, "Rendering Distance", &cv_grrenderdistance, 95},
{IT_STRING | IT_CVAR, NULL, "Dithered Lightning", &cv_lightdither, 85},
{IT_STRING|IT_CVAR, NULL, "Sprite Billboarding", &cv_grspritebillboarding, 90},
{IT_STRING|IT_CVAR, NULL, "Software Perspective", &cv_grshearing, 95},
{IT_STRING|IT_CVAR, NULL, "Rendering Distance", &cv_grrenderdistance, 100},
};
static const char* OP_OpenGLTooltips[] =
@@ -1540,6 +1541,7 @@ static const char* OP_OpenGLTooltips[] =
"Recreates an effect from software mode that is used on some maps.",
"The look of the wall contrast effect.",
"Wall contrast but for slopes.",
"Should OpenGL lightning be dithered?",
"Should sprites always face the camera?",
"Recreates the look of software mode camera perspective.",
"How far the game world should be drawn.",
@@ -5042,16 +5044,6 @@ static void M_DrawGenericMenu(void)
}
}
if (currentMenu == &OP_ExpOptionsDef)
{
if (!(OP_ExpTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_ExpTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
if (currentMenu == &OP_ChatOptionsDef)
{
if (!(OP_ChatOptionsTooltips[itemOn] == NULL))
@@ -5301,6 +5293,16 @@ static void M_DrawGenericScrollMenu(void)
coolalphatimer--;
}
}
if (currentMenu == &OP_ExpOptionsDef)
{
if (!(OP_ExpTooltips[itemOn] == NULL))
{
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_ExpTooltips[itemOn], coolalphatimer);
if (coolalphatimer > 0 && interpTimerHackAllow)
coolalphatimer--;
}
}
#endif
if (currentMenu == &OP_SaturnDef)