diff --git a/assets b/assets index 8013845e3..82b8d637f 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 8013845e331015b40c4cc35230f6d02bd2148d52 +Subproject commit 82b8d637fb402a4c69001fd3c4fb435b56a1b4f1 diff --git a/source/funkin/Conductor.hx b/source/funkin/Conductor.hx index 3c6d2951f..104682ffd 100644 --- a/source/funkin/Conductor.hx +++ b/source/funkin/Conductor.hx @@ -267,18 +267,6 @@ class Conductor set_instance(new Conductor()); } - /** - * Add values of the current main Conductor instance to the `FlxG.watch`. - */ - public static function watchQuick():Void - { - FlxG.watch.addQuick("songPosition", Conductor.instance.songPosition); - FlxG.watch.addQuick("bpm", Conductor.instance.bpm); - FlxG.watch.addQuick("currentMeasureTime", Conductor.instance.currentMeasureTime); - FlxG.watch.addQuick("currentBeatTime", Conductor.instance.currentBeatTime); - FlxG.watch.addQuick("currentStepTime", Conductor.instance.currentStepTime); - } - static function dispatchMeasureHit():Void { Conductor.measureHit.dispatch(); @@ -611,12 +599,4 @@ class Conductor FlxG.watch.addQuick('currentBeatTime', target.currentBeatTime); FlxG.watch.addQuick('currentStepTime', target.currentStepTime); } - - /** - * Reset the Conductor, replacing the current instance with a fresh one. - */ - public static function reset():Void - { - _instance = new Conductor(); - } }