Gameplay fade out now happend on notes end, not music end

This commit is contained in:
Chris Danford
2002-10-08 00:04:22 +00:00
parent fcb66151b0
commit 888e937b83
2 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -639,10 +639,10 @@ void ScreenGameplay::Update( float fDeltaTime )
//
// Check for end of song
//
if( fSongBeat > GAMESTATE->m_pCurSong->m_fLastBeat+1 && !m_soundMusic.IsPlaying() )
float fSecondsToStop = GAMESTATE->m_pCurSong->GetElapsedTimeFromBeat( GAMESTATE->m_pCurSong->m_fLastBeat ) + 1;
if( GAMESTATE->m_fMusicSeconds > fSecondsToStop && !m_OniFade.IsClosing() )
{
GAMESTATE->m_fSongBeat = 0;
m_soundMusic.Stop();
this->SendScreenMessage( SM_NotesEnded, 0 );
}
+4 -4
View File
@@ -63,28 +63,28 @@ void TransitionOniFade::DrawPrimitives()
void TransitionOniFade::OpenWipingRight( ScreenMessage send_when_done )
{
SetTransitionTime( 4 );
SetTransitionTime( 2.5f );
Transition::OpenWipingRight( send_when_done );
UpdateSongText();
}
void TransitionOniFade::OpenWipingLeft( ScreenMessage send_when_done )
{
SetTransitionTime( 4 );
SetTransitionTime( 2.5f );
Transition::OpenWipingLeft( send_when_done );
UpdateSongText();
}
void TransitionOniFade::CloseWipingRight(ScreenMessage send_when_done )
{
SetTransitionTime( 2 );
SetTransitionTime( 1 );
Transition::CloseWipingRight( send_when_done );
UpdateSongText();
}
void TransitionOniFade::CloseWipingLeft( ScreenMessage send_when_done )
{
SetTransitionTime( 2 );
SetTransitionTime( 1 );
Transition::CloseWipingLeft( send_when_done );
UpdateSongText();
}