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

Merge pull request #424 from FunkinCrew/bugfix/pico-fixes

Browse source 
Fix some issues with Week 3
This commit is contained in:
Cameron Taylor 2024-03-27 22:15:27 -04:00 committed by GitHub
parent 96fe131544 53d62c3c12
commit 2c7fb62f72
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 8013845e331015b40c4cc35230f6d02bd2148d52 Subproject commit 485243fdd44acbc4db6a97ec7bf10a8b18350be9

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

@ -51,6 +51,11 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
*/ */
static var pool(default, null):FlxTypedGroup<FunkinSound> = new FlxTypedGroup<FunkinSound>(); static var pool(default, null):FlxTypedGroup<FunkinSound> = new FlxTypedGroup<FunkinSound>();
/**
* Calculate the current time of the sound.
* NOTE: You need to `add()` the sound to the scene for `update()` to increment the time.
*/
//
public var muted(default, set):Bool = false; public var muted(default, set):Bool = false;
function set_muted(value:Bool):Bool function set_muted(value:Bool):Bool
@ -394,8 +399,6 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
// Call onLoad() because the sound already loaded // Call onLoad() because the sound already loaded
if (onLoad != null && sound._sound != null) onLoad(); if (onLoad != null && sound._sound != null) onLoad();
FlxG.sound.list.remove(FlxG.sound.music);
return sound; return sound;
} }

10
source/funkin/play/PlayState.hx
View file

@ -2944,10 +2944,7 @@ class PlayState extends MusicBeatSubState
if (overrideMusic) if (overrideMusic)
{ {
// Stop the music. Do NOT destroy it, something still references it! // Stop the music. Do NOT destroy it, something still references it!
if (FlxG.sound.music != null) if (FlxG.sound.music != null) FlxG.sound.music.pause();
{
FlxG.sound.music.pause();
}
if (vocals != null) if (vocals != null)
{ {
vocals.pause(); vocals.pause();
@ -2957,10 +2954,7 @@ class PlayState extends MusicBeatSubState
else else
{ {
// Stop and destroy the music. // Stop and destroy the music.
if (FlxG.sound.music != null) if (FlxG.sound.music != null) FlxG.sound.music.pause();
{
FlxG.sound.music.pause();
}
if (vocals != null) if (vocals != null)
{ {
vocals.destroy(); vocals.destroy();