actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

If a song has any time signatures defined, but doesn't include for for beat 0, add one.

Browse Source 
(Fixes a crash that can occur with some songs if functions like TimingData::NoteRowToMeasureAndBeat are called for rows that don't have a time signature defined)
This commit is contained in:
Michael Votaw
2024-02-08 01:35:06 -08:00
committed by teejusb
parent 5aed630a41
commit eeb2528612
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderSM.cpp
+15 -1
View File
@@ -772,6 +772,7 @@ void SMLoader::ProcessDelays( TimingData &out, const RString line, const int row
void SMLoader::ProcessTimeSignatures( TimingData &out, const RString line, const int rowsPerBeat ) void SMLoader::ProcessTimeSignatures( TimingData &out, const RString line, const int rowsPerBeat )
{ {
std::vector<RString> vs1; std::vector<RString> vs1;
std::vector<TimeSignatureSegment> segments;
split( line, ",", vs1 ); split( line, ",", vs1 );
for (RString const &s1 : vs1) for (RString const &s1 : vs1)
@@ -818,8 +819,21 @@ void SMLoader::ProcessTimeSignatures( TimingData &out, const RString line, const
fBeat, iDenominator ); fBeat, iDenominator );
continue; continue;
} }
segments.push_back( TimeSignatureSegment(BeatToNoteRow(fBeat), iNumerator, iDenominator) );
}
out.AddSegment( TimeSignatureSegment(BeatToNoteRow(fBeat), iNumerator, iDenominator) ); // If there are any time signatures defined, but there isn't one
// for the very first beat of the song, then add one.
// Without it, calls to functions like TimingData::NoteRowToMeasureAndBeat
// can fail for charts that are otherwise valid.
if ( segments.size() > 0 && segments[0].GetRow() > 0 )
{
out.AddSegment( TimeSignatureSegment(0, 4, 4) );
}
for( TimeSignatureSegment segment: segments )
{
out.AddSegment( segment );
} }
} }