From c26da983e4c7d0e3db34c9f3a0778459dc0a79f0 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Tue, 17 May 2011 14:16:58 -0400 Subject: [PATCH] [splittiming] Right idea, wrong place. Song Timing respected when needed, included SpeedSegments. --- src/ArrowEffects.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ArrowEffects.cpp b/src/ArrowEffects.cpp index 9f6da4ac97..e408967789 100644 --- a/src/ArrowEffects.cpp +++ b/src/ArrowEffects.cpp @@ -85,7 +85,7 @@ void ArrowEffects::Update() FOREACH_PlayerNumber( pn ) { const Style::ColumnInfo* pCols = pStyle->m_ColumnInfo[pn]; - const SongPosition &position = (GAMESTATE->m_bInStepEditor || GAMESTATE->m_bIsUsingStepTiming) + const SongPosition &position = GAMESTATE->m_bIsUsingStepTiming ? GAMESTATE->m_pPlayerState[pn]->m_Position : GAMESTATE->m_Position; PerPlayerData &data = g_EffectData[pn]; @@ -264,7 +264,7 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float bIsPastPeakOut = true; float fYOffset = 0; - const SongPosition &position = (!GAMESTATE->m_bInStepEditor || GAMESTATE->m_bIsUsingStepTiming) + const SongPosition &position = GAMESTATE->m_bIsUsingStepTiming ? pPlayerState->m_Position : GAMESTATE->m_Position; float fSongBeat = position.m_fSongBeatVisible; @@ -277,7 +277,7 @@ float ArrowEffects::GetYOffset( const PlayerState* pPlayerState, int iCol, float { float fBeatsUntilStep = fNoteBeat - fSongBeat; float fYOffsetBeatSpacing = fBeatsUntilStep; - float fSpeedMultiplier = GAMESTATE->m_bInStepEditor ? 1.0 : GetSpeedMultiplier( position.m_fSongBeatVisible, position.m_fMusicSecondsVisible, pCurSteps->m_Timing ); + float fSpeedMultiplier = ( GAMESTATE->m_bInStepEditor || !GAMESTATE->m_bIsUsingStepTiming ) ? 1.0 : GetSpeedMultiplier( position.m_fSongBeatVisible, position.m_fMusicSecondsVisible, pCurSteps->m_Timing ); fYOffset += fSpeedMultiplier * fYOffsetBeatSpacing * (1-pPlayerState->m_PlayerOptions.GetCurrent().m_fTimeSpacing); }