From 5cca5aa4dd9c1fc30826aea9b4060a4b2f598a69 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 7 Mar 2007 03:01:23 +0000 Subject: [PATCH] pull out basic multiplier --- stepmania/src/ArrowEffects.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ArrowEffects.cpp b/stepmania/src/ArrowEffects.cpp index ddf168216c..2ec718b997 100644 --- a/stepmania/src/ArrowEffects.cpp +++ b/stepmania/src/ArrowEffects.cpp @@ -184,7 +184,7 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float { float fSongBeat = GAMESTATE->m_fSongBeat; float fBeatsUntilStep = fNoteBeat - fSongBeat; - float fYOffsetBeatSpacing = fBeatsUntilStep * ARROW_SPACING; + float fYOffsetBeatSpacing = fBeatsUntilStep; fYOffset += fYOffsetBeatSpacing * (1-pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing); } @@ -195,10 +195,12 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float float fSecondsUntilStep = fNoteSeconds - fSongSeconds; float fBPM = pPlayerState->m_PlayerOptions.GetCurrent().m_fScrollBPM; float fBPS = fBPM/60.f; - float fYOffsetTimeSpacing = fSecondsUntilStep * fBPS * ARROW_SPACING; + float fYOffsetTimeSpacing = fSecondsUntilStep * fBPS; fYOffset += fYOffsetTimeSpacing * pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing; } + fYOffset *= ARROW_SPACING; + // don't mess with the arrows after they've crossed 0 if( fYOffset < 0 ) return fYOffset * pPlayerState->m_PlayerOptions.GetCurrent().m_fScrollSpeed;