Merge branch 'FNF-CNE-Devs:main' into cne-pr

MobilePorting · Oct 14, 2024 · 03043fc · 03043fc
2 parents cd479b1 + 0db0022
commit 03043fc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/assets/data/dialogue/characters/senpai.hx b/assets/data/dialogue/characters/senpai.hx
@@ -1,6 +1,6 @@
 function postHide() {
 	if(curTween != null) {
-		if(animation.curAnim?.name == 'angry-show') curTween.cancel();
+		if(getAnimName() == 'angry-show') curTween.cancel();
 		else curTween.percent = 1;
 	}
-}
+}
diff --git a/source/funkin/menus/credits/CreditsCodename.hx b/source/funkin/menus/credits/CreditsCodename.hx
@@ -11,9 +11,11 @@ using StringTools;
 class CreditsCodename extends funkin.options.OptionsScreen {
 	public var error:Bool = false;
 	public var author:String = "FNF-CNE-Devs";
+	public var totalContributions:Int = 0;
+
 	public var mainDevCol:FlxColor = 0xFF9C35D5;
 	public var minContrCol:FlxColor = 0xFFB4A7DA;
-	public var totalContributions:Int = 0;
+	public var contribFormats:Array<FlxTextFormatMarkerPair> = [];
 
 	public override function new()
 	{
@@ -58,15 +60,15 @@ class CreditsCodename extends funkin.options.OptionsScreen {
 		if(parent == null || parent.treeParent == null) return;
 		var text:String = parent.treeParent.pathDesc.text;
 		parent.treeParent.pathDesc.text = "";
-		parent.treeParent.pathDesc.applyMarkup(text, [
+		parent.treeParent.pathDesc.applyMarkup(text, contribFormats = [
 			new FlxTextFormatMarkerPair(new FlxTextFormat(mainDevCol), '*'),
 			new FlxTextFormatMarkerPair(new FlxTextFormat(FlxColor.interpolate(minContrCol, mainDevCol, Options.contributors[curSelected].contributions / totalContributions)), '~')
 		]);
 	}
 
 	override function close() {
 		super.close();
-		parent.treeParent.pathDesc.clearFormats();
+		for (frmt in contribFormats) parent.treeParent.pathDesc.removeFormat(frmt.format);
 	}
 
 	public function checkUpdate():Bool {