resolve merge conflict with ActualMandM/pause
This commit is contained in:
commit
d136168a5a
|
@ -169,7 +169,10 @@ class PauseSubState extends MusicBeatSubstate
|
||||||
FlxG.resetState();
|
FlxG.resetState();
|
||||||
case "Exit to menu":
|
case "Exit to menu":
|
||||||
PlayState.deathCounter = 0;
|
PlayState.deathCounter = 0;
|
||||||
FlxG.switchState(new MainMenuState());
|
if (PlayState.isStoryMode)
|
||||||
|
FlxG.switchState(new StoryMenuState());
|
||||||
|
else
|
||||||
|
FlxG.switchState(new FreeplayState());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue