diff --git a/source/funkin/backend/system/Conductor.hx b/source/funkin/backend/system/Conductor.hx index e1794ac4..2c5dd0e1 100644 --- a/source/funkin/backend/system/Conductor.hx +++ b/source/funkin/backend/system/Conductor.hx @@ -56,7 +56,12 @@ final class Conductor public static var songPosition(get, default):Float; private static function get_songPosition() { if (songOffset != Options.songOffset) songOffset = Options.songOffset; - return songPosition - songOffset; + if (!Options.songOffsetAffectEditors && Charter.instance != null) { + trace("NO MORE NOTE OFFSET!!!!!"); + return songPosition; + } + else + return songPosition - songOffset; } /** diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx index 0b0bda8d..b418524a 100644 --- a/source/funkin/options/Options.hx +++ b/source/funkin/options/Options.hx @@ -66,6 +66,7 @@ class Options public static var editorsResizable:Bool = true; public static var bypassEditorsResize:Bool = false; public static var maxUndos:Int = 120; + public static var songOffsetAffectEditors:Bool = false; /** * QOL FEATURES diff --git a/source/funkin/options/categories/DebugOptions.hx b/source/funkin/options/categories/DebugOptions.hx index b0ff8e71..74b2eb8a 100644 --- a/source/funkin/options/categories/DebugOptions.hx +++ b/source/funkin/options/categories/DebugOptions.hx @@ -18,5 +18,6 @@ class DebugOptions extends TreeMenuScreen { add(new NumOption(getNameID("charterAutoSaveTime"), getDescID("charterAutoSaveTime"), 60, 60*10, 1, "charterAutoSaveTime")); add(new NumOption(getNameID("charterAutoSaveWarningTime"), getDescID("charterAutoSaveWarningTime"), 0, 15, 1, "charterAutoSaveWarningTime")); add(new Checkbox(getNameID("charterAutoSavesSeparateFolder"), getDescID("charterAutoSavesSeparateFolder"), "charterAutoSavesSeparateFolder")); + add(new Checkbox(getNameID("songOffsetAffectEditors"), getDescID("songOffsetAffectEditors"), "songOffsetAffectEditors")); } } \ No newline at end of file