From b756386fda3a5860723131897cc524dc50f70b12 Mon Sep 17 00:00:00 2001 From: Kyzentun Date: Tue, 17 Jun 2014 03:14:17 -0600 Subject: [PATCH] Changed GetYOffset to make CMods an MMods compensate for music rate. --- src/ArrowEffects.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ArrowEffects.cpp b/src/ArrowEffects.cpp index 8c99cf9701..0086a3d5db 100644 --- a/src/ArrowEffects.cpp +++ b/src/ArrowEffects.cpp @@ -274,7 +274,7 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float float fNoteSeconds = pCurSteps->GetTimingData()->GetElapsedTimeFromBeat(fNoteBeat); float fSecondsUntilStep = fNoteSeconds - fSongSeconds; float fBPM = pPlayerState->m_PlayerOptions.GetCurrent().m_fScrollBPM; - float fBPS = fBPM/60.f; + float fBPS = fBPM/60.f / GAMESTATE->m_SongOptions.GetCurrent().m_fMusicRate; float fYOffsetTimeSpacing = fSecondsUntilStep * fBPS; fYOffset += fYOffsetTimeSpacing * pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing; } @@ -287,7 +287,8 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float float fScrollSpeed = pPlayerState->m_PlayerOptions.GetCurrent().m_fScrollSpeed; if(pPlayerState->m_PlayerOptions.GetCurrent().m_fMaxScrollBPM != 0) { - fScrollSpeed= pPlayerState->m_PlayerOptions.GetCurrent().m_fMaxScrollBPM / pPlayerState->m_fReadBPM; + fScrollSpeed= pPlayerState->m_PlayerOptions.GetCurrent().m_fMaxScrollBPM / + (pPlayerState->m_fReadBPM * GAMESTATE->m_SongOptions.GetCurrent().m_fMusicRate); } // don't mess with the arrows after they've crossed 0