From 8f35c048b8d82041cc08caa402f514fcd1d57675 Mon Sep 17 00:00:00 2001 From: Thai Pangsakulyanont Date: Wed, 25 May 2011 23:48:34 +0700 Subject: [PATCH] [scroll] mergefix --- src/ArrowEffects.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ArrowEffects.cpp b/src/ArrowEffects.cpp index b295d67157..fb8da38fb5 100644 --- a/src/ArrowEffects.cpp +++ b/src/ArrowEffects.cpp @@ -236,7 +236,7 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float if( bShowEffects ) fBeatsUntilStep = pCurSteps->m_Timing.GetDisplayedBeat(fNoteBeat) - pCurSteps->m_Timing.GetDisplayedBeat(fSongBeat); float fYOffsetBeatSpacing = fBeatsUntilStep; - float fSpeedMultiplier = bShowEffects ? GetSpeedMultiplier( position.m_fSongBeatVisible, position.m_fMusicSecondsVisible, pCurSteps->m_Timing ) : 1.0; + float fSpeedMultiplier = bShowEffects ? pCurSteps->m_Timing.GetDisplayedSpeedPercent( position.m_fSongBeatVisible, position.m_fMusicSecondsVisible ) : 1.0; fYOffset += fSpeedMultiplier * fYOffsetBeatSpacing * (1-pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing); }