From 4c401f818588d73ef012a0af0dc08bbfba96e78d Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 3 Oct 2020 13:52:34 +0200 Subject: [PATCH] - minor cleanup on "Configure Controls" * Merged chat and scoreboard bindings into a "Multiplayer" submenu. * Reordered items by importance. Chat at position #2 was nonsense. * Moved weapon state actions from "Action" to "Weapon" menu, because the menu was already quite large and these are not standard actions. # Conflicts: # wadsrc/static/language.csv # wadsrc/static/menudef.txt # Conflicts: # wadsrc/static/menudef.txt --- wadsrc/static/language.enu | 3 +-- wadsrc/static/menudef.txt | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu index 44b27bce3..8fd42399b 100644 --- a/wadsrc/static/language.enu +++ b/wadsrc/static/language.enu @@ -1775,7 +1775,7 @@ CNTRLMNU_SCOREBOARD = "Show Scoreboard"; CNTRLMNU_TOGGLESCOREBOARD = "Toggle Scoreboard"; CNTRLMNU_ACTION = "Action"; CNTRLMNU_ACTION_TITLE = "Customize Action Controls"; -CNTRLMNU_CHAT_TITLE = "Customize Chat Controls"; +MNU_MULTIPLAYER = "Multiplayer"; CNTRLMNU_WEAPONS_TITLE = "Customize Weapon Controls"; CNTRLMNU_INVENTORY_TITLE = "Customize Inventory Controls"; CNTRLMNU_OTHER_TITLE = "Customize Other Controls"; @@ -1794,7 +1794,6 @@ CNTRLMNU_EXIT_TO_MAIN = "Exit to Main Menu"; CNTRLMNU_TOGGLE_MESSAGES = "Toggle Messages"; CNTRLMNU_MENU_QUIT = "Quit Game"; CNTRLMNU_ADJUST_GAMMA = "Adjust Gamma"; -CNTRLMNU_CHAT = "Chat"; CNTRLMNU_SAY = "Say"; CNTRLMNU_TEAMSAY = "Team say"; CNTRLMNU_WEAPONS = "Weapons"; diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 2ee245c81..54330756e 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -491,12 +491,12 @@ OptionMenu "CustomizeControls" protected Title "$CNTRLMNU_TITLE" Submenu "$CNTRLMNU_ACTION" , "ActionControlsMenu" - Submenu "$CNTRLMNU_CHAT" , "ChatControlsMenu" Submenu "$CNTRLMNU_WEAPONS" , "WeaponsControlMenu" Submenu "$CNTRLMNU_INVENTORY" , "InventoryControlsMenu" + Submenu "$MAPCNTRLMNU_CONTROLS" , "MapControlsMenu" Submenu "$CNTRLMNU_OTHER" , "OtherControlsMenu" Submenu "$CNTRLMNU_POPUPS" , "StrifeControlsMenu" - Submenu "$MAPCNTRLMNU_CONTROLS" , "MapControlsMenu" + Submenu "$MNU_MULTIPLAYER" , "ChatControlsMenu" StaticText " " Option "$CNTRLMNU_LAYOUT", "k_modern", "Layouts" SafeCommand "$OPTMNU_DEFAULTS", "resetb2defaults" @@ -549,24 +549,18 @@ OptionMenu "ActionControlsMenu" protected Control "$CNTRLMNU_RUN" , "+speed" Control "$CNTRLMNU_TOGGLERUN" , "toggle cl_run" Control "$CNTRLMNU_STRAFE" , "+strafe" - - StaticText "" - Control "$CNTRLMNU_SCOREBOARD" , "+showscores" - Control "$CNTRLMNU_TOGGLESCOREBOARD" , "togglescoreboard" - - StaticText "" - Control "$CNTRLMNU_USER1" , "+user1" - Control "$CNTRLMNU_USER2" , "+user2" - Control "$CNTRLMNU_USER3" , "+user3" - Control "$CNTRLMNU_USER4" , "+user4" } OptionMenu "ChatControlsMenu" protected { - Title "$CNTRLMNU_CHAT_TITLE" + Title "$MNU_MULTIPLAYER" ScrollTop 2 StaticTextSwitchable "$CNTRLMNU_SWITCHTEXT1", "$CNTRLMNU_SWITCHTEXT2", "ControlMessage" + StaticText "" + Control "$CNTRLMNU_SCOREBOARD" , "+showscores" + Control "$CNTRLMNU_TOGGLESCOREBOARD" , "togglescoreboard" + StaticText "" Control "$CNTRLMNU_SAY" , "messagemode" Control "$CNTRLMNU_TEAMSAY" , "messagemode2" @@ -593,6 +587,12 @@ OptionMenu "WeaponsControlMenu" protected Control "$CNTRLMNU_SLOT8" , "slot 8" Control "$CNTRLMNU_SLOT9" , "slot 9" Control "$CNTRLMNU_SLOT0" , "slot 0" + + StaticText "" + Control "$CNTRLMNU_USER1" , "+user1" + Control "$CNTRLMNU_USER2" , "+user2" + Control "$CNTRLMNU_USER3" , "+user3" + Control "$CNTRLMNU_USER4" , "+user4" } OptionMenu "InventoryControlsMenu" protected