Merge branch 'master' into master

This commit is contained in:
Cameron Taylor
2020-11-25 00:22:22 -08:00
committed by GitHub
7 changed files with 30 additions and 11 deletions

View File

@ -180,10 +180,12 @@ class FreeplayState extends MusicBeatState
if (curDifficulty > 2)
curDifficulty = 0;
#if !switch
intendedScore = Highscore.getScore(songs[curSelected], curDifficulty);
#end
switch (curDifficulty)
{
case 0:
@ -197,6 +199,7 @@ class FreeplayState extends MusicBeatState
function changeSelection(change:Int = 0)
{
#if !switch
NGio.logEvent('Fresh');
#end
@ -213,11 +216,13 @@ class FreeplayState extends MusicBeatState
// selector.y = (70 * curSelected) + 30;
#if !switch
intendedScore = Highscore.getScore(songs[curSelected], curDifficulty);
// lerpScore = 0;
#end
FlxG.sound.playMusic('assets/music/' + songs[curSelected] + "_Inst" + TitleState.soundExt, 0);
var bullShit:Int = 0;