From ec19213113f5e2a2c6ff5c8f3dd52a2893c0ae78 Mon Sep 17 00:00:00 2001
From: Dss0 <7338300+Dss0@users.noreply.github.com>
Date: Sun, 14 Aug 2022 00:34:57 +0200
Subject: [PATCH] Update Menus for Voice Chat!

---
 .../iw4x_00/localizedstrings/iw4x_english.str |  3 ++
 iw4x/iw4x_00/ui_mp/pc_options_audio.menu      |  3 ++
 iw4x/iw4x_00/ui_mp/scriptmenus/class.menu     | 52 ++++++++++++++++---
 3 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/iw4x/iw4x_00/localizedstrings/iw4x_english.str b/iw4x/iw4x_00/localizedstrings/iw4x_english.str
index 6873998..0f407ec 100644
--- a/iw4x/iw4x_00/localizedstrings/iw4x_english.str
+++ b/iw4x/iw4x_00/localizedstrings/iw4x_english.str
@@ -322,6 +322,9 @@ LANG_ENGLISH		"When should the friend status notifications be displayed?"
 REFERENCE			MPUI_DESC_OPTIONS
 LANG_ENGLISH		"Set your game options."
 
+REFERENCE           MPUI_ENABLE_VOICE_CHAT
+LANG_ENGLISH        "Enable Voice Chat"
+
 REFERENCE			MPUI_DESC_QUIT
 LANG_ENGLISH		"Quit the game."
 
diff --git a/iw4x/iw4x_00/ui_mp/pc_options_audio.menu b/iw4x/iw4x_00/ui_mp/pc_options_audio.menu
index 1b33d6a..e6084d3 100644
--- a/iw4x/iw4x_00/ui_mp/pc_options_audio.menu
+++ b/iw4x/iw4x_00/ui_mp/pc_options_audio.menu
@@ -78,4 +78,7 @@ menuDef
 
 	PC_OPTIONS_DVARSLIDER_RAW(0, "@MENU_MASTER_VOLUME", "snd_volume", 0, 1, 0, ;, ;, ;, when(0), 1, 1)
 	PC_OPTIONS_STRLIST_RAW(1, "@MENU_SPEAKER_CONFIG", "ui_outputConfig", {"@MENU_WINDOWS_DEFAULT"; "Windows default"; "@MENU_MONO"; "Mono"; "@MENU_STEREO"; "Stereo"; "@MENU_FOUR_SPEAKERS"; "4 speakers"; "@MENU_FIVE_ONE_SPEAKERS"; "5.1 speakers"}, setLocalVarBool "ui_showAudioApply" (1);, ;, when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1)
+	PC_OPTIONS_SEPERATOR(1)
+	PC_OPTIONS_DVARYESNO(2, "@MPUI_ENABLE_VOICE_CHAT", "cl_voice", ;, when(0))
+	PC_OPTIONS_KEYBINDING(3, "@MENU_VOICE_CHAT_BUTTON", "+talk")
 }
diff --git a/iw4x/iw4x_00/ui_mp/scriptmenus/class.menu b/iw4x/iw4x_00/ui_mp/scriptmenus/class.menu
index 8668f74..d42d953 100644
--- a/iw4x/iw4x_00/ui_mp/scriptmenus/class.menu
+++ b/iw4x/iw4x_00/ui_mp/scriptmenus/class.menu
@@ -451,7 +451,47 @@
 		}
 		itemDef
 		{
-			rect 0 68 216 1 1 1
+			name "game_options"
+			rect -64 68 336 20 1 1
+			visible 1
+			group "mw2_button"
+			style 1
+			forecolor 1 1 1 1
+			disablecolor 0.6 0.55 0.55 1
+			background "menu_button_selection_bar"
+			type 1
+			textfont 3
+			textalign 6
+			textalignx -60
+			textscale 0.375
+			text "@MPUI_MUTE_PLAYERS"
+			action
+			{
+				play "mouse_click";
+				close self;
+				open "muteplayer";
+			}
+			onFocus
+			{
+				play "mouse_over";
+				if ( dvarstring( "gameMode" ) != "mp" )
+				{
+					setItemColor "mw2_button" backcolor 0 0 0 0;
+				}
+				setItemColor self backcolor 0 0 0 1;
+				setLocalVarBool "ui_menuAButton" ( 1 );
+				setLocalVarFloat "ui_popupYPos" ( getfocuseditemy( ) );
+			}
+			leaveFocus
+			{
+				setItemColor self backcolor 0 0 0 "0.0";
+				setLocalVarString "ui_hint_text" ( "@NULL_EMPTY" );
+				setLocalVarBool "ui_menuAButton" ( 0 );
+			}
+		}
+		itemDef
+		{
+			rect 0 88 216 1 1 1
 			decoration
 			visible 1
 			style 3
@@ -462,7 +502,7 @@
 		itemDef
 		{
 			name "game_options"
-			rect -64 68 336 20 1 1
+			rect -64 88 336 20 1 1
 			visible 1
 			group "mw2_button"
 			style 1
@@ -503,7 +543,7 @@
 		itemDef
 		{
 			name "game_options"
-			rect -64 88 336 20 1 1
+			rect -64 108 336 20 1 1
 			visible 1
 			group "mw2_button"
 			style 1
@@ -515,14 +555,12 @@
 			textalign 6
 			textalignx -60
 			textscale 0.375
-			//text "@MPUI_MUTE_PLAYERS"
 			disabled when(dvarBool("party_host"))
 			text "@MENU_ADD_TO_FAVORITES"
 			action
 			{
 				play "mouse_click";
 				close self;
-				//open "muteplayer";
 				uiScript "CreateCurrentServerFavorite";
 			}
 			onFocus
@@ -546,7 +584,7 @@
 		itemDef
 		{
 			name "game_endgame"
-			rect -64 108 336 20 1 1
+			rect -64 128 336 20 1 1
 			visible 1
 			group "mw2_button"
 			style 1
@@ -586,7 +624,7 @@
 		itemDef
 		{
 			name "game_leavegame"
-			rect -64 108 336 20 1 1
+			rect -64 128 336 20 1 1
 			visible 1
 			group "mw2_button"
 			style 1