From 66ae60e9e48966f4c5555416560d53e635b6f02e Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Sun, 5 Nov 2023 01:19:47 -0400 Subject: [PATCH] Updated syntax after merge --- assets | 2 +- source/funkin/data/song/SongData.hx | 8 ++++---- source/funkin/ui/debug/charting/ChartEditorState.hx | 4 +++- .../debug/charting/handlers/ChartEditorDialogHandler.hx | 2 -- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/assets b/assets index 49901dee1..d491f5d87 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 49901dee1fae3fdfd784e9d48374255282cc2042 +Subproject commit d491f5d87a0deba0b5642beeb801c8e130754038 diff --git a/source/funkin/data/song/SongData.hx b/source/funkin/data/song/SongData.hx index 9523f23c0..83b336606 100644 --- a/source/funkin/data/song/SongData.hx +++ b/source/funkin/data/song/SongData.hx @@ -528,8 +528,8 @@ abstract SongEventData(SongEventDataRaw) from SongEventDataRaw to SongEventDataR public inline function getInt(key:String):Null { - if (value == null) return null; - var result = Reflect.field(value, key); + if (this.value == null) return null; + var result = Reflect.field(this.value, key); if (result == null) return null; if (Std.isOfType(result, Int)) return result; if (Std.isOfType(result, String)) return Std.parseInt(cast result); @@ -538,8 +538,8 @@ abstract SongEventData(SongEventDataRaw) from SongEventDataRaw to SongEventDataR public inline function getFloat(key:String):Null { - if (value == null) return null; - var result = Reflect.field(value, key); + if (this.value == null) return null; + var result = Reflect.field(this.value, key); if (result == null) return null; if (Std.isOfType(result, Float)) return result; if (Std.isOfType(result, String)) return Std.parseFloat(cast result); diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx index 023aeda4b..71e86ad1f 100644 --- a/source/funkin/ui/debug/charting/ChartEditorState.hx +++ b/source/funkin/ui/debug/charting/ChartEditorState.hx @@ -3921,8 +3921,10 @@ class ChartEditorState extends HaxeUIState if (FlxG.keys.justPressed.F1) this.openUserGuideDialog(); } - function handleQuickWatch():Void + override function handleQuickWatch():Void { + super.handleQuickWatch(); + FlxG.watch.addQuick('scrollPosInPixels', scrollPositionInPixels); FlxG.watch.addQuick('playheadPosInPixels', playheadPositionInPixels); diff --git a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx index d773e6489..bb066a923 100644 --- a/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx +++ b/source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx @@ -15,8 +15,6 @@ import funkin.play.character.CharacterData.CharacterDataParser; import funkin.play.song.Song; import funkin.play.stage.StageData; import funkin.ui.debug.charting.util.ChartEditorDropdowns; -import funkin.ui.haxeui.components.FunkinDropDown; -import funkin.ui.haxeui.components.FunkinLink; import funkin.util.Constants; import funkin.util.FileUtil; import funkin.util.SerializerUtil;