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

[br:warps] Fix compile by easing scope

Browse Source
This commit is contained in:
AJ Kelly
2011-03-26 11:59:48 -05:00
parent d44f42968d
commit c1f2cc2400
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingData.cpp
+13 -11
View File
@@ -547,19 +547,21 @@ void TimingData::GetBeatAndBPSFromElapsedTimeNoOffset( float fElapsedTime, float
itBPMS ++; itBPMS ++;
break; break;
case FOUND_STOP: // TODO: update for Delays. case FOUND_STOP: // TODO: update for Delays.
fTimeToNextEvent = itSS->m_fStopSeconds;
fNextEventTime = fLastTime + fTimeToNextEvent;
const bool bIsDelay = itSS->m_bDelay;
if ( fElapsedTime < fNextEventTime )
{ {
bFreezeOut = !bIsDelay; fTimeToNextEvent = itSS->m_fStopSeconds;
bDelayOut = bIsDelay; fNextEventTime = fLastTime + fTimeToNextEvent;
fBeatOut = NoteRowToBeat( itSS->m_iStartRow ); const bool bIsDelay = itSS->m_bDelay;
fBPSOut = fBPS; if ( fElapsedTime < fNextEventTime )
return; {
bFreezeOut = !bIsDelay;
bDelayOut = bIsDelay;
fBeatOut = NoteRowToBeat( itSS->m_iStartRow );
fBPSOut = fBPS;
return;
}
fLastTime = fNextEventTime;
itSS ++;
} }
fLastTime = fNextEventTime;
itSS ++;
break; break;
case FOUND_WARP: case FOUND_WARP:
bIsWarping = true; bIsWarping = true;