From 92cfec6bba4a0dab25c41ff2ba1ad74a12fce4c0 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 29 Mar 2006 10:10:54 +0000 Subject: [PATCH] simplify (tracking down skips) --- stepmania/src/GameSoundManager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/GameSoundManager.cpp b/stepmania/src/GameSoundManager.cpp index f127afb93a..a86020e5c2 100644 --- a/stepmania/src/GameSoundManager.cpp +++ b/stepmania/src/GameSoundManager.cpp @@ -209,15 +209,15 @@ static void StartMusic( MusicToPlay &ToPlay ) const float PresumedLatency = SOUND->GetPlayLatency() + 0.040f; const float fCurSecond = GAMESTATE->m_fMusicSeconds + PresumedLatency; const float fCurBeat = g_Playing->m_Timing.GetBeatFromElapsedTime( fCurSecond ); - const float fCurBeatFraction = fmodfp( fCurBeat,1 ); /* The beat that the new sound will start on. */ const float fStartBeat = NewMusic->m_NewTiming.GetBeatFromElapsedTime( ToPlay.start_sec ); - float fStartBeatFraction = fmodfp( fStartBeat, 1 ); - if( fStartBeatFraction < fCurBeatFraction ) - fStartBeatFraction += 1.0f; /* unwrap */ + const float fStartBeatFraction = fmodfp( fStartBeat, 1 ); + + float fCurBeatToStartOn = truncf(fCurBeat) + fStartBeatFraction; + if( fCurBeatToStartOn < fCurBeat ) + fCurBeatToStartOn += 1.0f; - const float fCurBeatToStartOn = truncf(fCurBeat) + fStartBeatFraction; const float fSecondToStartOn = g_Playing->m_Timing.GetElapsedTimeFromBeat( fCurBeatToStartOn ); const float fMaximumDistance = 2; const float fDistance = min( fSecondToStartOn - GAMESTATE->m_fMusicSeconds, fMaximumDistance );