Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Reorders Sound Systems signatures to match Popup Systems. (#8728)

Browse Source
This commit is contained in:
keronshb
2022-06-12 19:45:47 -04:00
committed by GitHub
parent 78fb4b88ed
commit f7b1bda3e5
138 changed files with 257 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/Audio/AmbientSoundSystem.cs
View File

@@ -259,11 +259,9 @@ namespace Content.Client.Audio
.WithPlayOffset(_random.NextFloat(0.0f, 100.0f))
.WithMaxDistance(comp.Range);
var stream = SoundSystem.Play(
var stream = SoundSystem.Play(sound,
Filter.Local(),
sound,
comp.Owner,
audioParams);
comp.Owner, audioParams);
if (stream == null) continue;

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

@@ -169,7 +169,7 @@ namespace Content.Client.Audio
EndAmbience();
if (!CanPlayCollection(_currentCollection)) return;
var file = _robustRandom.Pick(_currentCollection.PickFiles).ToString();
_ambientStream = SoundSystem.Play(Filter.Local(), file, _ambientParams.WithVolume(_ambientParams.Volume + _configManager.GetCVar(CCVars.AmbienceVolume)));
_ambientStream = SoundSystem.Play(file, Filter.Local(), _ambientParams.WithVolume(_ambientParams.Volume + _configManager.GetCVar(CCVars.AmbienceVolume)));
}
private void EndAmbience()
@@ -255,7 +255,7 @@ namespace Content.Client.Audio
{
return;
}
_lobbyStream = SoundSystem.Play(Filter.Local(), file, _lobbyParams);
_lobbyStream = SoundSystem.Play(file, Filter.Local(), _lobbyParams);
}
private void EndLobbyMusic()

2
Content.Client/Audio/ClientAdminSoundSystem.cs
View File

@@ -34,7 +34,7 @@ public sealed class ClientAdminSoundSystem : SharedAdminSoundSystem
{
if(!_adminAudioEnabled) return;
var stream = SoundSystem.Play(Filter.Local(), soundEvent.Filename, soundEvent.AudioParams);
var stream = SoundSystem.Play(soundEvent.Filename, Filter.Local(), soundEvent.AudioParams);
_adminAudio.Add(stream);
}