Fix original cutscene music lifecycle and verify walking lab route
This commit is contained in:
1 parent
c929f942e1
commit
b58138d7ba
16 files changed
+282
-18
No files matched your search
@@ -7,6 +7,7 @@ public sealed class SceneAudio : IDisposable
|
||||
{
|
||||
private readonly PreparedEntityResources resources;
|
||||
private SdlAudio? music, speech;
|
||||
private (string Database, int Id)? selectedMusic;
|
||||
private readonly List<SdlAudio> effects = [];
|
||||
private readonly Dictionary<string, SdlAudio> loops = new(StringComparer.OrdinalIgnoreCase);
|
||||
public int EffectCount => effects.Count;
|
||||
@@ -17,8 +18,15 @@ public sealed class SceneAudio : IDisposable
|
||||
public SceneAudio(PreparedEntityResources resources) => this.resources = resources;
|
||||
public void Music(string database, int id)
|
||||
{
|
||||
music?.Dispose(); music = null;
|
||||
if (resources.Wave(database, id) is { } wave) music = new(wave.Path, true);
|
||||
selectedMusic = (database, id);
|
||||
RestartMusic();
|
||||
}
|
||||
public void StopMusic() { music?.Dispose(); music = null; }
|
||||
public void RestartMusic()
|
||||
{
|
||||
StopMusic();
|
||||
if (selectedMusic is { } selection && resources.Wave(selection.Database, selection.Id) is { } wave)
|
||||
music = new(wave.Path, true);
|
||||
}
|
||||
public void Speech(string database, int id)
|
||||
{
|
||||
@@ -57,5 +65,5 @@ public sealed class SceneAudio : IDisposable
|
||||
for (var i = effects.Count - 1; i >= 0; i--)
|
||||
if (effects[i].QueuedBytes == 0) { effects[i].Dispose(); effects.RemoveAt(i); }
|
||||
}
|
||||
public void Dispose() { StopEffects(); StopSpeech(); music?.Dispose(); music = null; }
|
||||
public void Dispose() { StopEffects(); StopSpeech(); StopMusic(); }
|
||||
}
|
||||
Reference in new issue
Block a user