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

add ImmedOnScreenFromMenu; same as ImmedOffScreenToMenu

Browse Source
This commit is contained in:
Glenn Maynard
2002-12-19 22:24:13 +00:00
parent 9daaee589a
commit c3596d9c32
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MenuElements.cpp
+17 -3
View File
@@ -119,8 +119,11 @@ void MenuElements::Load( CString sBackgroundPath, CString sTopEdgePath, CString
m_soundBack.Load( THEME->GetPathTo("Sounds","menu back") );
}
void MenuElements::TweenTopLayerOnScreen()
void MenuElements::TweenTopLayerOnScreen(float tm)
{
if(tm == -1)
tm = MENU_ELEMENTS_TWEEN_TIME;
CArray<Actor*,Actor*> apActorsInTopFrame;
apActorsInTopFrame.push_back( &m_sprTopEdge );
apActorsInTopFrame.push_back( &m_sprStyleIcon );
@@ -129,13 +132,13 @@ void MenuElements::TweenTopLayerOnScreen()
{
float fOriginalX = apActorsInTopFrame[i]->GetX();
apActorsInTopFrame[i]->SetX( fOriginalX+SCREEN_WIDTH );
apActorsInTopFrame[i]->BeginTweening( MENU_ELEMENTS_TWEEN_TIME, TWEEN_SPRING );
apActorsInTopFrame[i]->BeginTweening( tm, TWEEN_SPRING );
apActorsInTopFrame[i]->SetTweenX( fOriginalX );
}
float fOriginalZoom = m_textHelp.GetZoomY();
m_textHelp.SetZoomY( 0 );
m_textHelp.BeginTweening( MENU_ELEMENTS_TWEEN_TIME/2 );
m_textHelp.BeginTweening( tm/2 );
m_textHelp.SetTweenZoomY( fOriginalZoom );
}
@@ -202,6 +205,17 @@ void MenuElements::TweenOffScreenToMenu( ScreenMessage smSendWhenDone )
m_soundSwoosh.Play();
}
void MenuElements::ImmedOnScreenFromMenu( bool bLeaveKeepAliveOn )
{
TweenTopLayerOnScreen(0);
Update(0);
if( !bLeaveKeepAliveOn )
m_KeepAlive.SetOpened();
else
m_KeepAlive.SetClosed();
}
void MenuElements::ImmedOffScreenToMenu()
{
m_MenuTimer.StopTimer();