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/ScreenInstructions.cpp
+4 -9
View File
@@ -26,7 +26,7 @@
#define NEXT_SCREEN THEME->GetMetric("ScreenInstructions","NextScreen")
ScreenInstructions::ScreenInstructions( CString sName ) : Screen( sName )
ScreenInstructions::ScreenInstructions( CString sName ) : ScreenWithMenuElements( sName )
{
LOG->Trace( "ScreenInstructions::ScreenInstructions()" );
@@ -54,9 +54,6 @@ ScreenInstructions::ScreenInstructions( CString sName ) : Screen( sName )
}
}
m_Menu.Load("ScreenInstructions");
this->AddChild( &m_Menu );
CString sHowToPlayPath;
if( GAMESTATE->m_PlayMode != PLAY_MODE_INVALID )
sHowToPlayPath = THEME->GetPathToG("ScreenInstructions "+PlayModeToString(GAMESTATE->m_PlayMode)) ;
@@ -89,14 +86,12 @@ void ScreenInstructions::Update( float fDeltaTime )
void ScreenInstructions::DrawPrimitives()
{
m_Menu.DrawBottomLayer();
Screen::DrawPrimitives();
m_Menu.DrawTopLayer();
}
void ScreenInstructions::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
{
if( m_Menu.IsTransitioning() )
if( IsTransitioning() )
return;
// default input handler
@@ -121,12 +116,12 @@ void ScreenInstructions::HandleScreenMessage( const ScreenMessage SM )
void ScreenInstructions::MenuBack( PlayerNumber pn )
{
m_Menu.Back( SM_GoToPrevScreen );
Back( SM_GoToPrevScreen );
}
void ScreenInstructions::MenuStart( PlayerNumber pn )
{
m_Menu.StartTransitioning( SM_GoToNextScreen );
StartTransitioning( SM_GoToNextScreen );
m_sprHowToPlay.StopTweening();
m_sprHowToPlay.BeginTweening( 0.3f, Actor::TWEEN_ACCELERATE );