cowarin
/
Funkin
mirror of https://github.com/ninjamuffin99/Funkin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

resolve merge conflict with ActualMandM/pause

This commit is contained in:
MtH 2021-03-30 16:47:50 +02:00
parent bbe6b739fe fe3ece4a61
commit d136168a5a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/PauseSubState.hx
View File

@ -169,7 +169,10 @@ class PauseSubState extends MusicBeatSubstate
FlxG.resetState();
case "Exit to menu":
PlayState.deathCounter = 0;
FlxG.switchState(new MainMenuState());
if (PlayState.isStoryMode)
FlxG.switchState(new StoryMenuState());
else
FlxG.switchState(new FreeplayState());
}
}