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:27:48 +00:00
parent 8e3e6575f3
commit bab691b8ee
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEvaluation.cpp
+4 -12
View File
@@ -277,16 +277,18 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName)
{ {
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_bgFailedBack.LoadFromAniDir( THEME->GetPathB(m_sName, "failed background") );
m_bgFailedOverlay.LoadFromAniDir( THEME->GetPathB(m_sName, "failed overlay") );
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 // the theme can use the regular background for passed background
m_bgPassedOverlay.LoadFromAniDir( THEME->GetPathB(m_sName, "passed overlay") );
m_sndPassFail.Load( THEME->GetPathS(m_sName, "passed") ); m_sndPassFail.Load( THEME->GetPathS(m_sName, "passed") );
} }
m_sndPassFail.Play(); m_sndPassFail.Play();
@@ -1220,7 +1222,6 @@ void ScreenEvaluation::Update( float fDeltaTime )
m_bPassFailTriggered = true; m_bPassFailTriggered = true;
} }
m_bgFailedBack.Update( fDeltaTime ); m_bgFailedBack.Update( fDeltaTime );
m_bgFailedOverlay.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
{ {
@@ -1229,9 +1230,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_bgPassedOverlay.Update( fDeltaTime );
} }
// if(m_Type == stage) // stage eval ... pass / fail / whatever // if(m_Type == stage) // stage eval ... pass / fail / whatever
// { // {
@@ -1290,12 +1288,6 @@ void ScreenEvaluation::DrawPrimitives()
Screen::DrawPrimitives(); Screen::DrawPrimitives();
// draw the pass / failed overlays here respectively
if(m_bFailed && (m_Type==stage||m_Type==course))
m_bgFailedOverlay.Draw();
else if (m_Type==stage||m_Type==course)
m_bgPassedOverlay.Draw();
m_Menu.DrawTopLayer(); m_Menu.DrawTopLayer();
} }
stepmania/src/ScreenEvaluation.h
+1 -3
View File
@@ -67,9 +67,7 @@ protected:
float m_fScreenCreateTime; float m_fScreenCreateTime;
BGAnimation m_bgFailedBack; BGAnimation m_bgFailedBack;
BGAnimation m_bgFailedOverlay; BGAnimation m_bgOverlay;
BGAnimation m_bgPassedOverlay;
// BGAnimation m_bgSpecialBack;
ConditionalBGA m_bgCondBga; ConditionalBGA m_bgCondBga;
MenuElements m_Menu; MenuElements m_Menu;