From 1cdb7fe2f699ea67d47153c84ddd68dcdbdd34ec Mon Sep 17 00:00:00 2001 From: NeeEoo Date: Fri, 1 Mar 2024 02:43:42 +0100 Subject: [PATCH] Fix stuff --- project.xml | 2 -- source/funkin/backend/FunkinSprite.hx | 3 +-- source/funkin/backend/scripting/HScript.hx | 2 ++ source/funkin/backend/scripting/events/PlayAnimEvent.hx | 3 +-- source/funkin/backend/system/ErrorCode.hx | 3 +-- source/funkin/backend/system/github/GitHubUser.hx | 3 +-- source/funkin/backend/system/updating/AsyncUpdater.hx | 3 +-- source/funkin/menus/FreeplayState.hx | 7 ++----- source/funkin/menus/PauseSubState.hx | 7 ++----- source/lime/_internal/backend/native/NativeWindow.hx | 4 ++-- source/lime/system/System.hx | 2 +- 11 files changed, 14 insertions(+), 25 deletions(-) diff --git a/project.xml b/project.xml index a15ea7db..e02da875 100644 --- a/project.xml +++ b/project.xml @@ -96,8 +96,6 @@ - - diff --git a/source/funkin/backend/FunkinSprite.hx b/source/funkin/backend/FunkinSprite.hx index 53e87114..ec8183ce 100644 --- a/source/funkin/backend/FunkinSprite.hx +++ b/source/funkin/backend/FunkinSprite.hx @@ -13,8 +13,7 @@ import flixel.math.FlxRect; import flixel.math.FlxPoint; import funkin.backend.system.interfaces.IBeatReceiver; -@:enum -abstract XMLAnimType(Int) +enum abstract XMLAnimType(Int) { var NONE = 0; var BEAT = 1; diff --git a/source/funkin/backend/scripting/HScript.hx b/source/funkin/backend/scripting/HScript.hx index be108c5f..37aaaa95 100644 --- a/source/funkin/backend/scripting/HScript.hx +++ b/source/funkin/backend/scripting/HScript.hx @@ -45,7 +45,9 @@ class HScript extends Script { this.trace(v); })); + #if GLOBAL_SCRIPT funkin.backend.scripting.GlobalScript.call("onScriptCreated", [this, "hscript"]); + #end loadFromString(code); } diff --git a/source/funkin/backend/scripting/events/PlayAnimEvent.hx b/source/funkin/backend/scripting/events/PlayAnimEvent.hx index 7d5499ba..ca88c408 100644 --- a/source/funkin/backend/scripting/events/PlayAnimEvent.hx +++ b/source/funkin/backend/scripting/events/PlayAnimEvent.hx @@ -30,8 +30,7 @@ final class PlayAnimEvent extends CancellableEvent { /** Contains all contexts possible for `PlayAnimEvent`. **/ -@:enum -abstract PlayAnimContext(String) { +enum abstract PlayAnimContext(String) { /** No context was given for the animation. The character won't dance until the animation is finished diff --git a/source/funkin/backend/system/ErrorCode.hx b/source/funkin/backend/system/ErrorCode.hx index 9959df82..c1121c0e 100644 --- a/source/funkin/backend/system/ErrorCode.hx +++ b/source/funkin/backend/system/ErrorCode.hx @@ -1,7 +1,6 @@ package funkin.backend.system; -@:enum -abstract ErrorCode(Int) { +enum abstract ErrorCode(Int) { var OK = 0; var FAILED = 1; var MISSING_PROPERTY = 2; diff --git a/source/funkin/backend/system/github/GitHubUser.hx b/source/funkin/backend/system/github/GitHubUser.hx index 4f817891..e0dc15bc 100644 --- a/source/funkin/backend/system/github/GitHubUser.hx +++ b/source/funkin/backend/system/github/GitHubUser.hx @@ -125,8 +125,7 @@ typedef GitHubUser = { var updated_at:String; } -@:enum -abstract GitHubUserType(String) { +enum abstract GitHubUserType(String) { var USER = "User"; var ORGANIZATION = "Organization"; } \ No newline at end of file diff --git a/source/funkin/backend/system/updating/AsyncUpdater.hx b/source/funkin/backend/system/updating/AsyncUpdater.hx index ce119a5a..52b59766 100644 --- a/source/funkin/backend/system/updating/AsyncUpdater.hx +++ b/source/funkin/backend/system/updating/AsyncUpdater.hx @@ -185,8 +185,7 @@ class UpdaterProgress { public function new() {} } -@:enum -abstract UpdaterStep(Int) { +enum abstract UpdaterStep(Int) { var PREPARING = 0; var DOWNLOADING_ASSETS = 1; var DOWNLOADING_EXECUTABLE = 2; diff --git a/source/funkin/menus/FreeplayState.hx b/source/funkin/menus/FreeplayState.hx index b2531268..d2255266 100644 --- a/source/funkin/menus/FreeplayState.hx +++ b/source/funkin/menus/FreeplayState.hx @@ -411,17 +411,14 @@ class FreeplayState extends MusicBeatState var event = event("onUpdateOptionsAlpha", EventManager.get(FreeplayAlphaUpdateEvent).recycle(0.6, 0.45, 1, 1, 0.25)); if (event.cancelled) return; - var bullShit:Int = 0; - for (i in 0...iconArray.length) iconArray[i].alpha = lerp(iconArray[i].alpha, #if PRELOAD_ALL songInstPlaying ? event.idlePlayingAlpha : #end event.idleAlpha, event.lerp); iconArray[curSelected].alpha = #if PRELOAD_ALL songInstPlaying ? event.selectedPlayingAlpha : #end event.selectedAlpha; - for (item in grpSongs.members) + for (i=>item in grpSongs.members) { - item.targetY = bullShit - curSelected; - bullShit++; + item.targetY = i - curSelected; item.alpha = lerp(item.alpha, #if PRELOAD_ALL songInstPlaying ? event.idlePlayingAlpha : #end event.idleAlpha, event.lerp); diff --git a/source/funkin/menus/PauseSubState.hx b/source/funkin/menus/PauseSubState.hx index 2fe5e85a..f8136744 100644 --- a/source/funkin/menus/PauseSubState.hx +++ b/source/funkin/menus/PauseSubState.hx @@ -194,12 +194,9 @@ class PauseSubState extends MusicBeatSubstate curSelected = event.value; - var bullShit:Int = 0; - - for (item in grpMenuShit.members) + for (i=>item in grpMenuShit.members) { - item.targetY = bullShit - curSelected; - bullShit++; + item.targetY = i - curSelected; if (item.targetY == 0) item.alpha = 1; diff --git a/source/lime/_internal/backend/native/NativeWindow.hx b/source/lime/_internal/backend/native/NativeWindow.hx index 76fab152..9b564955 100644 --- a/source/lime/_internal/backend/native/NativeWindow.hx +++ b/source/lime/_internal/backend/native/NativeWindow.hx @@ -727,7 +727,7 @@ class NativeWindow } } -@:enum private abstract MouseCursorType(Int) from Int to Int +enum abstract MouseCursorType(Int) from Int to Int { var HIDDEN = 0; var ARROW = 1; @@ -744,7 +744,7 @@ class NativeWindow var WAIT_ARROW = 12; } -@:enum private abstract WindowFlags(Int) +enum abstract WindowFlags(Int) { var WINDOW_FLAG_FULLSCREEN = 0x00000001; var WINDOW_FLAG_BORDERLESS = 0x00000002; diff --git a/source/lime/system/System.hx b/source/lime/system/System.hx index c269456f..566e4c1d 100644 --- a/source/lime/system/System.hx +++ b/source/lime/system/System.hx @@ -824,7 +824,7 @@ class System } } -@:enum private abstract SystemDirectory(Int) from Int to Int from UInt to UInt +enum abstract SystemDirectory(Int) from Int to Int from UInt to UInt { var APPLICATION = 0; var APPLICATION_STORAGE = 1;