From a2f965fb92861ca7a2228c1f3dcec36b68d142db Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 13 Jul 2004 00:01:08 +0000 Subject: [PATCH] simplify --- stepmania/src/ScreenEvaluation.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 699dc8f7b1..be5666f55e 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -1338,22 +1338,17 @@ void ScreenEvaluation::Update( float fDeltaTime ) Screen::Update( fDeltaTime ); m_bgCondBga.Update(fDeltaTime); - if(m_bFailed && (m_Type==stage||m_Type==course)) + if( !m_bPassFailTriggered && (m_Type==stage || m_Type==course) ) { - if( m_timerSoundSequences.Ago() > FAILED_SOUND_TIME && !m_bPassFailTriggered ) + float fTime = m_bFailed? FAILED_SOUND_TIME:PASSED_SOUND_TIME; + if( m_timerSoundSequences.Ago() > fTime ) { - if(!m_sndPassFail.IsPlaying()) m_sndPassFail.Play(); - m_bPassFailTriggered = true; - } - } - else if (m_Type==stage||m_Type==course) // STAGE/NONSTOP eval AND passed - { - if( m_timerSoundSequences.Ago() > PASSED_SOUND_TIME && !m_bPassFailTriggered ) - { - if(!m_sndPassFail.IsPlaying()) m_sndPassFail.Play(); + if( !m_sndPassFail.IsPlaying() ) + m_sndPassFail.Play(); m_bPassFailTriggered = true; } } + // if(m_Type == stage) // stage eval ... pass / fail / whatever // { for( unsigned snd=0; snd