actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 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/ScreenTestInput.cpp
+3 -8
View File
@@ -25,7 +25,7 @@
ScreenTestInput::ScreenTestInput( CString sClassName ) : Screen( sClassName )
ScreenTestInput::ScreenTestInput( CString sClassName ) : ScreenWithMenuElements( sClassName )
{
LOG->Trace( "ScreenTestInput::ScreenTestInput()" );
@@ -37,9 +37,6 @@ ScreenTestInput::ScreenTestInput( CString sClassName ) : Screen( sClassName )
m_textInputs.SetZoom( 0.8f );
this->AddChild( &m_textInputs );
m_Menu.Load( "ScreenTestInput" );
this->AddChild( &m_Menu );
SOUND->PlayMusic( THEME->GetPathToS("ScreenTestInput music") );
}
@@ -95,9 +92,7 @@ void ScreenTestInput::Update( float fDeltaTime )
void ScreenTestInput::DrawPrimitives()
{
m_Menu.DrawBottomLayer();
Screen::DrawPrimitives();
m_Menu.DrawTopLayer();
}
void ScreenTestInput::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
@@ -126,9 +121,9 @@ void ScreenTestInput::MenuStart( PlayerNumber pn )
void ScreenTestInput::MenuBack( PlayerNumber pn )
{
if(!m_Menu.IsTransitioning())
if(!IsTransitioning())
{
SCREENMAN->PlayStartSound();
m_Menu.StartTransitioning( SM_GoToPrevScreen );
StartTransitioning( SM_GoToPrevScreen );
}
}