Unstable 1.1.14.0

This commit is contained in:
Markus Isberg
2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
@@ -33,7 +33,7 @@ namespace Barotrauma.Sounds
}
}
private SoundBuffers buffers;
protected SoundBuffers buffers;
public SoundBuffers Buffers
{
get { return !Stream ? buffers : null; }
@@ -72,8 +72,6 @@ namespace Barotrauma.Sounds
BaseGain = 1.0f;
BaseNear = 100.0f;
BaseFar = 200.0f;
InitializeALBuffers();
}
public override string ToString()
@@ -141,21 +139,11 @@ namespace Barotrauma.Sounds
public abstract float GetAmplitudeAtPlaybackPos(int playbackPos);
public virtual void InitializeALBuffers()
{
if (!Stream)
{
buffers = new SoundBuffers(this);
}
else
{
buffers = null;
}
}
public virtual void InitializeAlBuffers() { }
public virtual void FillBuffers() { }
public virtual void FillAlBuffers() { }
public virtual void DeleteALBuffers()
public virtual void DeleteAlBuffers()
{
Owner.KillChannels(this);
buffers?.Dispose();
@@ -165,7 +153,7 @@ namespace Barotrauma.Sounds
{
if (disposed) { return; }
DeleteALBuffers();
DeleteAlBuffers();
Owner.RemoveSound(this);
disposed = true;