cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-06-19 16:52:03 +00:00
Code Issues Releases Wiki Activity

fix for songs overlapping each other on desktop

Browse source
This commit is contained in:
Cameron Taylor 2024-05-23 16:31:18 -04:00
parent f2a06ad37b
commit a2ee359e46
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -364,10 +364,20 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
if (music != null) if (music != null)
{ {
for (future in partialQueue)
{
future = cast Future.withError("Music was overridden by another partial load");
}
partialQueue = [];
partialQueue.push(music);
@:nullSafety(Off)
music.onComplete(function(partialMusic:Null<FunkinSound>) { music.onComplete(function(partialMusic:Null<FunkinSound>) {
@:nullSafety(Off) if (partialQueue.pop() == music)
FlxG.sound.music = partialMusic; {
FlxG.sound.list.remove(FlxG.sound.music); FlxG.sound.music = partialMusic;
FlxG.sound.list.remove(FlxG.sound.music);
}
}); });
return true; return true;
@ -396,6 +406,8 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
} }
} }
static var partialQueue:Array<Future<Null<FunkinSound>>> = [];
/** /**
* Creates a new `FunkinSound` object synchronously. * Creates a new `FunkinSound` object synchronously.
* *
@ -461,6 +473,8 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
* @param looped Whether the sound file should loop * @param looped Whether the sound file should loop
* @param autoDestroy Whether the sound file should be destroyed after it finishes playing * @param autoDestroy Whether the sound file should be destroyed after it finishes playing
* @param autoPlay Whether the sound file should play immediately * @param autoPlay Whether the sound file should play immediately
* @param onComplete Callback when the sound finishes playing
* @param onLoad Callback when the sound finishes loading
* @return A FunkinSound object * @return A FunkinSound object
*/ */
public static function loadPartial(path:String, start:Float = 0, end:Float = 1, volume:Float = 1.0, looped:Bool = false, autoDestroy:Bool = false, public static function loadPartial(path:String, start:Float = 0, end:Float = 1, volume:Float = 1.0, looped:Bool = false, autoDestroy:Bool = false,