From c1f2cc2400dc5f1c0cd3331d4be6b8f969bf224b Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sat, 26 Mar 2011 11:59:48 -0500 Subject: [PATCH] [br:warps] Fix compile by easing scope --- src/TimingData.cpp | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/TimingData.cpp b/src/TimingData.cpp index 00da97017b..1ddb2d6ad1 100644 --- a/src/TimingData.cpp +++ b/src/TimingData.cpp @@ -547,19 +547,21 @@ void TimingData::GetBeatAndBPSFromElapsedTimeNoOffset( float fElapsedTime, float itBPMS ++; break; 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; - bDelayOut = bIsDelay; - fBeatOut = NoteRowToBeat( itSS->m_iStartRow ); - fBPSOut = fBPS; - return; + fTimeToNextEvent = itSS->m_fStopSeconds; + fNextEventTime = fLastTime + fTimeToNextEvent; + const bool bIsDelay = itSS->m_bDelay; + if ( fElapsedTime < fNextEventTime ) + { + bFreezeOut = !bIsDelay; + bDelayOut = bIsDelay; + fBeatOut = NoteRowToBeat( itSS->m_iStartRow ); + fBPSOut = fBPS; + return; + } + fLastTime = fNextEventTime; + itSS ++; } - fLastTime = fNextEventTime; - itSS ++; break; case FOUND_WARP: bIsWarping = true;