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

add transition at end of song; used regardless of mode

Browse Source
This commit is contained in:
Glenn Maynard
2004-03-06 10:07:17 +00:00
parent c70166768e
commit 8887353517
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+6 -3
View File
@@ -342,7 +342,8 @@ void ScreenGameplay::Init()
m_NextSongOut.SetZ( -2 ); // on top of everything else m_NextSongOut.SetZ( -2 ); // on top of everything else
this->AddChild( &m_NextSongOut ); this->AddChild( &m_NextSongOut );
m_SongFinished.SetZ( -2 ); // on top of everything else
this->AddChild( &m_SongFinished );
// //
// Add LifeFrame // Add LifeFrame
@@ -953,6 +954,8 @@ void ScreenGameplay::LoadNextSong()
// Instead, load this right before it's used // Instead, load this right before it's used
// m_NextSongOut.Load( THEME->GetPathToB("ScreenGameplay next song out") ); // m_NextSongOut.Load( THEME->GetPathToB("ScreenGameplay next song out") );
m_SongFinished.Load( THEME->GetPathToB("ScreenGameplay song finished") );
// Load lyrics // Load lyrics
// XXX: don't load this here // XXX: don't load this here
LyricsLoader LL; LyricsLoader LL;
@@ -1219,8 +1222,8 @@ void ScreenGameplay::Update( float fDeltaTime )
// Check for end of song // Check for end of song
// //
float fSecondsToStop = GAMESTATE->m_pCurSong->GetElapsedTimeFromBeat( GAMESTATE->m_pCurSong->m_fLastBeat ); float fSecondsToStop = GAMESTATE->m_pCurSong->GetElapsedTimeFromBeat( GAMESTATE->m_pCurSong->m_fLastBeat );
if( GAMESTATE->m_fMusicSeconds > fSecondsToStop && !m_NextSongOut.IsTransitioning() ) if( GAMESTATE->m_fMusicSeconds > fSecondsToStop && !m_SongFinished.IsTransitioning() && !m_NextSongOut.IsTransitioning() )
this->PostScreenMessage( SM_NotesEnded, 0 ); m_SongFinished.StartTransitioning( SM_NotesEnded );
// //
// check for fail // check for fail
stepmania/src/ScreenGameplay.h
+1
View File
@@ -110,6 +110,7 @@ protected:
Transition m_NextSongIn; // shows between songs in a course Transition m_NextSongIn; // shows between songs in a course
Transition m_NextSongOut; // shows between songs in a course Transition m_NextSongOut; // shows between songs in a course
Transition m_SongFinished; // shows after each song, course or not
Sprite m_sprStaticBackground; Sprite m_sprStaticBackground;
Sprite m_sprLifeFrame; Sprite m_sprLifeFrame;