From cc7577a333a05f803f937888c95d8f8f7a7770c8 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 5 Jan 2024 20:25:54 -0500
Subject: [PATCH] fix conductor instance stuf on watchPlugin
---
source/funkin/ui/MusicBeatState.hx | 12 ------------
source/funkin/util/plugins/WatchPlugin.hx | 12 ++++++------
2 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/source/funkin/ui/MusicBeatState.hx b/source/funkin/ui/MusicBeatState.hx
index ffd065901..33333565f 100644
--- a/source/funkin/ui/MusicBeatState.hx
+++ b/source/funkin/ui/MusicBeatState.hx
@@ -80,18 +80,6 @@ class MusicBeatState extends FlxTransitionableState implements IEventHandler
if (FlxG.keys.justPressed.F5) debug_refreshModules();
}
- function handleQuickWatch():Void
- {
- // Display Conductor info in the watch window.
- FlxG.watch.addQuick("songPosition", Conductor.instance.songPosition);
- FlxG.watch.addQuick("songPositionNoOffset", Conductor.instance.songPosition + Conductor.instance.instrumentalOffset);
- FlxG.watch.addQuick("musicTime", FlxG.sound.music?.time ?? 0.0);
- FlxG.watch.addQuick("bpm", Conductor.instance.bpm);
- FlxG.watch.addQuick("currentMeasureTime", Conductor.instance.currentBeatTime);
- FlxG.watch.addQuick("currentBeatTime", Conductor.instance.currentBeatTime);
- FlxG.watch.addQuick("currentStepTime", Conductor.instance.currentStepTime);
- }
-
override function update(elapsed:Float)
{
super.update(elapsed);
diff --git a/source/funkin/util/plugins/WatchPlugin.hx b/source/funkin/util/plugins/WatchPlugin.hx
index 5d718c2e0..17b2dd129 100644
--- a/source/funkin/util/plugins/WatchPlugin.hx
+++ b/source/funkin/util/plugins/WatchPlugin.hx
@@ -22,13 +22,13 @@ class WatchPlugin extends FlxBasic
{
super.update(elapsed);
- FlxG.watch.addQuick("songPosition", Conductor.songPosition);
- FlxG.watch.addQuick("songPositionNoOffset", Conductor.songPosition + Conductor.instrumentalOffset);
+ FlxG.watch.addQuick("songPosition", Conductor.instance.songPosition);
+ FlxG.watch.addQuick("songPositionNoOffset", Conductor.instance.songPosition + Conductor.instance.instrumentalOffset);
FlxG.watch.addQuick("musicTime", FlxG.sound?.music?.time ?? 0.0);
- FlxG.watch.addQuick("bpm", Conductor.bpm);
- FlxG.watch.addQuick("currentMeasureTime", Conductor.currentMeasureTime);
- FlxG.watch.addQuick("currentBeatTime", Conductor.currentBeatTime);
- FlxG.watch.addQuick("currentStepTime", Conductor.currentStepTime);
+ 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);
}
public override function destroy():Void