Merge pull request #432 from FunkinCrew/feature/new-audio

Audio improvements and a Freeplay crash fix
This commit is contained in:
Cameron Taylor 2024-03-30 03:32:52 -04:00 committed by GitHub
commit 583ecf97b0
3 changed files with 8 additions and 2 deletions

2
assets

@ -1 +1 @@
Subproject commit 200658724592b298f49b13016f2c706c54ad538f
Subproject commit 763c833cbcde724d50ff31f5bac9f2ac3d5e61a7

View file

@ -402,10 +402,16 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
return sound;
}
@:nullSafety(Off)
public override function destroy():Void
{
// trace('[FunkinSound] Destroying sound "${this._label}"');
super.destroy();
if (fadeTween != null)
{
fadeTween.cancel();
fadeTween = null;
}
FlxTween.cancelTweensOf(this);
this._label = 'unknown';
}

View file

@ -230,7 +230,7 @@ class PauseSubState extends MusicBeatSubState
*/
function startPauseMusic():Void
{
var pauseMusicPath:String = Paths.music('breakfast$musicSuffix');
var pauseMusicPath:String = Paths.music('breakfast$musicSuffix/breakfast$musicSuffix');
pauseMusic = FunkinSound.load(pauseMusicPath, true, true);
if (pauseMusic == null)