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

split ScreenSelectMusic::TweenOnScreen

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-16 20:10:37 +00:00
parent e591a1ffb0
commit 70e7740f71
2 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+44 -39
View File
@@ -265,45 +265,6 @@ void ScreenSelectMusic::BeginScreen()
AfterMusicChange(); AfterMusicChange();
FOREACH_HumanPlayer( p )
{
ON_COMMAND( m_DifficultyMeter[p] );
}
TweenSongPartsOnScreen( true );
switch( GAMESTATE->m_SortOrder )
{
case SORT_ALL_COURSES:
case SORT_NONSTOP_COURSES:
case SORT_ONI_COURSES:
case SORT_ENDLESS_COURSES:
TweenSongPartsOffScreen( false );
SkipSongPartTweens();
break;
default:
break;
}
ON_COMMAND( m_Banner );
ON_COMMAND( m_DifficultyDisplay );
ON_COMMAND( m_sprCDTitleFront );
ON_COMMAND( m_sprCDTitleBack );
ON_COMMAND( m_GrooveRadar );
ON_COMMAND( m_textNumSongs );
ON_COMMAND( m_textTotalTime );
ON_COMMAND( m_MusicWheel );
ON_COMMAND( m_sprLongBalloon );
ON_COMMAND( m_sprMarathonBalloon );
ON_COMMAND( m_MusicWheel );
ON_COMMAND( m_MachineRank );
FOREACH_HumanPlayer( p )
{
ON_COMMAND( m_sprHighScoreFrame[p] );
ON_COMMAND( m_textHighScore[p] );
}
SOUND->PlayOnceFromAnnouncer( "select music intro" ); SOUND->PlayOnceFromAnnouncer( "select music intro" );
} }
@@ -358,6 +319,50 @@ void ScreenSelectMusic::SkipSongPartTweens()
} }
} }
void ScreenSelectMusic::TweenOnScreen()
{
ScreenWithMenuElements::TweenOnScreen();
FOREACH_HumanPlayer( p )
{
ON_COMMAND( m_DifficultyMeter[p] );
}
TweenSongPartsOnScreen( true );
switch( GAMESTATE->m_SortOrder )
{
case SORT_ALL_COURSES:
case SORT_NONSTOP_COURSES:
case SORT_ONI_COURSES:
case SORT_ENDLESS_COURSES:
TweenSongPartsOffScreen( false );
SkipSongPartTweens();
break;
default:
break;
}
ON_COMMAND( m_Banner );
ON_COMMAND( m_DifficultyDisplay );
ON_COMMAND( m_sprCDTitleFront );
ON_COMMAND( m_sprCDTitleBack );
ON_COMMAND( m_GrooveRadar );
ON_COMMAND( m_textNumSongs );
ON_COMMAND( m_textTotalTime );
ON_COMMAND( m_MusicWheel );
ON_COMMAND( m_sprLongBalloon );
ON_COMMAND( m_sprMarathonBalloon );
ON_COMMAND( m_MusicWheel );
ON_COMMAND( m_MachineRank );
FOREACH_HumanPlayer( p )
{
ON_COMMAND( m_sprHighScoreFrame[p] );
ON_COMMAND( m_textHighScore[p] );
}
}
void ScreenSelectMusic::TweenOffScreen() void ScreenSelectMusic::TweenOffScreen()
{ {
ScreenWithMenuElements::TweenOffScreen(); ScreenWithMenuElements::TweenOffScreen();
stepmania/src/ScreenSelectMusic.h
+1
View File
@@ -46,6 +46,7 @@ public:
virtual void PushSelf( lua_State *L ); virtual void PushSelf( lua_State *L );
protected: protected:
void TweenOnScreen();
void TweenOffScreen(); void TweenOffScreen();
void TweenScoreOnAndOffAfterChangeSort(); void TweenScoreOnAndOffAfterChangeSort();
enum DisplayMode { DISPLAY_SONGS, DISPLAY_COURSES, DISPLAY_MODES } m_DisplayMode; enum DisplayMode { DISPLAY_SONGS, DISPLAY_COURSES, DISPLAY_MODES } m_DisplayMode;