ksfdm |D| tag wasn't working because of me... sorry
This commit is contained in:
@@ -573,21 +573,25 @@ static bool LoadGlobalData( const RString &sPath, Song &out, bool &bKIUCompliant
|
||||
}
|
||||
else if (BeginsWith(NoteRowString, "|B"))
|
||||
{
|
||||
out.m_Timing.AddBPMSegment( BPMSegment( BeatToNoteRow(fCurBeat), (float)numTemp ) );
|
||||
//out.m_Timing.AddBPMSegment( BPMSegment( BeatToNoteRow(fCurBeat), (float)numTemp ) );
|
||||
out.m_Timing.SetBPMAtBeat( (float)numTemp, fCurBeat );
|
||||
continue;
|
||||
}
|
||||
else if (BeginsWith(NoteRowString, "|E"))
|
||||
{
|
||||
//Finally! the |E| tag is working as it should. I can die happy now -DaisuMaster
|
||||
bool bDelay = true;
|
||||
float fCurDelay = 60 / out.m_Timing.GetBPMAtBeat(fCurBeat) * (float)numTemp / iTickCount;
|
||||
out.m_Timing.AddStopSegment( StopSegment( BeatToNoteRow(fCurBeat), fCurDelay, true ) );
|
||||
fCurDelay += out.m_Timing.GetStopAtRow(BeatToNoteRow(fCurBeat), bDelay);
|
||||
out.m_Timing.SetStopAtBeat( fCurBeat, fCurDelay, true );
|
||||
continue;
|
||||
}
|
||||
else if (BeginsWith(NoteRowString, "|D"))
|
||||
{
|
||||
bool bDelay = true;
|
||||
float fCurDelay = out.m_Timing.GetStopAtRow(i, bDelay);
|
||||
out.m_Timing.AddStopSegment( StopSegment( BeatToNoteRow(fCurBeat), fCurDelay, true ) );
|
||||
float fCurDelay = out.m_Timing.GetStopAtRow(BeatToNoteRow(fCurBeat), bDelay);
|
||||
fCurDelay += (float)numTemp / 1000;
|
||||
out.m_Timing.SetStopAtBeat( fCurBeat, fCurDelay, true );
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -87,14 +87,14 @@ void TimingData::SetStopAtRow( int iRow, float fSeconds, bool bDelay )
|
||||
if( i == m_StopSegments.size() ) // there is no BPMSegment at the current beat
|
||||
{
|
||||
// create a new StopSegment
|
||||
if( fSeconds > 0 )
|
||||
if( fSeconds > 0 || PREFSMAN->m_bQuirksMode )
|
||||
{
|
||||
AddStopSegment( StopSegment(iRow, fSeconds, bDelay) );
|
||||
}
|
||||
}
|
||||
else // StopSegment being modified is m_StopSegments[i]
|
||||
{
|
||||
if( fSeconds > 0 )
|
||||
if( fSeconds > 0 || PREFSMAN->m_bQuirksMode )
|
||||
{
|
||||
m_StopSegments[i].m_fStopSeconds = fSeconds;
|
||||
//m_StopSegments[i].m_bDelay = bDelay; // use this?
|
||||
|
||||
Reference in New Issue
Block a user