From 1bcb594053c63746f6940cb1ae22cc64024a92f7 Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <madame-rachelle@users.noreply.github.com>
Date: Sun, 11 Oct 2020 15:57:28 -0400
Subject: [PATCH] - Begin construction of the Simplified Menu

---
 wadsrc/static/menudef.classic    |  6 ++--
 wadsrc/static/menudef.simplified | 53 ++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/wadsrc/static/menudef.classic b/wadsrc/static/menudef.classic
index 1db99dff17..01318f4bd4 100644
--- a/wadsrc/static/menudef.classic
+++ b/wadsrc/static/menudef.classic
@@ -78,11 +78,11 @@ LISTMENU "MainMenu"
 		{
 			PatchItem "M_LOADG", "l", "LoadGameMenu", 0
 			PatchItem "M_SAVEG", "s", "SaveGameMenu",0
-			PatchItem "M_OPTION","o", "OptionsMenu", 0
+			PatchItem "M_OPTION","o", "OptionsMenuSimple", 0
 		}
 		else
 		{
-			PatchItem "M_OPTION","o", "OptionsMenu", 0
+			PatchItem "M_OPTION","o", "OptionsMenuSimple", 0
 			PatchItem "M_LOADG", "l", "LoadGameMenu", 0
 			PatchItem "M_SAVEG", "s", "SaveGameMenu", 0
 		}
@@ -96,7 +96,7 @@ LISTMENU "MainMenu"
 	IfGame(Heretic, Hexen)
 	{
 		TextItem "$MNU_NEWGAME", "n", "PlayerclassMenu"
-		TextItem "$MNU_OPTIONS", "o", "OptionsMenu"
+		TextItem "$MNU_OPTIONS", "o", "OptionsMenuSimple"
 		TextItem "$MNU_GAMEFILES", "g", "GameFilesMenu"
 		TextItem "$MNU_INFO", "i", "ReadThisMenu"
 		TextItem "$MNU_QUITGAME", "q", "QuitMenu"
diff --git a/wadsrc/static/menudef.simplified b/wadsrc/static/menudef.simplified
index 0cdda95a60..7ceaee60fe 100644
--- a/wadsrc/static/menudef.simplified
+++ b/wadsrc/static/menudef.simplified
@@ -2,3 +2,56 @@
 // this file is *only* for options that are relevant to a novice user of GZDoom
 // this file needs to be regularly pruned, with options coalesced as much as possible. any and all verbosity should go to the classic menus.
 
+OptionMenu "OptionsMenuSimple" protected
+{
+	Title "$OPTMNU_TITLE"
+	Submenu "$OPTMNU_CONTROLS",			"CustomizeControls"
+	Submenu "$OPTMNU_MOUSE",			"MouseOptions"
+	Submenu "$OPTMNU_JOYSTICK",			"JoystickOptions"
+	StaticText " "
+	Submenu "$OPTMNU_SOUND",			"SoundOptionsSimple"
+	Submenu "$OPTMNU_DISPLAY",			"VideoOptionsSimple"
+	StaticText " "
+	Submenu "$OS_TITLE", "os_Menu"
+	StaticText " "
+	Submenu "$OMS_CLASSIC", "OptionsMenu"
+	StaticText " "
+	SafeCommand "$OPTMNU_DEFAULTS",	"reset2defaults"
+	SafeCommand	"$OPTMNU_RESETTOSAVED",	"reset2saved"
+	Command "$OPTMNU_CONSOLE",			"menuconsole"
+	StaticText " "
+}
+
+OptionMenu SoundOptionsSimple protected
+{
+	Title "$SNDMNU_TITLE"
+	Slider "$MODMNU_MASTERVOLUME",		"snd_mastervolume", 0, 1, 0.05, 2
+	StaticText " "
+	Slider "$SNDMNU_SFXVOLUME",			"snd_sfxvolume", 0, 1, 0.05, 2
+	Slider "$SNDMNU_MUSICVOLUME",		"snd_musicvolume", 0, 1, 0.05, 2
+	StaticText " "
+	Slider "$SNDMNU_MENUVOLUME",		"snd_menuvolume", 0, 1, 0.05, 2
+	StaticText " "
+	Option "$SNDMNU_MIDIDEVICE",		"snd_mididevice", "MidiDevices"
+	Command "$SNDMNU_RESTART",			"snd_reset"
+}
+
+OptionMenu VideoOptionsSimple protected
+{
+	Title "$VIDMNU_TITLE"
+
+	Option "$VIDMNU_PREFERBACKEND",		"vid_preferbackend", "PreferBackend"
+	Option "$VIDMNU_RENDERMODE",		"vid_rendermode", "RenderMode"
+	Option "$VIDMNU_FULLSCREEN",		"vid_fullscreen", "YesNo"
+	IfOption(Mac)
+	{
+		Option "$VIDMNU_HIDPI",			"vid_hidpi", "YesNo"
+	}
+	StaticText " "
+	Slider "$VIDMNU_SCALEFACTOR",		"vid_scalefactor", 0.25, 2.0, 0.25, 2
+
+	StaticText " "
+	Option "$GLTEXMNU_TEXFILTER",		gl_texture_filter,				"FilterModes"
+	Option "$GLTEXMNU_ANISOTROPIC",		gl_texture_filter_anisotropic,	"Anisotropy"
+	Option "$GLPREFMNU_SECLIGHTMODE",			gl_lightmode,					"LightingModes"
+}