More Pump Theme Fixes

This commit is contained in:
Andrew Livy
2003-05-05 11:50:18 +00:00
parent 80d16e87e8
commit b716b1ec4b
3 changed files with 25 additions and 7 deletions
+23 -6
View File
@@ -153,6 +153,18 @@ void ScreenSelectMode::UpdateSelectableChoices()
m_ScrollingList.Load(GraphicPaths); 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 ) void ScreenSelectMode::MenuStart( PlayerNumber pn )
{ {
@@ -163,12 +175,17 @@ void ScreenSelectMode::MenuStart( PlayerNumber pn )
m_bSelected = true; m_bSelected = true;
return; return;
} }
SCREENMAN->PostMessageToTopScreen( SM_AllDoneChoosing, 0 );
unsigned i; m_ScrollingList.BeginTweening(0.1f);
for( i=0; i<m_SubActors.size(); i++ ) m_ScrollingList.SetZoomY(0.0f);
m_SubActors[i]->StopTweening(); m_Guide.BeginTweening(0.1f);
OFF_COMMAND( m_ScrollingList ); m_Guide.SetY(550.0f); // off the bottom of the screen
OFF_COMMAND( m_Guide ); 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 ) int ScreenSelectMode::GetSelectionIndex( PlayerNumber pn )
+1
View File
@@ -31,6 +31,7 @@ public:
virtual void MenuRight( PlayerNumber pn ); virtual void MenuRight( PlayerNumber pn );
virtual void MenuStart( PlayerNumber pn ); virtual void MenuStart( PlayerNumber pn );
virtual void Update( float fDelta ); virtual void Update( float fDelta );
virtual void HandleScreenMessage( const ScreenMessage SM );
protected: protected:
virtual int GetSelectionIndex( PlayerNumber pn ); virtual int GetSelectionIndex( PlayerNumber pn );
virtual void UpdateSelectableChoices(); virtual void UpdateSelectableChoices();
+1 -1
View File
@@ -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) ) ); m_Background.LoadFromAniDir( THEME->GetPathToB(ssprintf("ScreenStyleSplash-%s-%s-%d",sGameName.c_str(),sStyleName.c_str(),iDifficulty) ) );
this->AddChild( &m_Background ); this->AddChild( &m_Background );
m_Menu.Load( "ScreenStyleSplash" ); m_Menu.Load( "ScreenStyleSplash", false, false );
this->AddChild( &m_Menu ); this->AddChild( &m_Menu );
this->PostScreenMessage( SM_StartClosing, 2 ); this->PostScreenMessage( SM_StartClosing, 2 );