From 5a0dee6f63563d6127d06c78b924401695f6ae52 Mon Sep 17 00:00:00 2001 From: Cameron Taylor <cameron.taylor.ninja@gmail.com> Date: Fri, 30 Oct 2020 19:33:28 -0700 Subject: [PATCH] lil bullshit --- source/FreeplayState.hx | 1 + source/PlayState.hx | 4 ++++ source/StoryMenuState.hx | 2 ++ source/TitleState.hx | 4 ++-- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 56c435a8e..a75ee3d3d 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -69,6 +69,7 @@ class FreeplayState extends MusicBeatState if (accepted) { PlayState.SONG = Song.loadFromJson(songs[curSelected].toLowerCase()); + PlayState.isStoryMode = false; FlxG.switchState(new PlayState()); FlxG.sound.music.stop(); } diff --git a/source/PlayState.hx b/source/PlayState.hx index d72fdde23..89d997a94 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -735,6 +735,10 @@ class PlayState extends MusicBeatState FlxG.switchState(new PlayState()); } } + else + { + FlxG.switchState(new FreeplayState()); + } } var endingSong:Bool = false; diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index a98b49bfb..20a635eab 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -30,6 +30,8 @@ class StoryMenuState extends MusicBeatState override function create() { + persistentUpdate = persistentDraw = true; + scoreText = new FlxText(10, 10, 0, "SCORE: 49324858", 36); scoreText.setFormat("VCR OSD Mono", 32); diff --git a/source/TitleState.hx b/source/TitleState.hx index beb3c9d64..4a48ba94d 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -41,7 +41,7 @@ class TitleState extends MusicBeatState super.create(); #if SKIP_TO_PLAYSTATE - FlxG.switchState(new StoryMenuState()); + FlxG.switchState(new FreeplayState()); #else startIntro(); #end @@ -143,7 +143,7 @@ class TitleState extends MusicBeatState new FlxTimer().start(2, function(tmr:FlxTimer) { - FlxG.switchState(new FreeplayState()); + FlxG.switchState(new StoryMenuState()); }); FlxG.sound.play('assets/music/titleShoot' + TitleState.soundExt, 0.7); }