From 08a90a13f4b8701f93698aea0174ed46e93ec971 Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <eruanna@drdteam.org>
Date: Wed, 26 Oct 2016 00:38:59 -0400
Subject: [PATCH] - Moved renderer menu to options menu. Removed duplicate
 swtruecolor entry in "Truecolor Options"

---
 wadsrc/static/language.enu | 2 +-
 wadsrc/static/menudef.txt  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu
index 3ac8d2ce8..ed17f587a 100644
--- a/wadsrc/static/language.enu
+++ b/wadsrc/static/language.enu
@@ -1656,6 +1656,7 @@ OPTMNU_NETWORK				= "Network Options";
 OPTMNU_SOUND				= "Sound Options";
 OPTMNU_DISPLAY				= "Display Options";
 OPTMNU_VIDEO				= "Set video mode";
+OPTMNU_CHANGERENDER		= "Change Rendering Output";
 OPTMNU_DEFAULTS				= "Reset to defaults";
 OPTMNU_RESETTOSAVED			= "Reset to last saved";
 OPTMNU_CONSOLE				= "Go to console";
@@ -2159,7 +2160,6 @@ VIDMNU_HIDPI			= "Retina/HiDPI support";
 VIDMNU_ASPECTRATIO		= "Aspect ratio";
 VIDMNU_FORCEASPECT		= "Force aspect ratio";
 VIDMNU_5X4ASPECTRATIO	= "Enable 5:4 aspect ratio";
-VIDMNU_CHANGERENDER		= "Change Rendering Output";
 VIDMNU_ENTERTEXT		= "Press ENTER to set mode";
 VIDMNU_TESTTEXT1		= "T to test mode for 5 seconds";
 VIDMNU_TESTTEXT2		= "Please wait 5 seconds...";
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index 8c1bb5481..42fb35fef 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -345,6 +345,7 @@ OptionMenu "OptionsMenu"
 	Submenu "$OPTMNU_SOUND",			"SoundOptions"
 	Submenu "$OPTMNU_DISPLAY",			"VideoOptions"
 	Submenu "$OPTMNU_VIDEO",			"VideoModeMenu"
+	Submenu "$OPTMNU_CHANGERENDER",		"RendererMenu"
 	StaticText " "
 	SafeCommand "$OPTMNU_DEFAULTS",	"reset2defaults"
 	SafeCommand	"$OPTMNU_RESETTOSAVED",	"reset2saved"
@@ -670,7 +671,7 @@ OptionMenu "TrueColorOptions"
 	Title "$TCMNU_TITLE"
 	Option "$TCMNU_MULTITHREADED",			"r_multithreaded", "OnOff"
 	StaticText " "
-	Option "$TCMNU_TRUECOLOR",				"swtruecolor", "OnOff"
+	//Option "$TCMNU_TRUECOLOR",				"swtruecolor", "OnOff"
 	Option "$TCMNU_MINFILTER",				"r_minfilter", "OnOff"
 	Option "$TCMNU_MAGFILTER",				"r_magfilter", "OnOff"
 	Option "$TCMNU_MIPMAP",					"r_mipmap", "OnOff"
@@ -1825,7 +1826,6 @@ OptionMenu VideoModeMenu
 	Option "$VIDMNU_ASPECTRATIO",		"menu_screenratios", "Ratios"
 	Option "$VIDMNU_FORCEASPECT",		"vid_aspect", "ForceRatios"
 	Option "$VIDMNU_5X4ASPECTRATIO",	"vid_tft", "YesNo"
-	Submenu "$VIDMNU_CHANGERENDER",		"RendererMenu"
 	StaticText " "
 	ScreenResolution "res_0"
 	ScreenResolution "res_1"