From ffbc8c80c843964e2a27cf863c93872802cf736a Mon Sep 17 00:00:00 2001 From: KarimAkra Date: Fri, 13 Jun 2025 02:42:05 +0300 Subject: [PATCH] nudge the speakers a bit to cover the curtain properly --- source/funkin/ui/FullScreenScaleMode.hx | 2 +- source/funkin/ui/charSelect/CharSelectSubState.hx | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/source/funkin/ui/FullScreenScaleMode.hx b/source/funkin/ui/FullScreenScaleMode.hx index 67b4e5a02..6d82a8a3d 100644 --- a/source/funkin/ui/FullScreenScaleMode.hx +++ b/source/funkin/ui/FullScreenScaleMode.hx @@ -280,7 +280,7 @@ class FullScreenScaleMode extends flixel.system.scaleModes.BaseScaleMode gameNotchSize.copyFrom(notchSize); final scale:Float = logicalSize.x / FlxG.initialWidth; - if (logicalSize > FlxG.initialWidth) + if (Math.ceil(logicalSize.x) > FlxG.initialWidth) { gameNotchPosition /= scale; gameNotchSize /= scale; diff --git a/source/funkin/ui/charSelect/CharSelectSubState.hx b/source/funkin/ui/charSelect/CharSelectSubState.hx index 8e284feb0..dc767d6d8 100644 --- a/source/funkin/ui/charSelect/CharSelectSubState.hx +++ b/source/funkin/ui/charSelect/CharSelectSubState.hx @@ -128,16 +128,11 @@ class CharSelectSubState extends MusicBeatSubState var fadeShader:BlueFade = new BlueFade(); - var speakers2:FlxAtlasSprite; - override public function create():Void { super.create(); cutoutSize = FullScreenScaleMode.gameCutoutSize.x / 2; - #if !ios - cutoutSize *= FullScreenScaleMode.wideScale.x; - #end bopInfo = FramesJSFLParser.parse(Paths.file("images/charSelect/iconBopInfo/iconBopInfo.txt")); @@ -201,13 +196,13 @@ class CharSelectSubState extends MusicBeatSubState playerChill.switchChar("bf"); add(playerChill); - var speakers:FlxAtlasSprite = new FlxAtlasSprite(cutoutSize, 0, Paths.animateAtlas("charSelect/charSelectSpeakers")); + var speakers:FlxAtlasSprite = new FlxAtlasSprite(cutoutSize - 10, 0, Paths.animateAtlas("charSelect/charSelectSpeakers")); speakers.anim.play(""); speakers.anim.onComplete.add(function() { speakers.anim.play(""); }); speakers.scrollFactor.set(1.8, 1.8); - speakers.scale.set(1.12, 1.12); + speakers.scale.set(1.05, 1.05); add(speakers); var fgBlur:FlxSprite = new FlxSprite(cutoutSize + -125, 170);