Fix stuff

This commit is contained in:
NeeEoo
2024-03-01 02:43:42 +01:00
parent e05f0e6f3a
commit 1cdb7fe2f6
11 changed files with 14 additions and 25 deletions
-2
View File
@@ -96,8 +96,6 @@
<!-- _________________________________ Engine Settings _______________________________ --> <!-- _________________________________ Engine Settings _______________________________ -->
<!-- Comment this out to disable multiple windows for editors !-->
<define name="ALLOW_MULTITASKING" />
<define name="openfl_dpi_aware" /> <define name="openfl_dpi_aware" />
<!-- Comment this out to disable updates !--> <!-- Comment this out to disable updates !-->
+1 -2
View File
@@ -13,8 +13,7 @@ import flixel.math.FlxRect;
import flixel.math.FlxPoint; import flixel.math.FlxPoint;
import funkin.backend.system.interfaces.IBeatReceiver; import funkin.backend.system.interfaces.IBeatReceiver;
@:enum enum abstract XMLAnimType(Int)
abstract XMLAnimType(Int)
{ {
var NONE = 0; var NONE = 0;
var BEAT = 1; var BEAT = 1;
@@ -45,7 +45,9 @@ class HScript extends Script {
this.trace(v); this.trace(v);
})); }));
#if GLOBAL_SCRIPT
funkin.backend.scripting.GlobalScript.call("onScriptCreated", [this, "hscript"]); funkin.backend.scripting.GlobalScript.call("onScriptCreated", [this, "hscript"]);
#end
loadFromString(code); loadFromString(code);
} }
@@ -30,8 +30,7 @@ final class PlayAnimEvent extends CancellableEvent {
/** /**
Contains all contexts possible for `PlayAnimEvent`. Contains all contexts possible for `PlayAnimEvent`.
**/ **/
@:enum enum abstract PlayAnimContext(String) {
abstract PlayAnimContext(String) {
/** /**
No context was given for the animation. No context was given for the animation.
The character won't dance until the animation is finished The character won't dance until the animation is finished
+1 -2
View File
@@ -1,7 +1,6 @@
package funkin.backend.system; package funkin.backend.system;
@:enum enum abstract ErrorCode(Int) {
abstract ErrorCode(Int) {
var OK = 0; var OK = 0;
var FAILED = 1; var FAILED = 1;
var MISSING_PROPERTY = 2; var MISSING_PROPERTY = 2;
@@ -125,8 +125,7 @@ typedef GitHubUser = {
var updated_at:String; var updated_at:String;
} }
@:enum enum abstract GitHubUserType(String) {
abstract GitHubUserType(String) {
var USER = "User"; var USER = "User";
var ORGANIZATION = "Organization"; var ORGANIZATION = "Organization";
} }
@@ -185,8 +185,7 @@ class UpdaterProgress {
public function new() {} public function new() {}
} }
@:enum enum abstract UpdaterStep(Int) {
abstract UpdaterStep(Int) {
var PREPARING = 0; var PREPARING = 0;
var DOWNLOADING_ASSETS = 1; var DOWNLOADING_ASSETS = 1;
var DOWNLOADING_EXECUTABLE = 2; var DOWNLOADING_EXECUTABLE = 2;
+2 -5
View File
@@ -411,17 +411,14 @@ class FreeplayState extends MusicBeatState
var event = event("onUpdateOptionsAlpha", EventManager.get(FreeplayAlphaUpdateEvent).recycle(0.6, 0.45, 1, 1, 0.25)); var event = event("onUpdateOptionsAlpha", EventManager.get(FreeplayAlphaUpdateEvent).recycle(0.6, 0.45, 1, 1, 0.25));
if (event.cancelled) return; if (event.cancelled) return;
var bullShit:Int = 0;
for (i in 0...iconArray.length) 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[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; 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; item.targetY = i - curSelected;
bullShit++;
item.alpha = lerp(item.alpha, #if PRELOAD_ALL songInstPlaying ? event.idlePlayingAlpha : #end event.idleAlpha, event.lerp); item.alpha = lerp(item.alpha, #if PRELOAD_ALL songInstPlaying ? event.idlePlayingAlpha : #end event.idleAlpha, event.lerp);
+2 -5
View File
@@ -194,12 +194,9 @@ class PauseSubState extends MusicBeatSubstate
curSelected = event.value; curSelected = event.value;
var bullShit:Int = 0; for (i=>item in grpMenuShit.members)
for (item in grpMenuShit.members)
{ {
item.targetY = bullShit - curSelected; item.targetY = i - curSelected;
bullShit++;
if (item.targetY == 0) if (item.targetY == 0)
item.alpha = 1; item.alpha = 1;
@@ -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 HIDDEN = 0;
var ARROW = 1; var ARROW = 1;
@@ -744,7 +744,7 @@ class NativeWindow
var WAIT_ARROW = 12; var WAIT_ARROW = 12;
} }
@:enum private abstract WindowFlags(Int) enum abstract WindowFlags(Int)
{ {
var WINDOW_FLAG_FULLSCREEN = 0x00000001; var WINDOW_FLAG_FULLSCREEN = 0x00000001;
var WINDOW_FLAG_BORDERLESS = 0x00000002; var WINDOW_FLAG_BORDERLESS = 0x00000002;
+1 -1
View File
@@ -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 = 0;
var APPLICATION_STORAGE = 1; var APPLICATION_STORAGE = 1;