AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into deferred_loading

Browse Source
This commit is contained in:
George FunBook
2021-02-15 15:30:29 -06:00
parent 6af7621d86 50fccded66
commit e9d0cc2bc2
22 changed files with 357 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/TitleState.hx
View File

@ -84,7 +84,10 @@ class TitleState extends MusicBeatState
#elseif CHARTING
FlxG.switchState(new ChartingState());
#else
startIntro();
new FlxTimer().start(1, function(tmr:FlxTimer)
{
startIntro();
});
#end
}
@ -219,7 +222,8 @@ class TitleState extends MusicBeatState
override function update(elapsed:Float)
{
Conductor.songPosition = FlxG.sound.music.time;
if (FlxG.sound.music != null)
Conductor.songPosition = FlxG.sound.music.time;
// FlxG.watch.addQuick('amp', FlxG.sound.music.amplitude);
if (FlxG.keys.justPressed.F)
@ -266,7 +270,7 @@ class TitleState extends MusicBeatState
var version:String = "v" + Application.current.meta.get('version');
if (version.trim() != NGio.GAME_VER.trim() && !OutdatedSubState.leftState)
if (version.trim() != NGio.GAME_VER_NUMS && !OutdatedSubState.leftState)
{
trace('OLD VERSION!');
FlxG.switchState(new OutdatedSubState());