the j

Joalor64GH · May 31, 2024 · a8cc8b9 · a8cc8b9
1 parent 004fc05
commit a8cc8b9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 21 deletions.
diff --git a/compileData/haxelibs.json b/compileData/haxelibs.json
@@ -11,8 +11,7 @@
       },
       {
         "name": "flixel",
-        "type": "haxelib",
-        "version": "5.5.0"
+        "type": "haxelib"
       },
       {
         "name": "flixel-addons",

diff --git a/source/meta/data/ClientPrefs.hx b/source/meta/data/ClientPrefs.hx
@@ -7,7 +7,6 @@ class ClientPrefs {
 	public static var middleScroll:Bool = false;
 	public static var opponentStrums:Bool = true;
 	public static var showFPS:Bool = true;
-	public static var fpsRainbow:Bool = false;
 	public static var flashing:Bool = true;
 	public static var globalAntialiasing:Bool = true;
 	public static var noteSplashes:Bool = true;
@@ -112,7 +111,6 @@ class ClientPrefs {
 		FlxG.save.data.middleScroll = middleScroll;
 		FlxG.save.data.opponentStrums = opponentStrums;
 		FlxG.save.data.showFPS = showFPS;
-		FlxG.save.data.fpsRainbow = fpsRainbow;
 		FlxG.save.data.flashing = flashing;
 		FlxG.save.data.globalAntialiasing = globalAntialiasing;
 		FlxG.save.data.noteSplashes = noteSplashes;
@@ -180,9 +178,6 @@ class ClientPrefs {
 				Main.fpsVar.visible = showFPS;
 			}
 		}
-		if(FlxG.save.data.fpsRainbow != null) {
-			fpsRainbow = FlxG.save.data.fpsRainbow;
-		}
 		if(FlxG.save.data.flashing != null) {
 			flashing = FlxG.save.data.flashing;
 		}

diff --git a/source/meta/data/options/OptionsSubState.hx b/source/meta/data/options/OptionsSubState.hx
@@ -1436,13 +1436,6 @@ class VisualsSubState extends BaseOptionsMenu
 			'bool',
 			true);
 		addOption(option);
-
-		var option:Option = new Option('Rainbow FPS',
-		'If checked, makes the FPS have a chroma effect.',
-		'fpsRainbow',
-		'bool',
-		false);
-		addOption(option);
 
 		var option:Option = new Option('FPS Counter',
 			'If unchecked, hides FPS Counter.',
@@ -1459,7 +1452,7 @@ class VisualsSubState extends BaseOptionsMenu
 			'None',
 			['None', 'Deuteranopia', 'Protanopia', 'Tritanopia']);
 		addOption(option);
-		option.onChange = () -> meta.Colorblind.updateFilter();
+		option.onChange = () -> Colorblind.updateFilter();
 
 		var option:Option = new Option('Simple Main Menu',
 			'Just a simple version of the Main Menu for low-end users.',

diff --git a/source/meta/state/PlayState.hx b/source/meta/state/PlayState.hx
@@ -1849,8 +1849,8 @@ class PlayState extends MusicBeatState
 			FlxG.sound.music.pitch = value;
 		}
 		playbackRate = value;
-		FlxG.animationTimeScale = value;
-		trace('Anim speed: ' + FlxG.animationTimeScale);
+		FlxG.timeScale = value;
+		trace('Anim speed: ' + FlxG.timeScale);
 		Conductor.safeZoneOffset = (ClientPrefs.safeFrames / 60) * 1000 * value;
 		setOnLuas('playbackRate', playbackRate);
 		return value;
@@ -4080,7 +4080,7 @@ class PlayState extends MusicBeatState
 		{
 			var ret:Dynamic = callOnLuas('onGameOver', [], false);
 			if(ret != FunkinLua.Function_Stop) {
-				FlxG.animationTimeScale = 1;
+				FlxG.timeScale = 1;
 				boyfriend.stunned = true;
 				deathCounter++;
 
@@ -5810,6 +5810,8 @@ class PlayState extends MusicBeatState
 	}
 
 	override function destroy() {
+		instance = null;
+
 		for (lua in luaArray) {
 			lua.call('onDestroy', []);
 			lua.stop();
@@ -5833,12 +5835,10 @@ class PlayState extends MusicBeatState
 		FlxG.stage.removeEventListener(KeyboardEvent.KEY_DOWN, onKeyPress);
 		FlxG.stage.removeEventListener(KeyboardEvent.KEY_UP, onKeyRelease);
 
-		FlxG.animationTimeScale = 1;
+		FlxG.timeScale = 1;
 		#if FLX_PITCH FlxG.sound.music.pitch = 1; #end
 
 		super.destroy();
-
-		instance = null;
 	}
 
 	public static function cancelMusicFadeTween() {