Fix global audio

Audio state handling is still a hot mess though at least this makes it less buggy.
metalgearsloth · Nov 28, 2023 · b61e16b · b61e16b
1 parent a09a60e
commit b61e16b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/Robust.Client/Audio/AudioSystem.cs b/Robust.Client/Audio/AudioSystem.cs
@@ -140,7 +140,6 @@ private void OnAudioStartup(EntityUid uid, AudioComponent component, ComponentSt
         if (!TryGetAudio(component.FileName, out var audioResource))
         {
             Log.Error($"Error creating audio source for {audioResource}, can't find file {component.FileName}");
-            component.Source = new DummyAudioSource();
             return;
         }
 
@@ -150,20 +149,21 @@ private void OnAudioStartup(EntityUid uid, AudioComponent component, ComponentSt
         {
             Log.Error($"Error creating audio source for {audioResource}");
             DebugTools.Assert(false);
-            source = new DummyAudioSource();
+            source = component.Source;
         }
 
         // Need to set all initial data for first frame.
-        component.Source = source;
         ApplyAudioParams(component.Params, component);
-        component.Global = component.Global;
+        source.Global = component.Global;
+
+        component.Source = source;
         // Don't play until first frame so occlusion etc. are correct.
         component.Gain = 0f;
 
         // If audio came into range then start playback at the correct position.
         var offset = (Timing.CurTime - component.AudioStart).TotalSeconds % GetAudioLength(component.FileName).TotalSeconds;
 
-        if (offset != 0)
+        if (offset > 0)
         {
             component.PlaybackPosition = (float) offset;
         }

diff --git a/Robust.Server/Audio/AudioSystem.cs b/Robust.Server/Audio/AudioSystem.cs
@@ -74,6 +74,7 @@ public override (EntityUid Entity, AudioComponent Component)? PlayGlobal(string
         var entity = Spawn("Audio", MapCoordinates.Nullspace);
         var audio = SetupAudio(entity, filename, audioParams);
         AddAudioFilter(entity, audio, playerFilter);
+        audio.Global = true;
 
         return (entity, audio);
     }

diff --git a/Robust.Shared/Audio/Components/AudioComponent.cs b/Robust.Shared/Audio/Components/AudioComponent.cs
@@ -15,7 +15,7 @@ namespace Robust.Shared.Audio.Components;
 /// <summary>
 /// Stores the audio data for an audio entity.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedAudioSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), Access(typeof(SharedAudioSystem))]
 public sealed partial class AudioComponent : Component, IAudioSource
 {
     #region Filter
@@ -68,7 +68,7 @@ public sealed partial class AudioComponent : Component, IAudioSource
     /// Audio source that interacts with OpenAL.
     /// </summary>
     [ViewVariables(VVAccess.ReadOnly)]
-    internal IAudioSource Source = default!;
+    internal IAudioSource Source = new DummyAudioSource();
 
     /// <summary>
     /// Auxiliary entity to pass audio to.
@@ -115,6 +115,7 @@ public bool Looping
     /// <see cref="IAudioSource.Global"/>
     /// </summary>
     [AutoNetworkedField]
+    [Access(typeof(SharedAudioSystem))]
     public bool Global { get; set; }
 
     /// <summary>