From 8508aa045bb25dbbc3a503528e60528a373099be Mon Sep 17 00:00:00 2001 From: lunarcleint <88809950+lunarcleint@users.noreply.github.com> Date: Tue, 4 Jul 2023 00:45:00 -0700 Subject: [PATCH] Revert "Add a setter for the text variable of the Alphabet class" --- .../system/framerate/FramerateCounter.hx | 2 +- source/funkin/menus/ui/Alphabet.hx | 33 ++++++++----------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/source/funkin/backend/system/framerate/FramerateCounter.hx b/source/funkin/backend/system/framerate/FramerateCounter.hx index f5270051..55cc0f97 100644 --- a/source/funkin/backend/system/framerate/FramerateCounter.hx +++ b/source/funkin/backend/system/framerate/FramerateCounter.hx @@ -35,4 +35,4 @@ class FramerateCounter extends Sprite { fpsLabel.x = fpsNum.x + fpsNum.width; fpsLabel.y = (fpsNum.y + fpsNum.height) - fpsLabel.height; } -} +} \ No newline at end of file diff --git a/source/funkin/menus/ui/Alphabet.hx b/source/funkin/menus/ui/Alphabet.hx index f147d240..c885898e 100644 --- a/source/funkin/menus/ui/Alphabet.hx +++ b/source/funkin/menus/ui/Alphabet.hx @@ -23,7 +23,7 @@ class Alphabet extends FlxSpriteGroup public var targetY:Float = 0; public var isMenuItem:Bool = false; - public var text(default, set):String = ""; + public var text:String = ""; var _finalText:String = ""; var _curText:String = ""; @@ -51,24 +51,6 @@ class Alphabet extends FlxSpriteGroup return super.set_color(c); } - private function set_text(v:String):String { - text = v; - - while (members.length > 0) { - var character = members[0]; - remove(character, true); - character.destroy(); - } - - if (text != "") { - if (typed) - startTypedText(); - else - addText(); - } - return v; - } - // TODO: fix this shit refreshing public function refreshAlphabetXML(path:String) { AlphaCharacter.__alphaPath = path; @@ -102,6 +84,7 @@ class Alphabet extends FlxSpriteGroup { super(x, y); + _finalText = this.text = text; isBold = bold; var alphabetPath = Paths.xml("alphabet"); @@ -128,7 +111,17 @@ class Alphabet extends FlxSpriteGroup } #end - _finalText = this.text = text; + if (text != "") + { + if (typed) + { + startTypedText(); + } + else + { + addText(); + } + } } public function addText()