resolve merge conflict with ActualMandM/pause

2021-03-30 16:47:50 +02:00
parent 364b74c1c8 8e0a286c01
commit 720ae5d3cc
1 changed files with 4 additions and 1 deletions
@@ -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());
 			}
 		}