Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-30 03:25:47 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix an issue with Freeplay sorting when leaving an Erect song.

Browse source
This commit is contained in:
EliteMasterEric 2024-04-30 14:36:57 -04:00
parent 2e1cd7024c
commit 11c0249f42
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/funkin/ui/freeplay/FreeplayState.hx
View file

@ -560,6 +560,12 @@ class FreeplayState extends MusicBeatSubState
{ {
var tempSongs:Array<FreeplaySongData> = songs; var tempSongs:Array<FreeplaySongData> = songs;
// Remember just the difficulty because it's important for song sorting.
if (rememberedDifficulty != null)
{
currentDifficulty = rememberedDifficulty;
}
if (filterStuff != null) tempSongs = sortSongs(tempSongs, filterStuff); if (filterStuff != null) tempSongs = sortSongs(tempSongs, filterStuff);
// Filter further by current selected difficulty. // Filter further by current selected difficulty.
@ -579,6 +585,7 @@ class FreeplayState extends MusicBeatSubState
// Only now do we know that the filter is actually changing. // Only now do we know that the filter is actually changing.
// If curSelected is 0, the result will be null and fall back to the rememberedSongId.
rememberedSongId = grpCapsules.members[curSelected]?.songData?.songId ?? rememberedSongId; rememberedSongId = grpCapsules.members[curSelected]?.songData?.songId ?? rememberedSongId;
for (cap in grpCapsules.members) for (cap in grpCapsules.members)
@ -635,7 +642,7 @@ class FreeplayState extends MusicBeatSubState
rememberSelection(); rememberSelection();
changeSelection(); changeSelection();
changeDiff(); changeDiff(0, true);
} }
/** /**
@ -987,7 +994,7 @@ class FreeplayState extends MusicBeatSubState
} }
} }
function changeDiff(change:Int = 0):Void function changeDiff(change:Int = 0, force:Bool = false):Void
{ {
touchTimer = 0; touchTimer = 0;
@ -1047,7 +1054,7 @@ class FreeplayState extends MusicBeatSubState
} }
} }
if (change != 0) if (change != 0 || force)
{ {
// Update the song capsules to reflect the new difficulty info. // Update the song capsules to reflect the new difficulty info.
for (songCapsule in grpCapsules.members) for (songCapsule in grpCapsules.members)