cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-13 08:55:29 +00:00
Code Issues Releases Wiki Activity

Merge pull request #314 from FunkinCrew/bugfix/weekend-1-stuff

Browse source 
Fix darnell's animations being flipped
This commit is contained in:
Cameron Taylor 2024-02-10 02:18:10 -05:00 committed by GitHub
parent aec42f783f 2cc5d43896
commit ea76476ec2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 8378b838bae80739eacd9a0316f9b49f888185f6 Subproject commit 590db1448fb132a29160540b4656b2474f22f727

2
source/funkin/InitState.hx
View file

@ -240,7 +240,7 @@ class InitState extends FlxState
#elseif LEVEL // -DLEVEL=week1 -DDIFFICULTY=hard #elseif LEVEL // -DLEVEL=week1 -DDIFFICULTY=hard
startLevel(defineLevel(), defineDifficulty()); startLevel(defineLevel(), defineDifficulty());
#elseif FREEPLAY // -DFREEPLAY #elseif FREEPLAY // -DFREEPLAY
FlxG.switchState(new FreeplayState()); FlxG.switchState(new funkin.ui.freeplay.FreeplayState());
#elseif ANIMATE // -DANIMATE #elseif ANIMATE // -DANIMATE
FlxG.switchState(new funkin.ui.debug.anim.FlxAnimateTest()); FlxG.switchState(new funkin.ui.debug.anim.FlxAnimateTest());
#elseif WAVEFORM // -DWAVEFORM #elseif WAVEFORM // -DWAVEFORM

4
source/funkin/ui/freeplay/FreeplayState.hx
View file

@ -164,9 +164,9 @@ class FreeplayState extends MusicBeatSubState
isDebug = true; isDebug = true;
#end #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 // Add a null entry that represents the RANDOM option