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

Fix ambient sound error (#12808)

Browse Source
This commit is contained in:
Leon Friedrich
2022-12-02 04:02:37 +13:00
committed by GitHub
parent cc90f68f0f
commit b771d2423a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,9 +175,9 @@ namespace Content.Client.Audio
_playingSounds.Clear(); _playingSounds.Clear();
} }
private Dictionary<string, SortedList<float, AmbientSoundComponent>> GetNearbySources(TransformComponent playerXform, MapCoordinates coords, EntityQuery<TransformComponent> xformQuery) private Dictionary<string, List<(float Importance, AmbientSoundComponent)>> GetNearbySources(TransformComponent playerXform, MapCoordinates coords, EntityQuery<TransformComponent> xformQuery)
{ {
var sourceDict = new Dictionary<string, SortedList<float, AmbientSoundComponent>>(16); var sourceDict = new Dictionary<string, List<(float, AmbientSoundComponent)>>(16);
var ambientQuery = GetEntityQuery<AmbientSoundComponent>(); var ambientQuery = GetEntityQuery<AmbientSoundComponent>();
// TODO add variant of GetComponentsInRange that also returns the transform component. // TODO add variant of GetComponentsInRange that also returns the transform component.
@@ -205,7 +205,7 @@ namespace Content.Client.Audio
var list = sourceDict.GetOrNew(key); var list = sourceDict.GetOrNew(key);
// Prioritize far away & loud sounds. // Prioritize far away & loud sounds.
list.Add(-range * (ambientComp.Volume + 32), ambientComp); list.Add((range * (ambientComp.Volume + 32), ambientComp));
} }
return sourceDict; return sourceDict;
@@ -252,7 +252,9 @@ namespace Content.Client.Audio
if (_playingCount.TryGetValue(key, out var playingCount) && playingCount >= MaxSingleSound) if (_playingCount.TryGetValue(key, out var playingCount) && playingCount >= MaxSingleSound)
continue; continue;
foreach (var comp in sources.Values) sources.Sort(static (a, b) => b.Importance.CompareTo(a.Importance));
foreach (var (_, comp) in sources)
{ {
if (_playingSounds.ContainsKey(comp)) if (_playingSounds.ContainsKey(comp))
continue; continue;