From 7e90f12285fd55484f5f9840c46fe54937c946a1 Mon Sep 17 00:00:00 2001 From: ike709 Date: Tue, 24 May 2022 16:45:17 -0500 Subject: [PATCH] Muting lobby music now mutes round-end music (#8418) Co-authored-by: ike709 --- Content.Client/Audio/BackgroundAudioSystem.cs | 11 ++++------- .../Locale/en-US/escape-menu/ui/options-menu.ftl | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Content.Client/Audio/BackgroundAudioSystem.cs b/Content.Client/Audio/BackgroundAudioSystem.cs index 46e7d03211..78b6df21ff 100644 --- a/Content.Client/Audio/BackgroundAudioSystem.cs +++ b/Content.Client/Audio/BackgroundAudioSystem.cs @@ -119,7 +119,7 @@ namespace Content.Client.Audio { EndAmbience(); - if (args.NewState is LobbyState && _configManager.GetCVar(CCVars.LobbyMusicEnabled)) + if (args.NewState is LobbyState) { StartLobbyMusic(); return; @@ -137,10 +137,7 @@ namespace Content.Client.Audio if (_stateManager.CurrentState is LobbyState) { EndAmbience(); - if (_configManager.GetCVar(CCVars.LobbyMusicEnabled)) - { - StartLobbyMusic(); - } + StartLobbyMusic(); } else { @@ -237,7 +234,7 @@ namespace Content.Client.Audio { return; } - if (_stateManager.CurrentState is LobbyState && _configManager.GetCVar(CCVars.LobbyMusicEnabled)) + if (_stateManager.CurrentState is LobbyState) { StartLobbyMusic(); } @@ -251,7 +248,7 @@ namespace Content.Client.Audio public void StartLobbyMusic() { - if (_lobbyStream != null) return; + if (_lobbyStream != null || !_configManager.GetCVar(CCVars.LobbyMusicEnabled)) return; var file = _gameTicker.LobbySong; if (file == null) // We have not received the lobby song yet. diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl index 7fbcd4066d..61a739877f 100644 --- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl @@ -15,7 +15,7 @@ ui-options-master-volume = Master Volume: ui-options-midi-volume = MIDI (Instrument) Volume: ui-options-ambience-volume = Ambience volume: ui-options-ambience-max-sounds = Ambience simultaneous sounds: -ui-options-lobby-music = Lobby Music +ui-options-lobby-music = Lobby & Round-end Music ui-options-station-ambience = Station Ambience ui-options-space-ambience = Space Ambience ui-options-volume-label = Volume