cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-27 09:13:18 +00:00
Code Issues Releases Wiki Activity

resolve merge conflict with ActualMandM/pause

Browse source
This commit is contained in:
MtH 2021-03-30 16:47:50 +02:00
parent 364b74c1c8 8e0a286c01
commit 720ae5d3cc
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());
}
}