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

Fix ambient audio (#21933)

Browse Source
This commit is contained in:
metalgearsloth
2023-11-28 14:09:25 +11:00
committed by GitHub
parent e0dd5e1b52
commit c172e66d7c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs
View File

@@ -9,6 +9,7 @@ using Robust.Client.Player;
using Robust.Client.ResourceManagement; using Robust.Client.ResourceManagement;
using Robust.Client.State; using Robust.Client.State;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.Audio.Components;
using Robust.Shared.Audio.Systems; using Robust.Shared.Audio.Systems;
using Robust.Shared.Configuration; using Robust.Shared.Configuration;
using Robust.Shared.Player; using Robust.Shared.Player;
@@ -59,12 +60,6 @@ public sealed partial class ContentAudioSystem
private void InitializeAmbientMusic() private void InitializeAmbientMusic()
{ {
// TODO: Shitty preload
foreach (var audio in _proto.Index<SoundCollectionPrototype>("AmbienceSpace").PickFiles)
{
_resource.GetResource<AudioResource>(audio.ToString());
}
_configManager.OnValueChanged(CCVars.AmbientMusicVolume, AmbienceCVarChanged, true); _configManager.OnValueChanged(CCVars.AmbientMusicVolume, AmbienceCVarChanged, true);
_sawmill = IoCManager.Resolve<ILogManager>().GetSawmill("audio.ambience"); _sawmill = IoCManager.Resolve<ILogManager>().GetSawmill("audio.ambience");
@@ -170,11 +165,16 @@ public sealed partial class ContentAudioSystem
return; return;
} }
var isDone = !Exists(_ambientMusicStream); bool? isDone = null;
if (TryComp(_ambientMusicStream, out AudioComponent? audioComp))
{
isDone = !audioComp.Playing;
}
if (_interruptable) if (_interruptable)
{ {
var player = _player.LocalPlayer?.ControlledEntity; var player = _player.LocalSession?.AttachedEntity;
if (player == null || _musicProto == null || !_rules.IsTrue(player.Value, _proto.Index<RulesPrototype>(_musicProto.Rules))) if (player == null || _musicProto == null || !_rules.IsTrue(player.Value, _proto.Index<RulesPrototype>(_musicProto.Rules)))
{ {