From a65c9bec40b27d9493fe116c53c63532362cd869 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 4 Apr 2015 10:37:31 +0200 Subject: [PATCH] - move video options override out of menudef.z. This is to allow easier merging with future ZDoom changes It was done this way only to avoid having to deal with SVN's poor merging capabilities but with Git this is no longer an issue. The OpenGL submenus will remain where they are, though. --- wadsrc/static/menudef.txt | 16 +++++++++++-- wadsrc/static/menudef.z | 47 --------------------------------------- 2 files changed, 14 insertions(+), 49 deletions(-) diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 07f841545..42d84852a 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -656,17 +656,29 @@ OptionValue Fuzziness 2.0, "Shadow" } +OptionMenu "OpenGLOptions" +{ + Title "OPENGL OPTIONS" + Submenu "Dynamic Light Options", "GLLightOptions" + Submenu "Texture Options", "GLTextureGLOptions" + Submenu "Preferences", "GLPrefOptions" +} + OptionMenu "VideoOptions" { Title "DISPLAY OPTIONS" + Submenu "OpenGL Options", "OpenGLOptions" Submenu "Scoreboard Options", "ScoreboardOptions" StaticText " " Slider "Screen size", "screenblocks", 3.0, 12.0, 1.0, 0 - Slider "Brightness", "Gamma", 0.75, 3.0, 0.05, 2 + + Slider "Gamma correction", "Gamma", 0.75, 3.0, 0.05, 2 + Slider "Brightness", "vid_brightness", -0.8,0.8, 0.05 + Slider "Contrast", "vid_contrast", 0.1, 3.0, 0.1 + Option "Vertical Sync", "vid_vsync", "OnOff" Option "Rendering Interpolation", "cl_capfps", "OffOn" - Option "Column render mode", "r_columnmethod", "ColumnMethods" StaticText " " Option "Screen wipe style", "wipetype", "Wipes" diff --git a/wadsrc/static/menudef.z b/wadsrc/static/menudef.z index 1dd676d50..75ea1bf5f 100644 --- a/wadsrc/static/menudef.z +++ b/wadsrc/static/menudef.z @@ -175,50 +175,3 @@ OptionMenu "GLPrefOptions" Option "Rendering quality", gl_render_precise, "Precision" } -OptionMenu "OpenGLOptions" -{ - Title "OPENGL OPTIONS" - Submenu "Dynamic Light Options", "GLLightOptions" - Submenu "Texture Options", "GLTextureGLOptions" - Submenu "Preferences", "GLPrefOptions" -} - -OptionMenu "VideoOptions" -{ - Title "DISPLAY OPTIONS" - - Submenu "OpenGL Options", "OpenGLOptions" - Submenu "Scoreboard Options", "ScoreboardOptions" - StaticText " " - Slider "Screen size", "screenblocks", 3.0, 12.0, 1.0, 0 - - Slider "Gamma correction", "Gamma", 0.75, 3.0, 0.05, 2 - Slider "Brightness", "vid_brightness", -0.8,0.8, 0.05 - Slider "Contrast", "vid_contrast", 0.1, 3.0, 0.1 - - Option "Vertical Sync", "vid_vsync", "OnOff" - Option "Rendering Interpolation", "cl_capfps", "OffOn" - - StaticText " " - Option "Screen wipe style", "wipetype", "Wipes" - - IfOption(Windows) - { - Option "Show ENDOOM screen", "showendoom", "Endoom" - } - - Option "Stretch short skies", "r_stretchsky", "OnOff" - Option "Use fuzz effect", "r_drawfuzz", "Fuzziness" - Slider "Lost Soul translucency", "transsouls", 0.25, 1.0, 0.05, 2 - Option "Use fake contrast", "r_fakecontrast", "Contrast" - Option "Rocket Trails", "cl_rockettrails", "RocketTrailTypes" - Option "Blood Type", "cl_bloodtype", "BloodTypes" - Option "Bullet Puff Type", "cl_pufftype", "PuffTypes" - Slider "Number of particles", "r_maxparticles", 100, 10000, 100, 0 - Slider "Number of decals", "cl_maxdecals", 0, 10000, 100, 0 - Option "Show player sprites", "r_drawplayersprites", "OnOff" - Option "Death camera", "r_deathcamera", "OnOff" - Option "Teleporter zoom", "telezoom", "OnOff" - Slider "Earthquake shake intensity", "r_quakeintensity", 0.0, 1.0, 0.05, 2 - Option "Interpolate monster movement", "nomonsterinterpolation", "NoYes" -}