Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2025-05-17 16:21:10 -04:00
Code Issues Projects Releases Packages Wiki Activity

freeplay wrapping fix

Browse source
This commit is contained in:
Cameron Taylor 2023-08-09 03:03:58 -04:00 • committed by EliteMasterEric
parent c3d30f6711
commit 97267d18b9
1 changed files with 15 additions and 5 deletions

20
source/funkin/FreeplayState.hx
View file

@ -944,14 +944,24 @@ class FreeplayState extends MusicBeatSubState
curSelected += change; curSelected += change;
if (curSelected < 0) curSelected = grpCapsules.members.length - 1; if (curSelected < 0) curSelected = grpCapsules.countLiving() - 1;
if (curSelected >= grpCapsules.members.length) curSelected = 0; if (curSelected >= grpCapsules.countLiving()) curSelected = 0;
// selector.y = (70 * curSelected) + 30; // selector.y = (70 * curSelected) + 30;
// intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty); // intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty);
intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty);
intendedCompletion = Highscore.getCompletion(songs[curSelected].songName, curDifficulty); if (songs[curSelected] != null)
{
intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty);
intendedCompletion = Highscore.getCompletion(songs[curSelected].songName, curDifficulty);
}
else
{
intendedScore = 0;
intendedCompletion = 0;
}
// lerpScore = 0; // lerpScore = 0;
#if PRELOAD_ALL #if PRELOAD_ALL
@ -971,7 +981,7 @@ class FreeplayState extends MusicBeatSubState
if (index < curSelected) capsule.targetPos.y -= 100; // another 100 for good measure if (index < curSelected) capsule.targetPos.y -= 100; // another 100 for good measure
} }
if (grpCapsules.members.length > 0) grpCapsules.members[curSelected].selected = true; if (grpCapsules.countLiving() > 0) grpCapsules.members[curSelected].selected = true;
} }
} }