From 338d338e2733f475b7f2ebfed7eff08d09007bcd Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Mon, 2 Jan 2017 17:55:24 -0500 Subject: [PATCH] - Moved multithreaded option from Truecolor menu to the Display menu since both the palette and truecolor drawer sets now use it. --- wadsrc/static/language.enu | 2 +- wadsrc/static/menudef.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu index c6de55f6f..250de5f18 100644 --- a/wadsrc/static/language.enu +++ b/wadsrc/static/language.enu @@ -1811,6 +1811,7 @@ DSPLYMNU_DIMCOLOR = "Dim color"; DSPLYMNU_MOVEBOB = "View bob amount while moving"; DSPLYMNU_STILLBOB = "View bob amount while not moving"; DSPLYMNU_BOBSPEED = "Weapon bob speed"; +DSPLYMNU_MULTITHREADED = "Multithreaded Drawing"; // HUD Options HUDMNU_TITLE = "HUD Options"; @@ -2753,7 +2754,6 @@ 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"; diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 314534bb7..d069065ac 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -675,7 +675,6 @@ OptionMenu "OpenGLOptions" OptionMenu "TrueColorOptions" { Title "$TCMNU_TITLE" - Option "$TCMNU_MULTITHREADED", "r_multithreaded", "OnOff" StaticText " " //Option "$TCMNU_TRUECOLOR", "swtruecolor", "OnOff" Option "$TCMNU_MINFILTER", "r_minfilter", "OnOff" @@ -705,6 +704,7 @@ OptionMenu "VideoOptions" Slider "$DSPLYMNU_PICKUPFADE", "pickup_fade_scalar", 0.0, 1.0, 0.05, 2 Slider "$DSPLYMNU_WATERFADE", "underwater_fade_scalar", 0.0, 1.0, 0.05, 2 Option "$DSPLYMNU_BLENDMETHOD", "r_blendmethod", "BlendMethods" + Option "$DSPLYMNU_MULTITHREADED", "r_multithreaded", "OnOff" StaticText " " Option "$DSPLYMNU_WIPETYPE", "wipetype", "Wipes"