From c9f907c92fb114470e8c455ff0a7b4e37972cebf Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Mon, 23 Dec 2024 20:28:15 -0500 Subject: [PATCH] lololo idk what to put here --- source/PlayState.hx | 2 +- source/StrumNote.hx | 5 +---- source/editors/ChartingState.hx | 7 +------ 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 2b99a65ecb2..94595e574b1 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -4530,7 +4530,7 @@ class PlayState extends MusicBeatState if ((i.player == 0 ? dadNoteskin : bfNoteskin) != null) { i.updateNoteSkin(i.player == 0 ? dadNoteskin : bfNoteskin); - i.useRGBShader = false; + i.useRGBShader = (i.player == 0 ? dadNoteskin : bfNoteskin).length < 1; } } if (ClientPrefs.noteColorStyle == 'Char-Based') diff --git a/source/StrumNote.hx b/source/StrumNote.hx index 60a8b01f2f7..be227ea8e34 100644 --- a/source/StrumNote.hx +++ b/source/StrumNote.hx @@ -184,10 +184,7 @@ class StrumNote extends FlxSprite public function updateNoteSkin(noteskin:String) { if (texture == "noteskins/" + noteskin || noteskin == ogNoteskin || texture == noteskin) return; //if the noteskin to change to is the same as before then don't update it if (noteskin != null && noteskin.length > 0) texture = "noteskins/" + noteskin; - else { - texture = "noteskins/NOTE_assets" + Note.getNoteSkinPostfix(); - useRGBShader = true; - } + else texture = "noteskins/NOTE_assets" + Note.getNoteSkinPostfix(); } public function updateRGBColors(?r:FlxColor, ?g:FlxColor, ?b:FlxColor) { if (rgbShader != null) diff --git a/source/editors/ChartingState.hx b/source/editors/ChartingState.hx index aa8dc537754..534371b319d 100644 --- a/source/editors/ChartingState.hx +++ b/source/editors/ChartingState.hx @@ -4363,15 +4363,10 @@ class ChartingState extends MusicBeatState Paths.splashConfigs.clear(); Paths.splashAnimCountMap.clear(); Note.globalRgbShaders = []; + FlxG.autoPause = ClientPrefs.autoPause; super.destroy(); } - - override function startOutro(onOutroComplete:()->Void):Void - { - FlxG.autoPause = ClientPrefs.autoPause; - onOutroComplete(); - } } class AttachedFlxText extends FlxText