tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Muting lobby music now mutes round-end music (#8418)

Browse Source 
Co-authored-by: ike709 <ike709@github.com>
This commit is contained in:
ike709
2022-05-24 16:45:17 -05:00
committed by GitHub
parent 4a71615ee1
commit 7e90f12285
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Client/Audio/BackgroundAudioSystem.cs
View File

@@ -119,7 +119,7 @@ namespace Content.Client.Audio
{ {
EndAmbience(); EndAmbience();
if (args.NewState is LobbyState && _configManager.GetCVar(CCVars.LobbyMusicEnabled)) if (args.NewState is LobbyState)
{ {
StartLobbyMusic(); StartLobbyMusic();
return; return;
@@ -137,10 +137,7 @@ namespace Content.Client.Audio
if (_stateManager.CurrentState is LobbyState) if (_stateManager.CurrentState is LobbyState)
{ {
EndAmbience(); EndAmbience();
if (_configManager.GetCVar(CCVars.LobbyMusicEnabled)) StartLobbyMusic();
{
StartLobbyMusic();
}
} }
else else
{ {
@@ -237,7 +234,7 @@ namespace Content.Client.Audio
{ {
return; return;
} }
if (_stateManager.CurrentState is LobbyState && _configManager.GetCVar(CCVars.LobbyMusicEnabled)) if (_stateManager.CurrentState is LobbyState)
{ {
StartLobbyMusic(); StartLobbyMusic();
} }
@@ -251,7 +248,7 @@ namespace Content.Client.Audio
public void StartLobbyMusic() public void StartLobbyMusic()
{ {
if (_lobbyStream != null) return; if (_lobbyStream != null || !_configManager.GetCVar(CCVars.LobbyMusicEnabled)) return;
var file = _gameTicker.LobbySong; var file = _gameTicker.LobbySong;
if (file == null) // We have not received the lobby song yet. if (file == null) // We have not received the lobby song yet.

2
Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
View File

@@ -15,7 +15,7 @@ ui-options-master-volume = Master Volume:
ui-options-midi-volume = MIDI (Instrument) Volume: ui-options-midi-volume = MIDI (Instrument) Volume:
ui-options-ambience-volume = Ambience volume: ui-options-ambience-volume = Ambience volume:
ui-options-ambience-max-sounds = Ambience simultaneous sounds: 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-station-ambience = Station Ambience
ui-options-space-ambience = Space Ambience ui-options-space-ambience = Space Ambience
ui-options-volume-label = Volume ui-options-volume-label = Volume