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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2004-02-15 23:10:40 +00:00
parent e755ecab67
commit 5df4390d51
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+2 -14
View File
@@ -2230,9 +2230,8 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
} }
// Feels hackish. Feel free to make cleaner. // Feels hackish. Feel free to make cleaner.
// MD 10/27/03 - I felt free. :-) And now it's arcade-accurate as well. if( GAMESTATE->IsCourseMode() )
if(GAMESTATE->IsCourseMode()) if( GAMESTATE->GetCourseSongIndex() > (int(m_apSongsQueue.size() / 2) - 1 ) )
if(GAMESTATE->GetCourseSongIndex() > (int(m_apSongsQueue.size() / 2) - 1 ))
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo( "gameplay oni failed halfway" ) ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo( "gameplay oni failed halfway" ) );
else else
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo( "gameplay oni failed" ) ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo( "gameplay oni failed" ) );
@@ -2259,29 +2258,18 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
if( PREFSMAN->m_bEventMode ) if( PREFSMAN->m_bEventMode )
{ {
if(EVAL_ON_FAIL) // go to the eval screen if we fail if(EVAL_ON_FAIL) // go to the eval screen if we fail
{
SCREENMAN->SetNewScreen( "ScreenEvaluationStage" ); SCREENMAN->SetNewScreen( "ScreenEvaluationStage" );
}
else // the theme says just fail and go back to the song select for event mode else // the theme says just fail and go back to the song select for event mode
{
SCREENMAN->SetNewScreen( PREV_SCREEN(GAMESTATE->m_PlayMode) ); SCREENMAN->SetNewScreen( PREV_SCREEN(GAMESTATE->m_PlayMode) );
/* Don't do this; it'll call SongFinished, etc. again. -glenn */
// HandleScreenMessage( SM_GoToScreenAfterBack );
}
} }
else if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() ) else if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
SCREENMAN->SetNewScreen( "ScreenEvaluationStage" ); SCREENMAN->SetNewScreen( "ScreenEvaluationStage" );
else else
{ {
if(EVAL_ON_FAIL) // go to the eval screen if we fail if(EVAL_ON_FAIL) // go to the eval screen if we fail
{
SCREENMAN->SetNewScreen( "ScreenEvaluationStage" ); SCREENMAN->SetNewScreen( "ScreenEvaluationStage" );
}
else // if not just game over now else // if not just game over now
{
SCREENMAN->SetNewScreen( "ScreenGameOver" ); SCREENMAN->SetNewScreen( "ScreenGameOver" );
}
} }
break; break;
case PLAY_MODE_NONSTOP: case PLAY_MODE_NONSTOP: