Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix infinite loop generating beatlines in 1/x time signatures #450

Merged
merged 1 commit into from
Jun 9, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Assets/Script/Chart/BeatHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ public void GenerateBeats() {
}
}

// Last beat should never be a strong beat if denominator is bigger than 4.
if (currentBeatInMeasure == currentTS.numerator - 1 && currentTS.denominator > 4) {
// Last beat of measure should never be a strong beat if denominator is bigger than 4.
if (currentBeatInMeasure == currentTS.numerator - 1 && currentTS.denominator > 4 && currentTick < lastTick + forwardStep) {
style = BeatStyle.WEAK;
}

Expand Down Expand Up @@ -142,7 +142,7 @@ public static uint GetLastTick(this MoonSong song)
{
foreach (var songObject in chart.chartObjects) {
if (songObject.tick <= lastTick) continue;

lastTick = songObject.tick;

if (songObject is MoonNote note)
Expand Down