Merge remote-tracking branch 'upstream/master' into patch-3

2021-06-20 08:54:32 +02:00
parent 40b2b08590 074e08650f
commit 2dcd5145b8
23 changed files with 906 additions and 176 deletions
--- a/source/FreeplayState.hx
+++ b/source/FreeplayState.hx
@ -253,15 +253,7 @@ class FreeplayState extends MusicBeatState
 		combo = Highscore.getCombo(songHighscore, curDifficulty);
 		#end

-		switch (curDifficulty)
-		{
-			case 0:
-				diffText.text = "EASY";
-			case 1:
-				diffText.text = 'NORMAL';
-			case 2:
-				diffText.text = "HARD";
-		}
+		diffText.text = CoolUtil.difficultyFromInt(curDifficulty).toUpperCase();
 	}

 	function changeSelection(change:Int = 0)