From 85b50c7ccee88000ada26ae73391ab8693c5d5de Mon Sep 17 00:00:00 2001 From: Ne_Eo Date: Sat, 30 Nov 2024 00:44:52 +0100 Subject: [PATCH] Bug Fixes + Cleanup --- .../backend/system/macros/DefinesMacro.hx | 2 +- .../backend/system/macros/FunkinSaveMacro.hx | 18 ++++-------------- .../backend/system/macros/OptionsMacro.hx | 10 ++-------- source/funkin/backend/utils/ZipUtil.hx | 2 +- .../editors/character/CharacterEditor.hx | 2 +- source/funkin/editors/charter/Charter.hx | 4 ++-- source/funkin/editors/ui/UIState.hx | 8 ++++---- source/funkin/game/Note.hx | 2 +- source/funkin/game/PlayState.hx | 10 +++++++--- .../funkin/game/cutscenes/ScriptedCutscene.hx | 4 ++-- source/funkin/options/type/OptionType.hx | 2 +- 11 files changed, 26 insertions(+), 38 deletions(-) diff --git a/source/funkin/backend/system/macros/DefinesMacro.hx b/source/funkin/backend/system/macros/DefinesMacro.hx index da257223..7fe19375 100644 --- a/source/funkin/backend/system/macros/DefinesMacro.hx +++ b/source/funkin/backend/system/macros/DefinesMacro.hx @@ -9,7 +9,7 @@ class DefinesMacro { /** * Returns the defined values */ - public static var defines(get, null):Map; + public static var defines(get, never):Map; // GETTERS #if REGION diff --git a/source/funkin/backend/system/macros/FunkinSaveMacro.hx b/source/funkin/backend/system/macros/FunkinSaveMacro.hx index 11632991..66b367b7 100644 --- a/source/funkin/backend/system/macros/FunkinSaveMacro.hx +++ b/source/funkin/backend/system/macros/FunkinSaveMacro.hx @@ -51,11 +51,9 @@ class FunkinSaveMacro { expr: EConst(CIdent(f)) }} ]; + var saveFuncBlocks:Array = [for(f in fieldNames) macro $i{saveFieldName}.data.$f = $i{f}]; - saveFuncBlocks.push(macro ${{ - pos: Context.currentPos(), - expr: EConst(CIdent(saveFieldName)) - }}.flush()); + saveFuncBlocks.push(macro $i{saveFieldName}.flush()); fields.push({ pos: Context.currentPos(), @@ -81,16 +79,8 @@ class FunkinSaveMacro { expr: { pos: Context.currentPos(), expr: EBlock([for(f in fieldNames) - macro if (${{ - pos: Context.currentPos(), - expr: EConst(CIdent(saveFieldName)) - }}.data.$f != null) ${{ - pos: Context.currentPos(), - expr: EConst(CIdent(f)) - }} = ${{ - pos: Context.currentPos(), - expr: EConst(CIdent(saveFieldName)) - }}.data.$f + macro if ($i{saveFieldName}.data.$f != null) + $i{f} = $i{saveFieldName}.data.$f ]) } }), diff --git a/source/funkin/backend/system/macros/OptionsMacro.hx b/source/funkin/backend/system/macros/OptionsMacro.hx index ae54eb66..bd688b59 100644 --- a/source/funkin/backend/system/macros/OptionsMacro.hx +++ b/source/funkin/backend/system/macros/OptionsMacro.hx @@ -24,14 +24,8 @@ class OptionsMacro { var ptwoname = 'P2_$name'; var newFuncExpr:Expr = macro { var a:Array = []; - for(e in ${{ - pos: Context.currentPos(), - expr: EConst(CIdent(ponename)) - }}) a.push(e); - for(e in ${{ - pos: Context.currentPos(), - expr: EConst(CIdent(ptwoname)) - }}) a.push(e); + for(e in $i{ponename}) a.push(e); + for(e in $i{ptwoname}) a.push(e); return a; }; diff --git a/source/funkin/backend/utils/ZipUtil.hx b/source/funkin/backend/utils/ZipUtil.hx index 16a353c2..13e5fa99 100644 --- a/source/funkin/backend/utils/ZipUtil.hx +++ b/source/funkin/backend/utils/ZipUtil.hx @@ -218,7 +218,7 @@ class ZipProgress { public var curFile:Int = 0; public var fileCount:Int = 0; public var done:Bool = false; - public var percentage(get, null):Float; + public var percentage(get, never):Float; private function get_percentage() { return fileCount <= 0 ? 0 : curFile / fileCount; diff --git a/source/funkin/editors/character/CharacterEditor.hx b/source/funkin/editors/character/CharacterEditor.hx index c8b6435f..73d991b3 100644 --- a/source/funkin/editors/character/CharacterEditor.hx +++ b/source/funkin/editors/character/CharacterEditor.hx @@ -14,7 +14,7 @@ class CharacterEditor extends UIState { public var ghosts:CharacterGhostsHandler; - public static var instance(get, null):CharacterEditor; + public static var instance(get, never):CharacterEditor; private static inline function get_instance() return FlxG.state is CharacterEditor ? cast FlxG.state : null; diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx index 99a87ded..3d6f3f12 100644 --- a/source/funkin/editors/charter/Charter.hx +++ b/source/funkin/editors/charter/Charter.hx @@ -22,11 +22,11 @@ class Charter extends UIState { static var __diff:String; static var __reload:Bool; - var chart(get, null):ChartData; + var chart(get, never):ChartData; private function get_chart() return PlayState.SONG; - public static var instance(get, null):Charter; + public static var instance(get, never):Charter; private static inline function get_instance() return FlxG.state is Charter ? cast FlxG.state : null; diff --git a/source/funkin/editors/ui/UIState.hx b/source/funkin/editors/ui/UIState.hx index 1c32fad6..1a66821d 100644 --- a/source/funkin/editors/ui/UIState.hx +++ b/source/funkin/editors/ui/UIState.hx @@ -13,7 +13,10 @@ import openfl.ui.MouseCursor; class UIState extends MusicBeatState { public var curContextMenu:UIContextMenu = null; - public static var state(get, null):UIState; + public static var state(get, never):UIState; + + private inline static function get_state() + return FlxG.state is UIState ? cast FlxG.state : null; public var buttonHandler:Void->Void = null; public var hoveredSprite:UISprite = null; @@ -24,9 +27,6 @@ class UIState extends MusicBeatState { private var __rect:FlxRect; private var __mousePos:FlxPoint; - private inline static function get_state() - return FlxG.state is UIState ? cast FlxG.state : null; - public override function create() { __rect = new FlxRect(); __mousePos = FlxPoint.get(); diff --git a/source/funkin/game/Note.hx b/source/funkin/game/Note.hx index 125ec419..d14b87fd 100644 --- a/source/funkin/game/Note.hx +++ b/source/funkin/game/Note.hx @@ -75,7 +75,7 @@ class Note extends FlxSprite public var scrollSpeed:Null = null; public var noteAngle:Null = null; - public var noteType(get, null):String; + public var noteType(get, never):String; @:dox(hide) public var __strumCameras:Array = null; @:dox(hide) public var __strum:Strum = null; diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 5d353e80..f39cc4e3 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -189,11 +189,11 @@ class PlayState extends MusicBeatState /** * Player strums. */ - public var playerStrums(get, null):StrumLine; + public var playerStrums(get, set):StrumLine; /** * CPU strums. */ - public var cpuStrums(get, null):StrumLine; + public var cpuStrums(get, set):StrumLine; /** * Shortcut to `playerStrums`. */ @@ -360,7 +360,7 @@ class PlayState extends MusicBeatState /** * Accuracy for the current week */ - public static var campaignAccuracy(get, null):Float; + public static var campaignAccuracy(get, never):Float; public static var campaignAccuracyTotal:Float = 0; public static var campaignAccuracyCount:Float = 0; @@ -1943,8 +1943,12 @@ class PlayState extends MusicBeatState } private inline function get_cpuStrums():StrumLine return strumLines.members[0]; + private inline function set_cpuStrums(v:StrumLine):StrumLine + return strumLines.members[0] = v; private inline function get_playerStrums():StrumLine return strumLines.members[1]; + private inline function set_playerStrums(v:StrumLine):StrumLine + return strumLines.members[1] = v; private inline function get_gfSpeed():Int return (strumLines.members[2] != null && strumLines.members[2].characters[0] != null) ? strumLines.members[2].characters[0].beatInterval : 1; private inline function set_gfSpeed(v:Int):Int { diff --git a/source/funkin/game/cutscenes/ScriptedCutscene.hx b/source/funkin/game/cutscenes/ScriptedCutscene.hx index 20a01aa2..cdd8c0f7 100644 --- a/source/funkin/game/cutscenes/ScriptedCutscene.hx +++ b/source/funkin/game/cutscenes/ScriptedCutscene.hx @@ -125,7 +125,7 @@ class ScriptedCutscene extends Cutscene { })); } - public var isVideoPlaying(get, null):Bool; + public var isVideoPlaying(get, never):Bool; private inline function get_isVideoPlaying() return subState is VideoCutscene; @@ -141,7 +141,7 @@ class ScriptedCutscene extends Cutscene { })); } - public var isDialoguePlaying(get, null):Bool; + public var isDialoguePlaying(get, never):Bool; private inline function get_isDialoguePlaying() return subState is DialogueCutscene; diff --git a/source/funkin/options/type/OptionType.hx b/source/funkin/options/type/OptionType.hx index 26699723..fbe25854 100644 --- a/source/funkin/options/type/OptionType.hx +++ b/source/funkin/options/type/OptionType.hx @@ -4,7 +4,7 @@ import flixel.group.FlxSpriteGroup; import funkin.backend.system.Controls; class OptionType extends FlxSpriteGroup { - public var controls(get, null):Controls; + public var controls(get, never):Controls; public var selected:Bool = false; public var desc:String;