actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2004-02-16 00:55:36 +00:00
parent bab691b8ee
commit 79b68a002d
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEvaluation.cpp
+4 -13
View File
@@ -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 m_bPassFailTriggered = false; // the sound hasn't been triggered yet
switch( m_Type ) switch( m_Type )
{ {
case stage: case stage:
case course: 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 ) if( m_bFailed )
{
m_bgFailedBack.LoadFromAniDir( THEME->GetPathB(m_sName, "failed background") );
m_sndPassFail.Load( THEME->GetPathS(m_sName, "failed") ); m_sndPassFail.Load( THEME->GetPathS(m_sName, "failed") );
}
else else
{
// the theme can use the regular background for passed background
m_sndPassFail.Load( THEME->GetPathS(m_sName, "passed") ); m_sndPassFail.Load( THEME->GetPathS(m_sName, "passed") );
}
m_sndPassFail.Play(); m_sndPassFail.Play();
} }
@@ -1221,7 +1215,6 @@ void ScreenEvaluation::Update( float fDeltaTime )
if(!m_sndPassFail.IsPlaying()) m_sndPassFail.Play(); if(!m_sndPassFail.IsPlaying()) m_sndPassFail.Play();
m_bPassFailTriggered = true; m_bPassFailTriggered = true;
} }
m_bgFailedBack.Update( fDeltaTime );
} }
else if (m_Type==stage||m_Type==course) // STAGE/NONSTOP eval AND passed else if (m_Type==stage||m_Type==course) // STAGE/NONSTOP eval AND passed
{ {
@@ -1279,8 +1272,6 @@ void ScreenEvaluation::DrawPrimitives()
m_bgCondBga.DrawPrimitives(); m_bgCondBga.DrawPrimitives();
// draw the failed background here if the player(s) failed // 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. // draw any special backgrounds if the player failed.
// if(USE_GRADE_SPECIFIC_BG) // if(USE_GRADE_SPECIFIC_BG)
stepmania/src/ScreenEvaluation.h
-1
View File
@@ -66,7 +66,6 @@ protected:
float m_fScreenCreateTime; float m_fScreenCreateTime;
BGAnimation m_bgFailedBack;
BGAnimation m_bgOverlay; BGAnimation m_bgOverlay;
ConditionalBGA m_bgCondBga; ConditionalBGA m_bgCondBga;