diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp index 000f7e6575..bb7a528283 100644 --- a/stepmania/src/ScreenSelectMode.cpp +++ b/stepmania/src/ScreenSelectMode.cpp @@ -153,6 +153,18 @@ void ScreenSelectMode::UpdateSelectableChoices() m_ScrollingList.Load(GraphicPaths); } +void ScreenSelectMode::HandleScreenMessage( const ScreenMessage SM ) +{ + switch( SM ) + { + case SM_MenuTimer: + { + m_bSelected = true; + } + break; + } + ScreenSelect::HandleScreenMessage(SM); +} void ScreenSelectMode::MenuStart( PlayerNumber pn ) { @@ -163,12 +175,17 @@ void ScreenSelectMode::MenuStart( PlayerNumber pn ) m_bSelected = true; return; } - SCREENMAN->PostMessageToTopScreen( SM_AllDoneChoosing, 0 ); - unsigned i; - for( i=0; iStopTweening(); - OFF_COMMAND( m_ScrollingList ); - OFF_COMMAND( m_Guide ); + + m_ScrollingList.BeginTweening(0.1f); + m_ScrollingList.SetZoomY(0.0f); + m_Guide.BeginTweening(0.1f); + m_Guide.SetY(550.0f); // off the bottom of the screen + m_ChoiceListFrame.BeginTweening(0.1f); + m_ChoiceListFrame.SetDiffuse(RageColor(0,0,0,0)); + m_ChoiceListHighlight.BeginTweening(0.1f); + m_ChoiceListHighlight.SetDiffuse(RageColor(0,0,0,0)); + + SCREENMAN->PostMessageToTopScreen( SM_AllDoneChoosing, 0.5f ); } int ScreenSelectMode::GetSelectionIndex( PlayerNumber pn ) diff --git a/stepmania/src/ScreenSelectMode.h b/stepmania/src/ScreenSelectMode.h index 4f8c0a76d7..1ee4bb2b8e 100644 --- a/stepmania/src/ScreenSelectMode.h +++ b/stepmania/src/ScreenSelectMode.h @@ -31,6 +31,7 @@ public: virtual void MenuRight( PlayerNumber pn ); virtual void MenuStart( PlayerNumber pn ); virtual void Update( float fDelta ); + virtual void HandleScreenMessage( const ScreenMessage SM ); protected: virtual int GetSelectionIndex( PlayerNumber pn ); virtual void UpdateSelectableChoices(); diff --git a/stepmania/src/ScreenStyleSplash.cpp b/stepmania/src/ScreenStyleSplash.cpp index 7840238132..5d63612177 100644 --- a/stepmania/src/ScreenStyleSplash.cpp +++ b/stepmania/src/ScreenStyleSplash.cpp @@ -43,7 +43,7 @@ ScreenStyleSplash::ScreenStyleSplash() : Screen("ScreenStyleSplash") m_Background.LoadFromAniDir( THEME->GetPathToB(ssprintf("ScreenStyleSplash-%s-%s-%d",sGameName.c_str(),sStyleName.c_str(),iDifficulty) ) ); this->AddChild( &m_Background ); - m_Menu.Load( "ScreenStyleSplash" ); + m_Menu.Load( "ScreenStyleSplash", false, false ); this->AddChild( &m_Menu ); this->PostScreenMessage( SM_StartClosing, 2 );