From 69b562db23e266382a9333ea27edd94368a8d7f0 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 26 Feb 2007 01:09:02 +0000 Subject: [PATCH] clarify --- stepmania/src/ScreenGameplay.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index cd0ef57f26..25e7518aab 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1295,18 +1295,19 @@ void ScreenGameplay::StartPlayingSong( float fMinTimeToNotes, float fMinTimeToMu ASSERT( fMinTimeToNotes >= 0 ); ASSERT( fMinTimeToMusic >= 0 ); - const float fFirstBeat = GAMESTATE->m_pCurSong->m_fFirstBeat; - const float fFirstSecond = GAMESTATE->m_pCurSong->GetElapsedTimeFromBeat( fFirstBeat ); - float fStartSecond = fFirstSecond - fMinTimeToNotes; - - fStartSecond = min( fStartSecond, -fMinTimeToMusic ); - m_pSoundMusic->SetProperty( "AccurateSync", true ); RageSoundParams p; p.m_fSpeed = GAMESTATE->m_SongOptions.GetCurrent().m_fMusicRate; p.StopMode = RageSoundParams::M_CONTINUE; - p.m_StartSecond = fStartSecond; + + { + const float fFirstBeat = GAMESTATE->m_pCurSong->m_fFirstBeat; + const float fFirstSecond = GAMESTATE->m_pCurSong->GetElapsedTimeFromBeat( fFirstBeat ); + float fStartDelay = fMinTimeToNotes - fFirstSecond; + fStartDelay = max( fStartDelay, fMinTimeToMusic ); + p.m_StartSecond = -fStartDelay; + } ASSERT( !m_pSoundMusic->IsPlaying() ); m_pSoundMusic->Play( &p );