Merge pull request #1282 from SimplyMerlin/fix-bugs

Fix small bugs
This commit is contained in:
Kade M
2021-07-19 21:38:18 -07:00
committed by GitHub
2 changed files with 4 additions and 1 deletions

View File

@@ -2811,7 +2811,7 @@ class PlayState extends MusicBeatState
else else
health = 1; health = 1;
} }
if (FlxG.save.data.resetButton) if (!inCutscene && FlxG.save.data.resetButton)
{ {
if (FlxG.keys.justPressed.R) if (FlxG.keys.justPressed.R)
{ {

View File

@@ -101,7 +101,10 @@ class StoryMenuState extends MusicBeatState
if (FlxG.sound.music != null) if (FlxG.sound.music != null)
{ {
if (!FlxG.sound.music.playing) if (!FlxG.sound.music.playing)
{
FlxG.sound.playMusic(Paths.music('freakyMenu')); FlxG.sound.playMusic(Paths.music('freakyMenu'));
Conductor.changeBPM(102);
}
} }
persistentUpdate = persistentDraw = true; persistentUpdate = persistentDraw = true;