From 498134530c299905357115f3d3ac68f1dccd1e3c Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Fri, 27 Dec 2024 20:21:52 -0500 Subject: [PATCH 1/2] bruh --- source/PlayState.hx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 41c94ba4d87..4cc9fd8503a 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -2151,7 +2151,7 @@ class PlayState extends MusicBeatState var fps:Float = 60; var bfCanPan:Bool = false; var dadCanPan:Bool = false; - var clear:Bool = false; + var doPan:Bool = false; function camPanRoutine(anim:String = 'singUP', who:String = 'bf'):Void { if (SONG.notes[curSection] != null) { @@ -2159,11 +2159,11 @@ class PlayState extends MusicBeatState bfCanPan = SONG.notes[curSection].mustHitSection; dadCanPan = !SONG.notes[curSection].mustHitSection; switch (who) { - case 'bf' | 'boyfriend': clear = bfCanPan; - case 'oppt' | 'dad': clear = dadCanPan; + case 'bf' | 'boyfriend': doPan = bfCanPan; + case 'oppt' | 'dad': doPan = dadCanPan; } //FlxG.elapsed is stinky poo poo for this, it just makes it look jank as fuck - if (clear) { + if (doPan) { if (fps == 0) fps = 1; switch (anim.split('-')[0]) { From a4b6aa303d73752b79c3b508501f558a9106bbd7 Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Sat, 28 Dec 2024 02:21:30 -0500 Subject: [PATCH 2/2] Update FPSCounter.hx --- source/debug/FPSCounter.hx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/debug/FPSCounter.hx b/source/debug/FPSCounter.hx index 136cf91461a..1a2a598544d 100644 --- a/source/debug/FPSCounter.hx +++ b/source/debug/FPSCounter.hx @@ -44,10 +44,12 @@ class FPSCounter extends TextField var fpsMultiplier:Float = 1.0; var deltaTimeout:Float = 0.0; public var timeoutDelay:Float = 50; + var now:Float = 0; // Event Handlers override function __enterFrame(deltaTime:Float):Void { - final now:Float = haxe.Timer.stamp() * 1000; + if (!ClientPrefs.showFPS) return; + now = haxe.Timer.stamp() * 1000; times.push(now); while (times[0] < now - 1000 / fpsMultiplier) times.shift(); if (deltaTimeout <= timeoutDelay) @@ -90,11 +92,9 @@ class FPSCounter extends TextField public dynamic function updateText():Void // so people can override it in hscript { - text = (ClientPrefs.showFPS ? "FPS: " + (ClientPrefs.ffmpegMode ? ClientPrefs.targetFPS : Math.round(currentFPS)) : ""); + text = "FPS: " + (ClientPrefs.ffmpegMode ? ClientPrefs.targetFPS : Math.round(currentFPS)); if (ClientPrefs.ffmpegMode) - { text += " (Rendering Mode)"; - } if (ClientPrefs.showRamUsage) text += "\nRAM: " + FlxStringUtil.formatBytes(memory) + (ClientPrefs.showMaxRamUsage ? " / " + FlxStringUtil.formatBytes(mempeak) : ""); if (ClientPrefs.debugInfo)