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

move MenuElements into a base ScreenWithMenuElements so that metrics can be overridden using the Fallback mechanism

Browse Source
This commit is contained in:
Chris Danford
2004-05-01 23:19:33 +00:00
parent 1d2d1927a6
commit df5cd5e813
57 changed files with 262 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEvaluation.cpp
+3 -11
View File
@@ -93,7 +93,7 @@ static const int NUM_SHOWN_RADAR_CATEGORIES = 5;
const ScreenMessage SM_PlayCheer = ScreenMessage(SM_User+6);
ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName)
ScreenEvaluation::ScreenEvaluation( CString sClassName ) : ScreenWithMenuElements(sClassName)
{
LOG->Trace( "ScreenEvaluation::ScreenEvaluation" );
Init(); // work around horrible gcc bug 3187
@@ -252,10 +252,6 @@ void ScreenEvaluation::Init()
m_Type==stage;
m_Menu.Load( m_sName );
this->AddChild( &m_Menu );
//
// load pass/fail sound
//
@@ -1417,20 +1413,16 @@ void ScreenEvaluation::Update( float fDeltaTime )
void ScreenEvaluation::DrawPrimitives()
{
m_Menu.DrawBottomLayer();
m_bgCondBga.DrawPrimitives();
Screen::DrawPrimitives();
m_Menu.DrawTopLayer();
}
void ScreenEvaluation::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
{
// LOG->Trace( "ScreenEvaluation::Input()" );
if( m_Menu.IsTransitioning() )
if( IsTransitioning() )
return;
if( GameI.IsValid() )
@@ -1570,6 +1562,6 @@ void ScreenEvaluation::EndScreen()
break;
}
}
m_Menu.StartTransitioning( SM_GoToNextScreen );
StartTransitioning( SM_GoToNextScreen );
}