diff --git a/source/funkin/menus/PauseSubState.hx b/source/funkin/menus/PauseSubState.hx index ecf2fa7d..641b72b1 100644 --- a/source/funkin/menus/PauseSubState.hx +++ b/source/funkin/menus/PauseSubState.hx @@ -1,20 +1,20 @@ package funkin.menus; -import funkin.editors.charter.Charter; -import funkin.backend.scripting.events.MenuChangeEvent; -import funkin.options.OptionsMenu; -import funkin.backend.scripting.events.PauseCreationEvent; -import funkin.backend.scripting.events.NameEvent; -import funkin.backend.scripting.Script; import flixel.sound.FlxSound; -import flixel.text.FlxText; import flixel.tweens.FlxTween; import flixel.util.FlxColor; -import funkin.options.keybinds.KeybindsOptions; -import funkin.menus.StoryMenuState; +import funkin.backend.FunkinText; +import funkin.backend.scripting.Script; +import funkin.backend.scripting.events.MenuChangeEvent; +import funkin.backend.scripting.events.NameEvent; +import funkin.backend.scripting.events.PauseCreationEvent; import funkin.backend.system.Conductor; import funkin.backend.utils.FunkinParentDisabler; +import funkin.editors.charter.Charter; +import funkin.menus.StoryMenuState; +import funkin.options.OptionsMenu; import funkin.options.TreeMenu; +import funkin.options.keybinds.KeybindsOptions; class PauseSubState extends MusicBeatSubstate { @@ -22,6 +22,11 @@ class PauseSubState extends MusicBeatSubstate var grpMenuShit:FlxTypedGroup; + var levelInfo:FunkinText; + var levelDifficulty:FunkinText; + var deathCounter:FunkinText; + var multiplayerText:FunkinText; + var menuItems:Array = ['Resume', 'Restart Song', 'Change Controls', 'Change Options', 'Exit to menu', "Exit to charter"]; var curSelected:Int = 0; @@ -56,7 +61,6 @@ class PauseSubState extends MusicBeatSubstate menuItems = event.options; - pauseMusic = FlxG.sound.load(Paths.music(event.music), 0, true); pauseMusic.persist = false; pauseMusic.group = FlxG.sound.defaultMusicGroup; @@ -71,15 +75,13 @@ class PauseSubState extends MusicBeatSubstate bg.scrollFactor.set(); add(bg); - var levelInfo:FlxText = new FlxText(20, 15, 0, PlayState.SONG.meta.displayName, 32); - var levelDifficulty:FlxText = new FlxText(20, 15, 0, PlayState.difficulty.toUpperCase(), 32); - var deathCounter:FlxText = new FlxText(20, 15, 0, "Blue balled: " + PlayState.deathCounter, 32); - var multiplayerText:FlxText = new FlxText(20, 15, 0, PlayState.opponentMode ? 'OPPONENT MODE' : (PlayState.coopMode ? 'CO-OP MODE' : ''), 32); + levelInfo = new FunkinText(20, 15, 0, PlayState.SONG.meta.displayName, 32, false); + levelDifficulty = new FunkinText(20, 15, 0, PlayState.difficulty.toUpperCase(), 32, false); + deathCounter = new FunkinText(20, 15, 0, "Blue balled: " + PlayState.deathCounter, 32, false); + multiplayerText = new FunkinText(20, 15, 0, PlayState.opponentMode ? 'OPPONENT MODE' : (PlayState.coopMode ? 'CO-OP MODE' : ''), 32, false); for(k=>label in [levelInfo, levelDifficulty, deathCounter, multiplayerText]) { label.scrollFactor.set(); - label.setFormat(Paths.font('vcr.ttf'), 32); - label.updateHitbox(); label.alpha = 0; label.x = FlxG.width - (label.width + 20); label.y = 15 + (32 * k);