From 916fd7522e2d319efb8a4d12dd7f22a039210545 Mon Sep 17 00:00:00 2001 From: Evil Factory <36804725+evilfactory@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:34:31 -0300 Subject: [PATCH] add Game.ForceVoice and Game.ForceLocalVoice guess what i am going to use this for --- .../ClientSource/Networking/Voip/VoipCapture.cs | 2 ++ .../SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs | 3 +++ 2 files changed, 5 insertions(+) diff --git a/Barotrauma/BarotraumaClient/ClientSource/Networking/Voip/VoipCapture.cs b/Barotrauma/BarotraumaClient/ClientSource/Networking/Voip/VoipCapture.cs index f1c611704..67eeca690 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/Networking/Voip/VoipCapture.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/Networking/Voip/VoipCapture.cs @@ -228,9 +228,11 @@ namespace Barotrauma.Networking if (GameMain.WindowActive && SettingsMenu.Instance is null) { bool pttDown = PlayerInput.KeyDown(InputType.Voice) && GUI.KeyboardDispatcher.Subscriber == null; + if (GameMain.LuaCs.Game.ForceVoice != null) { pttDown = GameMain.LuaCs.Game.ForceVoice.Value; } if (pttDown || captureTimer <= 0) { ForceLocal = GameMain.ActiveChatMode == ChatMode.Local; + if (GameMain.LuaCs.Game.ForceLocalVoice != null) { ForceLocal = GameMain.LuaCs.Game.ForceLocalVoice.Value; } } if (GameSettings.CurrentConfig.Audio.VoiceSetting == VoiceMode.Activity) { diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs index 08f3ea22c..94c40415c 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Lua/LuaClasses/LuaGame.cs @@ -48,6 +48,9 @@ namespace Barotrauma return GameMain.LightManager; } } + + public bool? ForceVoice = null; + public bool? ForceLocalVoice = null; #else public bool IsDedicated