diff --git a/source/flx3d/Flx3DCamera.hx b/source/flx3d/Flx3DCamera.hx index 4594e91e..77741aed 100644 --- a/source/flx3d/Flx3DCamera.hx +++ b/source/flx3d/Flx3DCamera.hx @@ -24,7 +24,7 @@ import away3d.loaders.misc.AssetLoaderContext; import openfl.Assets; import away3d.entities.Mesh; import away3d.loaders.Loader3D; -import funkin.native.NativeAPI.ConsoleColor; +import funkin.utils.NativeAPI.ConsoleColor; import flixel.FlxCamera; import away3d.containers.View3D; diff --git a/source/flx3d/Flx3DView.hx b/source/flx3d/Flx3DView.hx index 547cf45d..f1befa7f 100644 --- a/source/flx3d/Flx3DView.hx +++ b/source/flx3d/Flx3DView.hx @@ -24,7 +24,7 @@ import away3d.loaders.misc.AssetLoaderContext; import openfl.Assets; import away3d.entities.Mesh; import away3d.loaders.Loader3D; -import funkin.native.NativeAPI.ConsoleColor; +import funkin.utils.NativeAPI.ConsoleColor; // FlxView3D with helpers for easier updating diff --git a/source/funkin/system/Conductor.hx b/source/funkin/system/Conductor.hx index 1269623b..1210609e 100644 --- a/source/funkin/system/Conductor.hx +++ b/source/funkin/system/Conductor.hx @@ -200,6 +200,7 @@ class Conductor var oldBeat = curBeat; var oldMeasure = curMeasure; if (curStep != (curStep = CoolUtil.floorInt(curStepFloat))) { + if (curStep < oldStep && oldStep - curStep < 2) return; // updates step __updateBeat = curBeat != (curBeat = CoolUtil.floorInt(curBeatFloat)); __updateMeasure = __updateBeat && (curMeasure != (curMeasure = CoolUtil.floorInt(curMeasureFloat))); diff --git a/source/funkin/utils/NativeAPI.hx b/source/funkin/utils/NativeAPI.hx index a14dc24c..42a87dbf 100644 --- a/source/funkin/utils/NativeAPI.hx +++ b/source/funkin/utils/NativeAPI.hx @@ -1,5 +1,3 @@ - - package funkin.utils; import funkin.utils.native.*; diff --git a/source/lime/system/System.hx b/source/lime/system/System.hx index 46e5acf7..f29f9836 100644 --- a/source/lime/system/System.hx +++ b/source/lime/system/System.hx @@ -529,7 +529,7 @@ class System // executes first!! #if sys - funkin.native.NativeAPI.registerAsDPICompatible(); + funkin.utils.NativeAPI.registerAsDPICompatible(); funkin.system.CommandLineHandler.parseCommandLine(Sys.args()); #end