From a4ccbddfd699104a7fdf32a1860253971f52265b Mon Sep 17 00:00:00 2001 From: raa-eruanna Date: Fri, 7 Oct 2016 02:38:08 -0400 Subject: [PATCH] - Menudef: Split Truecolor options into their own menu. --- wadsrc/static/language.enu | 18 ++++++++++++++---- wadsrc/static/menudef.txt | 16 ++++++++++++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu index c76414c8a..b7d887727 100644 --- a/wadsrc/static/language.enu +++ b/wadsrc/static/language.enu @@ -1780,10 +1780,6 @@ DSPLYMNU_BRIGHTNESS = "Brightness"; DSPLYMNU_VSYNC = "Vertical Sync"; DSPLYMNU_CAPFPS = "Rendering Interpolation"; DSPLYMNU_COLUMNMETHOD = "Column render mode"; -DSPLYMNU_TRUECOLOR = "True color output"; -DSPLYMNU_MINFILTER = "Linear filter when downscaling"; -DSPLYMNU_MAGFILTER = "Linear filter when upscaling"; -DSPLYMNU_MIPMAP = "Use mipmapped textures"; DSPLYMNU_WIPETYPE = "Screen wipe style"; DSPLYMNU_SHOWENDOOM = "Show ENDOOM screen"; DSPLYMNU_BLOODFADE = "Blood Flash Intensity"; @@ -2726,3 +2722,17 @@ OPTVAL_LOW = "Low"; OPTVAL_MEDIUM = "Medium"; OPTVAL_HIGH = "High"; OPTVAL_EXTREME = "Extreme"; + +// QZDoom exclusive: + +DSPLYMNU_TCOPT = "TrueColor Options"; + +TCMNU_TITLE = "TRUECOLOR OPTIONS"; + + +TCMNU_MULTITHREADED = "Multithreaded Drawing"; +TCMNU_TRUECOLOR = "True color output"; +TCMNU_MINFILTER = "Linear filter when downscaling"; +TCMNU_MAGFILTER = "Linear filter when upscaling"; +TCMNU_MIPMAP = "Use mipmapped textures"; + diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 715eff63b..ac4e02be9 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -658,11 +658,23 @@ OptionMenu "OpenGLOptions" Submenu "$GLMNU_PREFS", "GLPrefOptions" } +OptionMenu "TrueColorOptions" +{ + Title "$TCMNU_TITLE" + Option "$TCMNU_MULTITHREADED", "r_multithreaded", "OnOff" + StaticText " " + Option "$TCMNU_TRUECOLOR", "swtruecolor", "OnOff" + Option "$TCMNU_MINFILTER", "r_minfilter", "OnOff" + Option "$TCMNU_MAGFILTER", "r_magfilter", "OnOff" + Option "$TCMNU_MIPMAP", "r_mipmap", "OnOff" +} + OptionMenu "VideoOptions" { Title "$DSPLYMNU_TITLE" Submenu "$DSPLYMNU_GLOPT", "OpenGLOptions" + Submenu "$DSPLYMNU_TCOPT", "TrueColorOptions" Submenu "$DSPLYMNU_SCOREBOARD", "ScoreboardOptions" StaticText " " Slider "$DSPLYMNU_SCREENSIZE", "screenblocks", 3.0, 12.0, 1.0, 0 @@ -677,10 +689,6 @@ OptionMenu "VideoOptions" Slider "$DSPLYMNU_BLOODFADE", "blood_fade_scalar", 0.0, 1.0, 0.05, 1 Slider "$DSPLYMNU_PICKUPFADE", "pickup_fade_scalar", 0.0, 1.0, 0.05, 1 Option "$DSPLYMNU_COLUMNMETHOD", "r_columnmethod", "ColumnMethods" - Option "$DSPLYMNU_TRUECOLOR", "swtruecolor", "OnOff" - Option "$DSPLYMNU_MINFILTER", "r_minfilter", "OnOff" - Option "$DSPLYMNU_MAGFILTER", "r_magfilter", "OnOff" - Option "$DSPLYMNU_MIPMAP", "r_mipmap", "OnOff" StaticText " " Option "$DSPLYMNU_WIPETYPE", "wipetype", "Wipes"