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

Change FailEndOfSong to fail after the current song in courses.

Browse Source
This commit is contained in:
Chris Danford
2003-11-01 06:23:59 +00:00
parent c1eb81d73f
commit 04680abf76
1 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+11 -8
View File
@@ -1603,7 +1603,17 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
GAMESTATE->m_CurStageStats.iSongsPassed[p]++; GAMESTATE->m_CurStageStats.iSongsPassed[p]++;
} }
if( !IsLastSong() ) if( GAMESTATE->m_SongOptions.m_FailType == SongOptions::FAIL_END_OF_SONG && AllAreFailing() )
{
if( m_DancingState == STATE_OUTRO ) // ScreenGameplay already ended
return; // ignore
m_DancingState = STATE_OUTRO;
GAMESTATE->RemoveAllActiveAttacks();
this->PostScreenMessage( SM_BeginFailed, 0 );
}
else if( !IsLastSong() )
{ {
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
if( GAMESTATE->IsPlayerEnabled(p) && !GAMESTATE->m_CurStageStats.bFailed[p] ) if( GAMESTATE->IsPlayerEnabled(p) && !GAMESTATE->m_CurStageStats.bFailed[p] )
@@ -1636,12 +1646,6 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
GAMESTATE->RemoveAllActiveAttacks(); GAMESTATE->RemoveAllActiveAttacks();
if( GAMESTATE->m_SongOptions.m_FailType == SongOptions::FAIL_END_OF_SONG && AllAreFailing() )
{
this->PostScreenMessage( SM_BeginFailed, 0 );
}
else // ! failed
{
// do they deserve an extra stage? // do they deserve an extra stage?
if( GAMESTATE->HasEarnedExtraStage() ) if( GAMESTATE->HasEarnedExtraStage() )
{ {
@@ -1679,7 +1683,6 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
} }
} }
} }
}
break; break;
case SM_LoadNextSong: case SM_LoadNextSong: