Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2025-05-03 09:25:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

resolve merge conflict with ActualMandM/pause

Browse source
This commit is contained in:
MtH 2021-03-30 16:47:50 +02:00
commit 720ae5d3cc
1 changed files with 4 additions and 1 deletions

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());
}
}