cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-08-20 07:25:59 +00:00
Code Issues Releases Wiki Activity

Updated syntax after merge

Browse source
This commit is contained in:
EliteMasterEric 2023-11-05 01:19:47 -04:00
parent a0ae4c418d
commit 66ae60e9e4
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 49901dee1fae3fdfd784e9d48374255282cc2042
Subproject commit d491f5d87a0deba0b5642beeb801c8e130754038

8
source/funkin/data/song/SongData.hx
View file

@ -528,8 +528,8 @@ abstract SongEventData(SongEventDataRaw) from SongEventDataRaw to SongEventDataR
public inline function getInt(key:String):Null<Int>
{
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<Float>
{
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);

4
source/funkin/ui/debug/charting/ChartEditorState.hx
View file

@ -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);

2
source/funkin/ui/debug/charting/handlers/ChartEditorDialogHandler.hx
View file

@ -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;