From 5c8d021e6eb496502abb5a8047af4ee936e3ce41 Mon Sep 17 00:00:00 2001 From: "Devin J. Pohly" Date: Thu, 18 Jul 2013 14:40:16 -0400 Subject: [PATCH] Simplify logic in GetYOffset for arrows No-op. --- src/ArrowEffects.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/ArrowEffects.cpp b/src/ArrowEffects.cpp index 7875d14c17..156ffd9674 100644 --- a/src/ArrowEffects.cpp +++ b/src/ArrowEffects.cpp @@ -256,16 +256,18 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float * entirely time spacing (respectively). Occasionally, we tween between them. */ if( pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing != 1.0f ) { + float fBeatsUntilStep, fSpeedMultiplier; float bShowEffects = !GAMESTATE->m_bInStepEditor; - float fBeatsUntilStep = fNoteBeat - fSongBeat; - if( bShowEffects ) + if( !bShowEffects ) { + fBeatsUntilStep = fNoteBeat - fSongBeat; + fSpeedMultiplier = 1.0f; + } else { fBeatsUntilStep = GetDisplayedBeat(pPlayerState, fNoteBeat) - GetDisplayedBeat(pPlayerState, fSongBeat); - float fYOffsetBeatSpacing = fBeatsUntilStep; - float fSpeedMultiplier = bShowEffects ? - pCurSteps->GetTimingData()->GetDisplayedSpeedPercent( + fSpeedMultiplier = pCurSteps->GetTimingData()->GetDisplayedSpeedPercent( position.m_fSongBeatVisible, - position.m_fMusicSecondsVisible ) : 1.0f; - fYOffset += fSpeedMultiplier * fYOffsetBeatSpacing * (1-pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing); + position.m_fMusicSecondsVisible ); + } + fYOffset += fSpeedMultiplier * fBeatsUntilStep * (1-pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing); } if( pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing != 0.0f )