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

Attempt to reduce audio helper resolves (#8493)

Browse Source
This commit is contained in:
Leon Friedrich
2022-05-28 23:03:21 +12:00
committed by GitHub
parent 4c40f3bdf8
commit 5dbe77ecba
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Shared/Sound/SoundSpecifier.cs
View File

@@ -1,6 +1,8 @@
using Content.Shared.Audio;
using JetBrains.Annotations;
using Robust.Shared.Audio;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Serialization.TypeSerializers.Implementations;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.Utility;
@@ -13,7 +15,8 @@ namespace Content.Shared.Sound
[ViewVariables(VVAccess.ReadWrite), DataField("params")]
public AudioParams Params = AudioParams.Default;
public abstract string GetSound();
// TODO: remove most uses of this function, and just make the audio-system take in a SoundSpecifier
public abstract string GetSound(IRobustRandom? rand = null, IPrototypeManager? proto = null);
}
public sealed class SoundPathSpecifier : SoundSpecifier
@@ -38,7 +41,7 @@ namespace Content.Shared.Sound
Path = path;
}
public override string GetSound()
public override string GetSound(IRobustRandom? rand = null, IPrototypeManager? proto = null)
{
return Path == null ? string.Empty : Path.ToString();
}
@@ -61,9 +64,9 @@ namespace Content.Shared.Sound
Collection = collection;
}
public override string GetSound()
public override string GetSound(IRobustRandom? rand = null, IPrototypeManager? proto = null)
{
return Collection == null ? string.Empty : AudioHelpers.GetRandomFileFromSoundCollection(Collection);
return Collection == null ? string.Empty : AudioHelpers.GetRandomFileFromSoundCollection(Collection, rand, proto);
}
}
}