From 4e19c51f9155544ee31f7f37cdc3b4f2da1e509f Mon Sep 17 00:00:00 2001 From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com> Date: Mon, 10 Apr 2023 15:33:36 +0200 Subject: [PATCH] someones going to hate me --- source/funkin/editors/charter/CharterNoteGroup.hx | 6 +++++- update/Update.hx | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/source/funkin/editors/charter/CharterNoteGroup.hx b/source/funkin/editors/charter/CharterNoteGroup.hx index 5898dcf8..eaa75299 100644 --- a/source/funkin/editors/charter/CharterNoteGroup.hx +++ b/source/funkin/editors/charter/CharterNoteGroup.hx @@ -17,13 +17,17 @@ class CharterNoteGroup extends FlxTypedGroup { var oldCur = __currentlyLooping; __currentlyLooping = true; + var curStep = Conductor.curStepFloat; + if (FlxG.state is Charter && !FlxG.sound.music.playing) + curStep = cast(FlxG.state, Charter).conductorFollowerSpr.y / 40; + while(i < length) { __loopSprite = members[i]; if (__loopSprite == null || !__loopSprite.exists) { i++; continue; } - if (Math.abs(__loopSprite.step - Conductor.curStepFloat) - __loopSprite.susLength < max) + if (Math.abs(__loopSprite.step - curStep) - __loopSprite.susLength < max) noteFunc(__loopSprite); i++; } diff --git a/update/Update.hx b/update/Update.hx index aba7441a..c6cba4c2 100644 --- a/update/Update.hx +++ b/update/Update.hx @@ -14,11 +14,14 @@ class Update { // install libs switch(lib.type) { case "haxelib": - prettyPrint('Installing "${lib.name}"...'); + prettyPrint('Installing "${lib.name}"...'); Sys.command('haxelib install ${lib.name} ${lib.version != null ? " " + lib.version : " "}'); case "git": prettyPrint('Installing "${lib.name}" from git url "${lib.url}"'); - Sys.command('haxelib git ${lib.name} ${lib.url}'); + if (lib.ref != null) + Sys.command('haxelib git ${lib.name} ${lib.url} ${lib.ref}'); + else + Sys.command('haxelib git ${lib.name} ${lib.url}'); default: prettyPrint('Cannot resolve library of type "${lib.type}"'); }