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

[notesLoaderSMA] Deal with the r.

Browse Source
This commit is contained in:
Jason Felds
2011-03-15 17:40:41 -04:00
parent e7bc27ac2d
commit 58c23a17dd
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderSMA.cpp
+26 -2
View File
@@ -162,7 +162,19 @@ void SMALoader::LoadTimingFromSMAFile( const MsdFile &msd, TimingData &out )
continue; continue;
} }
const float fFreezeBeat = StringToFloat( arrayFreezeValues[0] ); float fFreezeBeat = 0;
RString beat = arrayFreezeValues[0];
if( beat.Right(0).MakeUpper() == "R" )
{
beat = beat.Left(beat.size()-1);
fFreezeBeat = StringToFloat( beat ) / rowsPerMeasure;
}
else
{
fFreezeBeat = StringToFloat(beat);
}
//float fFreezeBeat = StringToFloat( arrayBPMChangeValues[0] );
const float fFreezeSeconds = StringToFloat( arrayFreezeValues[1] ); const float fFreezeSeconds = StringToFloat( arrayFreezeValues[1] );
StopSegment new_seg( BeatToNoteRow(fFreezeBeat), fFreezeSeconds ); StopSegment new_seg( BeatToNoteRow(fFreezeBeat), fFreezeSeconds );
// XXX: Remove Negatives Bug? // XXX: Remove Negatives Bug?
@@ -205,7 +217,19 @@ void SMALoader::LoadTimingFromSMAFile( const MsdFile &msd, TimingData &out )
continue; continue;
} }
const float fBeat = StringToFloat( arrayBPMChangeValues[0] ); float fBeat = 0;
RString beat = arrayBPMChangeValues[0];
if( beat.Right(0).MakeUpper() == "R" )
{
beat = beat.Left(beat.size()-1);
fBeat = StringToFloat( beat ) / rowsPerMeasure;
}
else
{
fBeat = StringToFloat(beat);
}
//float fBeat = StringToFloat( arrayBPMChangeValues[0] );
const float fNewBPM = StringToFloat( arrayBPMChangeValues[1] ); const float fNewBPM = StringToFloat( arrayBPMChangeValues[1] );
// XXX: Remove Negatives Bug? // XXX: Remove Negatives Bug?
BPMSegment new_seg; BPMSegment new_seg;