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

Unrevert audio (#21330)

Browse Source 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
This commit is contained in:
metalgearsloth
2023-11-27 22:12:34 +11:00
committed by GitHub
parent d3486d3b25
commit 269c93245d
288 changed files with 848 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Audio/SharedAmbientSoundSystem.cs
View File

@@ -19,7 +19,7 @@ public abstract class SharedAmbientSoundSystem : EntitySystem
ambience.Enabled = value;
QueueUpdate(uid, ambience);
Dirty(ambience);
Dirty(uid, ambience);
}
public virtual void SetRange(EntityUid uid, float value, AmbientSoundComponent? ambience = null)
@@ -29,7 +29,7 @@ public abstract class SharedAmbientSoundSystem : EntitySystem
ambience.Range = value;
QueueUpdate(uid, ambience);
Dirty(ambience);
Dirty(uid, ambience);
}
protected virtual void QueueUpdate(EntityUid uid, AmbientSoundComponent ambience)
@@ -43,7 +43,7 @@ public abstract class SharedAmbientSoundSystem : EntitySystem
return;
ambience.Volume = value;
Dirty(ambience);
Dirty(uid, ambience);
}
public virtual void SetSound(EntityUid uid, SoundSpecifier sound, AmbientSoundComponent? ambience = null)
@@ -53,7 +53,7 @@ public abstract class SharedAmbientSoundSystem : EntitySystem
ambience.Sound = sound;
QueueUpdate(uid, ambience);
Dirty(ambience);
Dirty(uid, ambience);
}
private void HandleCompState(EntityUid uid, AmbientSoundComponent component, ref ComponentHandleState args)

6
Content.Shared/Audio/SharedContentAudioSystem.cs
View File

@@ -1,10 +1,12 @@
using Content.Shared.Physics;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
namespace Content.Shared.Audio;
public abstract class SharedContentAudioSystem : EntitySystem
{
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] protected readonly SharedAudioSystem Audio = default!;
/// <summary>
/// Standard variation to use for sounds.
@@ -14,6 +16,6 @@ public abstract class SharedContentAudioSystem : EntitySystem
public override void Initialize()
{
base.Initialize();
_audio.OcclusionCollisionMask = (int) CollisionGroup.Impassable;
Audio.OcclusionCollisionMask = (int) CollisionGroup.Impassable;
}
}