diff --git a/src/m_menu.c b/src/m_menu.c index 841e07e85..f54bb8269 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1363,33 +1363,30 @@ static const char* OP_MouseTooltips[] = static menuitem_t OP_VideoOptionsMenu[] = { - {IT_STRING | IT_CALL, NULL, "Set Resolution...", M_VideoModeMenu, 10}, + {IT_STRING | IT_CALL, NULL, "Set Resolution...", M_VideoModeMenu, 10}, #if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL) - {IT_STRING|IT_CVAR, NULL, "Fullscreen", &cv_fullscreen, 20}, + {IT_STRING|IT_CVAR, NULL, "Fullscreen", &cv_fullscreen, 20}, #endif {IT_STRING | IT_CVAR | IT_CV_SLIDER, - NULL, "Brightness", &cv_globalgamma, 30}, + NULL, "Brightness", &cv_globalgamma, 30}, {IT_STRING | IT_CVAR | IT_CV_SLIDER, - NULL, "Saturation", &cv_globalsaturation , 40}, + NULL, "Saturation", &cv_globalsaturation , 40}, - {IT_SUBMENU|IT_STRING, NULL, "Advanced Color Settings...", &OP_ColorOptionsDef, 50}, + {IT_SUBMENU|IT_STRING, NULL, "Advanced Color Settings...", &OP_ColorOptionsDef, 50}, - {IT_STRING | IT_CVAR, NULL, "Randomized Directional Light",&cv_randomdirlight, 60}, + {IT_STRING | IT_CVAR, NULL, "Draw Distance", &cv_drawdist, 65}, + {IT_STRING | IT_CVAR, NULL, "Weather Draw Distance", &cv_drawdist_precip, 75}, - {IT_STRING | IT_CVAR, NULL, "Draw Distance", &cv_drawdist, 75}, - {IT_STRING | IT_CVAR, NULL, "Weather Draw Distance",&cv_drawdist_precip, 85}, - - {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, "VHS effect", &cv_vhseffect, 145}, + {IT_STRING | IT_CVAR, NULL, "Show FPS", &cv_ticrate, 95}, + {IT_STRING | IT_CVAR, NULL, "Vertical Sync", &cv_vidwait, 105}, + {IT_STRING | IT_CVAR, NULL, "FPS Cap", &cv_fpscap, 115}, + {IT_STRING | IT_CVAR, NULL, "Drift spark pulse size", &cv_driftsparkpulse, 125}, + {IT_STRING | IT_CVAR, NULL, "VHS effect", &cv_vhseffect, 135}, #ifdef HWRENDER - {IT_SUBMENU|IT_STRING, NULL, "OpenGL Options...", &OP_OpenGLOptionsDef, 155}, + {IT_SUBMENU|IT_STRING, NULL, "OpenGL Options...", &OP_OpenGLOptionsDef, 145}, #endif - {IT_SUBMENU|IT_STRING, NULL, "Advanced Video Options...", &OP_ExpOptionsDef, 165}, - + {IT_SUBMENU|IT_STRING, NULL, "Advanced Video Options...", &OP_ExpOptionsDef, 155}, }; static const char* OP_VideoTooltips[] = @@ -1401,7 +1398,6 @@ static const char* OP_VideoTooltips[] = "Gamma (brightness) of the game.", "Saturation of the game.", "Advanced color settings of the game.", - "Should the directional lightning be randomized each map?\nTakes effect on next map load.", "How far away objects are drawn.", "How far away weather is drawn.", "Show current game framerate and select the style.", @@ -1425,7 +1421,6 @@ enum op_video_gamma, op_video_sat, op_video_color, - op_video_dirlight, op_video_dd, op_video_wdd, op_video_fps, @@ -1487,23 +1482,25 @@ static menuitem_t OP_ColorOptionsMenu[] = static menuitem_t OP_ExpOptionsMenu[] = { - {IT_HEADER, NULL, "Advanced Video Options", NULL, 10}, - {IT_STRING|IT_CVAR, NULL, "Interpolation Distance", &cv_maxinterpdist, 30}, - {IT_STRING | IT_CVAR, NULL, "Weather Interpolation", &cv_precipinterp, 40}, + {IT_HEADER, NULL, "Advanced Video Options", NULL, 15}, + {IT_STRING|IT_CVAR, NULL, "Interpolation Distance", &cv_maxinterpdist, 25}, + {IT_STRING | IT_CVAR, NULL, "Weather Interpolation", &cv_precipinterp, 30}, - {IT_STRING | IT_CVAR, NULL, "Scale Weather with Mobjscale", &cv_mobjscaleprecip, 60}, - {IT_STRING | IT_CVAR, NULL, "Less Weather Effects", &cv_lessprecip, 70}, + {IT_STRING | IT_CVAR, NULL, "Scale Weather with Mobjscale", &cv_mobjscaleprecip, 40}, + {IT_STRING | IT_CVAR, NULL, "Less Weather Effects", &cv_lessprecip, 45}, - {IT_STRING | IT_CVAR, NULL, "Skyboxes", &cv_skybox, 80}, + {IT_STRING | IT_CVAR, NULL, "Randomized Directional Light", &cv_randomdirlight, 55}, - {IT_STRING | IT_CVAR, NULL, "FPS counter sampling", &cv_accuratefps, 90}, + {IT_STRING | IT_CVAR, NULL, "Skyboxes", &cv_skybox, 65}, + + {IT_STRING | IT_CVAR, NULL, "FPS counter sampling", &cv_accuratefps, 75}, #ifdef HWRENDER - {IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_glscreentextures, 110}, + {IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_glscreentextures, 85}, #ifdef USE_FBO_OGL - {IT_STRING | IT_CVAR, NULL, "FBO Downsampling support", &cv_glframebuffer, 120}, + {IT_STRING | IT_CVAR, NULL, "FBO Downsampling support", &cv_glframebuffer, 90}, #endif - {IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 140}, + {IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 100}, #endif }; @@ -1514,6 +1511,7 @@ static const char* OP_ExpTooltips[] = "Should weather be interpolated? Weather should look about the\nsame but perform a bit better when disabled.", "Should weather be scaled with Mapobjectscale?.", "When weather is on this will cut the object amount used in half.", + "Should the directional lightning be randomized each map?\nTakes effect on next map load.", "Toggle being able to see the sky.", "Change the FPS counter sampling method\nInaccurate updates slower and might miss frame drops and such\nAccurate updates faster and is more accurate, but might be less readable", // how to ingles?? #ifdef HWRENDER @@ -1532,6 +1530,7 @@ enum op_exp_precipinter, op_exp_precipmoscale, op_exp_lessprecip, + op_exp_dirlight, op_exp_skybox, op_exp_accuratefps, #ifdef HWRENDER @@ -3114,7 +3113,7 @@ menu_t OP_MonitorToggleDef = menu_t OP_OpenGLOptionsDef = DEFAULTSCROLLSTYLE("M_VIDEO", OP_OpenGLOptionsMenu, &OP_VideoOptionsDef, 30, 30); #endif -menu_t OP_ExpOptionsDef = DEFAULTMENUSTYLE("M_VIDEO", OP_ExpOptionsMenu, &OP_VideoOptionsDef, 30, 30); +menu_t OP_ExpOptionsDef = DEFAULTSCROLLSTYLE("M_VIDEO", OP_ExpOptionsMenu, &OP_VideoOptionsDef, 30, 25); menu_t OP_DataOptionsDef = DEFAULTMENUSTYLE("M_DATA", OP_DataOptionsMenu, &OP_MainDef, 60, 30); menu_t OP_ScreenshotOptionsDef = DEFAULTMENUSTYLE("M_SCSHOT", OP_ScreenshotOptionsMenu, &OP_DataOptionsDef, 30, 30); @@ -5256,7 +5255,6 @@ static void M_DrawGenericMenu(void) DoToolTips(OP_ControlsDef, OP_ControlsTooltips); DoToolTips(OP_MouseOptionsDef, OP_MouseTooltips); DoToolTips(OP_VideoOptionsDef, OP_VideoTooltips); - DoToolTips(OP_ExpOptionsDef, OP_ExpTooltips); DoToolTips(OP_SoundOptionsDef, OP_SoundTooltips); DoToolTips(OP_SoundAdvancedDef, OP_SoundAdvancedTooltips); DoToolTips(OP_ChatOptionsDef, OP_ChatOptionsTooltips); @@ -5402,6 +5400,7 @@ static void M_DrawGenericScrollMenu(void) // dumb hack // tooltips // same macro here + DoToolTips(OP_ExpOptionsDef, OP_ExpTooltips); #ifdef HWRENDER DoToolTips(OP_OpenGLOptionsDef, OP_OpenGLTooltips); #endif