diff --git a/source/funkin/backend/chart/Chart.hx b/source/funkin/backend/chart/Chart.hx index 765a96f5..2fe89801 100644 --- a/source/funkin/backend/chart/Chart.hx +++ b/source/funkin/backend/chart/Chart.hx @@ -83,8 +83,8 @@ class Chart { return data; } - public static function loadChartMeta(songName:String, ?difficulty:String, fromMods:Bool = true, includeMetaDifficulties:Bool = false):ChartMetaData { - if (difficulty == null) difficulty = Flags.DEFAULT_DIFFICULTY; + public static function loadChartMeta(songName:String, difficulty:String = '', fromMods:Bool = true, includeMetaDifficulties:Bool = true):ChartMetaData { + trace(songName, difficulty, fromMods, includeMetaDifficulties); var metaPath = Paths.file('songs/${songName}/meta.json'); var metaDiffPath = Paths.file('songs/${songName}/meta-${difficulty}.json'); @@ -141,8 +141,10 @@ class Chart { if (includeMetaDifficulties && !fromDifficulty) { data.metas = []; - for (difficulty in data.difficulties) if (!data.metas.exists(difficulty) && Assets.exists(Paths.file('songs/${songName}/meta-${difficulty}.json'))) - data.metas.set(difficulty, loadChartMeta(songName, difficulty, fromMods, false)); + for (difficulty in data.difficulties) { + if (!data.metas.exists(difficulty) && Assets.exists(Paths.file('songs/${songName}/meta-${difficulty}.json'))) + data.metas.set(difficulty, loadChartMeta(songName, difficulty, fromMods, false)); + } } return data; diff --git a/source/funkin/menus/FreeplayState.hx b/source/funkin/menus/FreeplayState.hx index 4b4d2d2a..f3d4def9 100644 --- a/source/funkin/menus/FreeplayState.hx +++ b/source/funkin/menus/FreeplayState.hx @@ -492,7 +492,7 @@ class FreeplayState extends MusicBeatState curSong = null; curSongDifficulty = null; } - else if ((curSong = song.metas.get(curSongDifficulty = curSong.difficulties[curDifficulty])) == null) + else if ((curSong = song.metas.get(curSongDifficulty = song.difficulties[curDifficulty])) == null) curSong = song; } }