From a50a014de3bfef208d0147c5797518efcfb2925f Mon Sep 17 00:00:00 2001 From: Lasercar Date: Thu, 20 Feb 2025 16:32:02 +1000 Subject: [PATCH] Whoops, didn't save and load the stuff properly --- .../ui/debug/charting/ChartEditorState.hx | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx index 0893a18e8..2336d5c5c 100644 --- a/source/funkin/ui/debug/charting/ChartEditorState.hx +++ b/source/funkin/ui/debug/charting/ChartEditorState.hx @@ -2295,10 +2295,10 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState hitsoundVolumeOpponent = save.chartEditorHitsoundVolumeOpponent; this.welcomeMusic.active = save.chartEditorThemeMusic; - menubarItemVolumeInstrumental.value = save.chartEditorInstVolume; - menubarItemVolumeVocalsPlayer.value = save.chartEditorPlayerVoiceVolume; - menubarItemVolumeVocalsOpponent.value = save.chartEditorOpponentVoiceVolume; - menubarItemPlaybackSpeed.value = save.chartEditorPlaybackSpeed; + menubarItemVolumeInstrumental.value = Std.int(save.chartEditorInstVolume * 100); + menubarItemVolumeVocalsPlayer.value = Std.int(save.chartEditorPlayerVoiceVolume * 100); + menubarItemVolumeVocalsOpponent.value = Std.int(save.chartEditorOpponentVoiceVolume * 100); + menubarItemPlaybackSpeed.value = Std.int(save.chartEditorPlaybackSpeed * 100); } public function writePreferences(hasBackup:Bool):Void @@ -2324,10 +2324,10 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState save.chartEditorHitsoundVolumeOpponent = hitsoundVolumeOpponent; save.chartEditorThemeMusic = this.welcomeMusic.active; - save.chartEditorInstVolume = menubarItemVolumeInstrumental.value; - save.chartEditorPlayerVoiceVolume = menubarItemVolumeVocalsPlayer.value; - save.chartEditorOpponentVoiceVolume = menubarItemVolumeVocalsOpponent.value; - save.chartEditorPlaybackSpeed = menubarItemPlaybackSpeed.value; + save.chartEditorInstVolume = menubarItemVolumeInstrumental.value / 100.0; + save.chartEditorPlayerVoiceVolume = menubarItemVolumeVocalsPlayer.value / 100.0; + save.chartEditorOpponentVoiceVolume = menubarItemVolumeVocalsOpponent.value / 100.0; + save.chartEditorPlaybackSpeed = menubarItemPlaybackSpeed.value / 100.0; } public function populateOpenRecentMenu():Void @@ -6193,9 +6193,9 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState fadeInWelcomeMusic(WELCOME_MUSIC_FADE_IN_DELAY, WELCOME_MUSIC_FADE_IN_DURATION); // Reapply the volume. - var instTargetVolume:Float = menubarItemVolumeInstrumental.value ?? 1.0; - var vocalPlayerTargetVolume:Float = menubarItemVolumeVocalsPlayer.value ?? 1.0; - var vocalOpponentTargetVolume:Float = menubarItemVolumeVocalsOpponent.value ?? 1.0; + var instTargetVolume:Float = menubarItemVolumeInstrumental.value / 100.0 ?? 1.0; + var vocalPlayerTargetVolume:Float = menubarItemVolumeVocalsPlayer.value / 100.0 ?? 1.0; + var vocalOpponentTargetVolume:Float = menubarItemVolumeVocalsOpponent.value / 100.0 ?? 1.0; if (audioInstTrack != null) {