mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-11-10 00:34:40 +00:00
Fix a bug where duplicate notes would get placed at the beginning
This commit is contained in:
parent
86c91d1e82
commit
7c04630bb7
|
@ -295,6 +295,11 @@ class Strumline extends FlxSpriteGroup
|
||||||
{
|
{
|
||||||
if (noteData.length == 0) return;
|
if (noteData.length == 0) return;
|
||||||
|
|
||||||
|
// Ensure note data gets reset if the song happens to loop.
|
||||||
|
// NOTE: I had to remove this line because it was causing notes visible during the countdown to be placed multiple times.
|
||||||
|
// I don't remember what bug I was trying to fix by adding this.
|
||||||
|
// if (conductorInUse.currentStep == 0) nextNoteIndex = 0;
|
||||||
|
|
||||||
var songStart:Float = PlayState.instance?.startTimestamp ?? 0.0;
|
var songStart:Float = PlayState.instance?.startTimestamp ?? 0.0;
|
||||||
var hitWindowStart:Float = Conductor.instance.songPosition - Constants.HIT_WINDOW_MS;
|
var hitWindowStart:Float = Conductor.instance.songPosition - Constants.HIT_WINDOW_MS;
|
||||||
var renderWindowStart:Float = Conductor.instance.songPosition + RENDER_DISTANCE_MS;
|
var renderWindowStart:Float = Conductor.instance.songPosition + RENDER_DISTANCE_MS;
|
||||||
|
|
|
@ -210,7 +210,8 @@ class LoadingState extends MusicBeatState
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load and cache the song's charts.
|
// Load and cache the song's charts.
|
||||||
if (params?.targetSong != null)
|
// Don't do this if we already provided the music and charts.
|
||||||
|
if (params?.targetSong != null && !params.overrideMusic)
|
||||||
{
|
{
|
||||||
params.targetSong.cacheCharts(true);
|
params.targetSong.cacheCharts(true);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue