From bf0a6a9bbe48bc5eb6df56077b66ecac7cbbcedd Mon Sep 17 00:00:00 2001 From: syrup <123270096+maplesyruppppppp@users.noreply.github.com> Date: Fri, 7 Jun 2024 06:32:05 -0500 Subject: [PATCH] FPS Counter offset fix for Options/Credits menu (#307) * pixel note splashes * tyy!! * pixel secret notesplashes * the fix itself lol --- source/funkin/options/OptionsMenu.hx | 3 --- source/funkin/options/TreeMenu.hx | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/funkin/options/OptionsMenu.hx b/source/funkin/options/OptionsMenu.hx index f9232e13f..497bfd9b9 100644 --- a/source/funkin/options/OptionsMenu.hx +++ b/source/funkin/options/OptionsMenu.hx @@ -1,6 +1,5 @@ package funkin.options; -import funkin.backend.system.framerate.Framerate; import funkin.options.type.Checkbox; import haxe.xml.Access; import funkin.options.type.*; @@ -48,8 +47,6 @@ class OptionsMenu extends TreeMenu { bg.antialiasing = true; add(bg); - Framerate.offset.y = 60; - main = new OptionsScreen("Options", "Select a category to continue.", [for(o in mainOptions) new TextOption(o.name, o.desc, function() { if (o.substate != null) { persistentUpdate = false; diff --git a/source/funkin/options/TreeMenu.hx b/source/funkin/options/TreeMenu.hx index ac0271342..b0651fd26 100644 --- a/source/funkin/options/TreeMenu.hx +++ b/source/funkin/options/TreeMenu.hx @@ -7,6 +7,7 @@ import flixel.tweens.FlxTween; import funkin.menus.MainMenuState; import flixel.util.typeLimit.OneOfTwo; import funkin.options.type.OptionType; +import funkin.backend.system.framerate.Framerate; class TreeMenu extends UIState { public var main:OptionsScreen; @@ -97,6 +98,8 @@ class TreeMenu extends UIState { var menuChangeTween:FlxTween; public override function update(elapsed:Float) { super.update(elapsed); + + Framerate.offset.y = pathBG.height; // in case path gets so long it goes offscreen pathLabel.x = lerp(pathLabel.x, Math.max(0, FlxG.width - 4 - pathLabel.width), 0.125);