fix Combo30Misses overrides FailType shouldn't override FailOff

2005-02-17 21:30:10 +00:00
parent da5f4a57bb
commit 0457317a6f
1 changed files with 4 additions and 1 deletions
@@ -1405,7 +1405,10 @@ void ScreenGameplay::Update( float fDeltaTime )
 		bool bBeginFailed = false;
 		SongOptions::FailType ft = GAMESTATE->m_SongOptions.m_FailType;
 		if( PREFSMAN->m_bMinimum1FullSongInCourses && GAMESTATE->IsCourseMode() && GAMESTATE->GetCourseSongIndex()==0 )
-			ft = SongOptions::FAIL_COMBO_OF_30_MISSES;
+		{
+			// take the least harsh of the two FailTypes
+			ft = max( ft, SongOptions::FAIL_COMBO_OF_30_MISSES );
+		}
 		switch( ft )
 		{
 		case SongOptions::FAIL_IMMEDIATE: