diff --git a/source/meta/data/options/LanguageState.hx b/source/meta/data/options/LanguageState.hx index cbd7e163..d336fa7c 100644 --- a/source/meta/data/options/LanguageState.hx +++ b/source/meta/data/options/LanguageState.hx @@ -76,9 +76,13 @@ class LanguageState extends MusicBeatState label.snapToPosition(); coolGrp.add(label); - var icon:AttachedSprite = new AttachedSprite(); - icon.frames = Paths.getSparrowAtlas('flags/' + langStrings[i].code); - icon.animation.addByPrefix('idle', langStrings[i].code, 24); + var assetPath = 'flags/' + langStrings[i].code; + var animString = Assets.exists(Paths.getSparrowAtlas(assetPath)) ? langStrings[i].code : 'flag_base'; + + var icon:AttachedSprite = new AttachedSprite(); + icon.frames = Assets.exists(Paths.getSparrowAtlas(assetPath)) ? + Paths.getSparrowAtlas(assetPath) : Paths.getSparrowAtlas('flags/null'); // fallback attempt idk?? + icon.animation.addByPrefix('idle', animString, 24); icon.animation.play('idle'); icon.xAdd = -icon.width - 10; icon.sprTracker = label; diff --git a/source/meta/state/CreditsState.hx b/source/meta/state/CreditsState.hx index 5dca3ed1..b8f8d51a 100644 --- a/source/meta/state/CreditsState.hx +++ b/source/meta/state/CreditsState.hx @@ -102,7 +102,7 @@ class CreditsState extends MusicBeatState for (i in 0...creditsStuff.length) { var isSelectable:Bool = !(creditsStuff[i].length <= 1); - var optionText:Alphabet = new Alphabet(0, 70 * i, creditsStuff[i][0], !isSelectable); + var optionText:Alphabet = new Alphabet(90, 320, creditsStuff[i][0], !isSelectable); optionText.isMenuItem = true; optionText.screenCenter(X); optionText.snapToPosition(); @@ -232,9 +232,9 @@ class CreditsState extends MusicBeatState } FlxG.sound.play(Paths.sound('cancelMenu')); if (ClientPrefs.simpleMain) - FlxG.switchState(new SimpleMainMenuState()); + MusicBeatState.switchState(new SimpleMainMenuState()); else - FlxG.switchState(new MainMenuState()); + MusicBeatState.switchState(new MainMenuState()); quitting = true; } } diff --git a/source/meta/substate/ResultsSubState.hx b/source/meta/substate/ResultsSubState.hx index e8f0dc6f..bcd5ffb0 100644 --- a/source/meta/substate/ResultsSubState.hx +++ b/source/meta/substate/ResultsSubState.hx @@ -63,7 +63,7 @@ class ResultsSubState extends MusicBeatSubstate var hint:FlxText = new FlxText(12, FlxG.height - 24, 0, 'You passed, but try getting under 10 misses for SDCB.', 12); hint.scrollFactor.set(); - hint.setFormat("VCR OSD Mono", 26, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + hint.setFormat(Paths.font("vcr.ttf"), 26, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); add(hint); switch (ClientPrefs.scoreTxtType) @@ -116,7 +116,7 @@ class ResultsSubState extends MusicBeatSubstate titleTxt = new FlxText(0, 0, 0, 'RESULTS', 72); titleTxt.scrollFactor.set(); - titleTxt.setFormat("VCR OSD Mono", 60, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + titleTxt.setFormat(Paths.font("vcr.ttf"), 60, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); titleTxt.screenCenter(X); titleTxt.updateHitbox(); add(titleTxt); @@ -133,7 +133,7 @@ class ResultsSubState extends MusicBeatSubstate + '\nRating: ' + rating + ' (' + fc + ')' , 72); resultsTxt.scrollFactor.set(); - resultsTxt.setFormat("VCR OSD Mono", 45, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); + resultsTxt.setFormat(Paths.font("vcr.ttf"), 45, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); resultsTxt.screenCenter(XY); resultsTxt.updateHitbox(); add(resultsTxt);