diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 9ce479c05f..c7dfc5964a 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -272,25 +272,19 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) } // } + m_bgOverlay.LoadFromAniDir( THEME->GetPathB(m_sName, "overlay") ); + m_bgOverlay.SetZ( -1 ); /* draw on top of everything except transitions */ + this->AddChild( &m_bgOverlay ); + m_bPassFailTriggered = false; // the sound hasn't been triggered yet switch( m_Type ) { case stage: case course: - m_bgOverlay.LoadFromAniDir( THEME->GetPathB(m_sName, "overlay") ); - m_bgOverlay.SetZ( -1 ); /* draw on top of everything except transitions */ - this->AddChild( &m_bgOverlay ); - if( m_bFailed ) - { - m_bgFailedBack.LoadFromAniDir( THEME->GetPathB(m_sName, "failed background") ); m_sndPassFail.Load( THEME->GetPathS(m_sName, "failed") ); - } else - { - // the theme can use the regular background for passed background m_sndPassFail.Load( THEME->GetPathS(m_sName, "passed") ); - } m_sndPassFail.Play(); } @@ -1221,7 +1215,6 @@ void ScreenEvaluation::Update( float fDeltaTime ) if(!m_sndPassFail.IsPlaying()) m_sndPassFail.Play(); m_bPassFailTriggered = true; } - m_bgFailedBack.Update( fDeltaTime ); } else if (m_Type==stage||m_Type==course) // STAGE/NONSTOP eval AND passed { @@ -1279,8 +1272,6 @@ void ScreenEvaluation::DrawPrimitives() m_bgCondBga.DrawPrimitives(); // draw the failed background here if the player(s) failed - if(m_bFailed && (m_Type==stage||m_Type==course)) - m_bgFailedBack.Draw(); // draw any special backgrounds if the player failed. // if(USE_GRADE_SPECIFIC_BG) diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h index 6f2d4e042d..e45a41ec09 100644 --- a/stepmania/src/ScreenEvaluation.h +++ b/stepmania/src/ScreenEvaluation.h @@ -66,7 +66,6 @@ protected: float m_fScreenCreateTime; - BGAnimation m_bgFailedBack; BGAnimation m_bgOverlay; ConditionalBGA m_bgCondBga;