From 6db40f034aa5f671e5223f92dcb43719002c7cbc Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 15 May 2011 16:07:18 -0400 Subject: [PATCH] [splittiming] Core lines set for #SPEEDS. Let's see how badly this breaks. --- src/ArrowEffects.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ArrowEffects.cpp b/src/ArrowEffects.cpp index e6f3831849..15ea4eb0c0 100644 --- a/src/ArrowEffects.cpp +++ b/src/ArrowEffects.cpp @@ -230,7 +230,8 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float float fSongBeat = position.m_fSongBeatVisible; float fBeatsUntilStep = fNoteBeat - fSongBeat; float fYOffsetBeatSpacing = fBeatsUntilStep; - fYOffset += fYOffsetBeatSpacing * (1-pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing); + fYOffset += GAMESTATE->m_pCurSteps[pPlayerState->m_PlayerNumber]->m_Timing.GetSpeedPercentAtBeat( fNoteBeat ) * + fYOffsetBeatSpacing * (1-pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing); } if( pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing != 0.0f ) @@ -241,7 +242,8 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float float fBPM = pPlayerState->m_PlayerOptions.GetCurrent().m_fScrollBPM; float fBPS = fBPM/60.f; float fYOffsetTimeSpacing = fSecondsUntilStep * fBPS; - fYOffset += fYOffsetTimeSpacing * pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing; + fYOffset += GAMESTATE->m_pCurSteps[pPlayerState->m_PlayerNumber]->m_Timing.GetSpeedPercentAtBeat( fNoteBeat ) * + fYOffsetTimeSpacing * pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing; } // TODO: If we allow noteskins to have metricable row spacing