From 7d7e0619a6301eef05acecf91c5902f012800280 Mon Sep 17 00:00:00 2001 From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com> Date: Sat, 24 Dec 2022 13:02:33 +0100 Subject: [PATCH] CONDUCTOR!!!!!!!!!!!!!!!!!!!! --- buildnumber.txt | 2 +- source/funkin/system/Conductor.hx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/buildnumber.txt b/buildnumber.txt index c2bde110..7ffcb4ea 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -1743 \ No newline at end of file +1744 \ No newline at end of file diff --git a/source/funkin/system/Conductor.hx b/source/funkin/system/Conductor.hx index 1b8ac67a..39b33040 100644 --- a/source/funkin/system/Conductor.hx +++ b/source/funkin/system/Conductor.hx @@ -153,7 +153,8 @@ class Conductor if (lastSongPos != (lastSongPos = FlxG.sound.music.time)) { // update conductor var timeUntilUpdate = -(lastSongPosTime - (lastSongPosTime = Lib.getTimer())); - speed = FlxMath.bound(FlxMath.lerp(speed, timeUntilUpdate / (lastSongPos - lastPos), elapsed), 0.85, 1.15); + var elapsedAL = (lastSongPos - lastPos); + speed = FlxMath.bound(FlxMath.lerp(speed, timeUntilUpdate / elapsedAL, elapsedAL / 1000), 0.85, 1.15); songPosition = lastSongPos; } else { songPosition += elapsed * 1000 * speed;