mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-12-13 00:45:13 +00:00
Merge pull request #314 from FunkinCrew/bugfix/weekend-1-stuff
Fix darnell's animations being flipped
This commit is contained in:
commit
ea76476ec2
2
assets
2
assets
|
@ -1 +1 @@
|
|||
Subproject commit 8378b838bae80739eacd9a0316f9b49f888185f6
|
||||
Subproject commit 590db1448fb132a29160540b4656b2474f22f727
|
|
@ -240,7 +240,7 @@ class InitState extends FlxState
|
|||
#elseif LEVEL // -DLEVEL=week1 -DDIFFICULTY=hard
|
||||
startLevel(defineLevel(), defineDifficulty());
|
||||
#elseif FREEPLAY // -DFREEPLAY
|
||||
FlxG.switchState(new FreeplayState());
|
||||
FlxG.switchState(new funkin.ui.freeplay.FreeplayState());
|
||||
#elseif ANIMATE // -DANIMATE
|
||||
FlxG.switchState(new funkin.ui.debug.anim.FlxAnimateTest());
|
||||
#elseif WAVEFORM // -DWAVEFORM
|
||||
|
|
|
@ -164,9 +164,9 @@ class FreeplayState extends MusicBeatSubState
|
|||
isDebug = true;
|
||||
#end
|
||||
|
||||
if (FlxG.sound.music != null)
|
||||
if (FlxG.sound.music == null || (FlxG.sound.music != null && !FlxG.sound.music.playing))
|
||||
{
|
||||
if (!FlxG.sound.music.playing) FlxG.sound.playMusic(Paths.music('freakyMenu/freakyMenu'));
|
||||
FlxG.sound.playMusic(Paths.music('freakyMenu/freakyMenu'));
|
||||
}
|
||||
|
||||
// Add a null entry that represents the RANDOM option
|
||||
|
|
Loading…
Reference in a new issue