cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-01-07 12:48:04 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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
parent e03998fd86 ac5ca3991e
commit 583ecf97b0
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

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

6
source/funkin/audio/FunkinSound.hx
View file

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

2
source/funkin/play/PauseSubState.hx
View file

@ -230,7 +230,7 @@ class PauseSubState extends MusicBeatSubState
*/ */
function startPauseMusic():Void 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); pauseMusic = FunkinSound.load(pauseMusicPath, true, true);
if (pauseMusic == null) if (pauseMusic == null)