1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-23 23:33:55 +00:00

we out here

This commit is contained in:
Cameron Taylor 2020-11-02 14:40:12 -08:00
parent 0b0cc7f1fe
commit bbba49139b
4 changed files with 7 additions and 4 deletions

View file

@ -94,6 +94,6 @@
<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
<icon path="art/icon.png"/>
<!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> -->
<haxedef name="NG_LOGIN" />
<haxedef name="SKIP_TO_PLAYSTATE" if="debug" />
<!-- <haxedef name="NG_LOGIN" /> -->
</project>

View file

@ -758,7 +758,7 @@ class ChartingState extends MusicBeatState
function loadJson(song:String):Void
{
PlayState.SONG = Song.loadFromJson(song);
PlayState.SONG = Song.loadFromJson(song.toLowerCase(), song.toLowerCase());
FlxG.resetState();
}

View file

@ -49,6 +49,7 @@ class Song
public static function loadFromJson(jsonInput:String, ?folder:String):SwagSong
{
// var rawJson = Assets.getText('assets/data/ridge/ridge.json').trim();
var rawJson = Assets.getText('assets/data/' + folder.toLowerCase() + '/' + jsonInput.toLowerCase() + '.json').trim();
while (!rawJson.endsWith("}"))

View file

@ -40,6 +40,8 @@ class TitleState extends MusicBeatState
var curWacky:Array<String> = [];
var wackyImage:FlxSprite;
override public function create():Void
{
#if (!web)
@ -59,7 +61,7 @@ class TitleState extends MusicBeatState
#end
#if SKIP_TO_PLAYSTATE
FlxG.switchState(new StoryMenuState());
FlxG.switchState(new ChartingState());
#else
startIntro();
#end