1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-28 04:50:01 +00:00

Merge remote-tracking branch 'origin/master' into feature/scripted-stages

This commit is contained in:
Eric Myllyoja 2022-03-09 10:37:21 -05:00
commit fe109f878f

View file

@ -647,8 +647,8 @@ class ChartingState extends MusicBeatState
if (curBeat % 4 == 0 && curStep >= 16 * (curSection + 1)) if (curBeat % 4 == 0 && curStep >= 16 * (curSection + 1))
{ {
trace(curStep); // trace(curStep);
trace((SongLoad.getSong()[curSection].lengthInSteps) * (curSection + 1)); // trace((SongLoad.getSong()[curSection].lengthInSteps) * (curSection + 1));
trace('DUMBSHIT'); trace('DUMBSHIT');
if (SongLoad.getSong()[curSection + 1] == null) if (SongLoad.getSong()[curSection + 1] == null)
@ -1065,7 +1065,7 @@ class ChartingState extends MusicBeatState
function changeSection(sec:Int = 0, ?updateMusic:Bool = true):Void function changeSection(sec:Int = 0, ?updateMusic:Bool = true):Void
{ {
trace('changing section' + sec); // trace('changing section' + sec);
if (SongLoad.getSong()[sec] != null) if (SongLoad.getSong()[sec] != null)
{ {