From baf5ebd1cec063af038f7e568196a4ac25d14ddc Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Wed, 27 Feb 2019 14:07:49 -0500 Subject: [PATCH] - fixed: menu language selection would not save on exit (this was due to CVAR protections from the menu) - moved language entry up a bit in the menu - converted the language entry into a proper CVAR string list selection, instead of a separate menu with said list. --- wadsrc/static/menudef.txt | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 957a69935..ae0d1def1 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -378,11 +378,11 @@ OptionMenu "OptionsMenu" protected Submenu "$OPTMNU_DISPLAY", "VideoOptions" Submenu "$OPTMNU_VIDEO", "VideoModeMenu" StaticText " " + Option "$OPTMNU_LANGUAGE", "language", "LanguageOptions" + StaticText " " SafeCommand "$OPTMNU_DEFAULTS", "reset2defaults" SafeCommand "$OPTMNU_RESETTOSAVED", "reset2saved" Command "$OPTMNU_CONSOLE", "menuconsole" - StaticText " " - Submenu "$OPTMNU_LANGUAGE", "LanguageOptions" } //------------------------------------------------------------------------------------------- @@ -2554,14 +2554,13 @@ OptionMenu "ReverbSave" protected * *=======================================*/ -OptionMenu "LanguageOptions" +OptionString "LanguageOptions" { - Title "$OPTMNU_LANGUAGE" - StaticText " " - Command "English (UK)", "language eng" - Command "English (US)", "language enu" - Command "Français (FR)", "language fr" - Command "Italiano (ITA)", "language ita" - Command "Português do Brasil (PTB)", "language ptb" - Command "Русский (RU)", "language rus" + "auto", "Auto" + "eng", "English (UK)" + "enu", "English (US)" + "fr", "Français (FR)" + "ita", "Italiano (ITA)" + "ptb", "Português do Brasil (PTB)" + "rus", "Русский (RU)" }