From 474b8b9a492fd91743d5033c1cc67655b318a9ff Mon Sep 17 00:00:00 2001
From: Aaron VonderHaar <avh4@users.sourceforge.net>
Date: Sat, 15 Nov 2003 20:51:51 +0000
Subject: [PATCH] Allow failure on Oni/Endless to be considered for a high
 score (as used to be the case).  This behaviour was broken sometime in the
 past two weeks.  Someone who understands the unlock system might want to make
 sure this behaves correctly.

---
 stepmania/src/ScreenEvaluation.cpp | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index cd7b6c72ec..1ad73e96c8 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -192,17 +192,25 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName)
 
 	for( p=0; p<NUM_PLAYERS; p++ )
 	{
+		// only save scores for human players ;)
 		if( !GAMESTATE->IsHumanPlayer(p) )
-			continue;	// skip
+			continue;
+
+		// don't save scores if the player chose not to
 		if( !GAMESTATE->m_SongOptions.m_bSaveScore )
-			continue;	// skip
-		if( m_bFailed )
-			continue; // skip
+			continue;
+
+		// whether or not to save scores when the stage was failed
+		// depends on if this is a course or not ... it's handled
+		// below in the switch
 
 		switch( m_Type )
 		{
 		case stage:
 			{
+				// don't save scores for a failed song
+				if( m_bFailed ) continue;
+
 				ASSERT( GAMESTATE->m_pCurNotes[p] );
 				Steps::MemCardData::HighScore hs;
 				hs.grade = grade[p];
@@ -228,6 +236,11 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName)
 			break;
 		case summary:
 			{
+				// don't save scores for a failed game
+				// (I'm not sure if this is a case that can actally
+				// happen -avh4)
+				if( m_bFailed ) continue;
+
 				StepsType nt = GAMESTATE->GetCurrentStyleDef()->m_StepsType;
 
 				float fAverageMeter = stageStats.iMeter[p] / (float)PREFSMAN->m_iNumArcadeStages;
@@ -247,6 +260,11 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName)
 				Course* pCourse = GAMESTATE->m_pCurCourse;
 				if( pCourse )
 				{
+					// don't save scores for a failed Nonstop (is this
+					// correct? -avh4)
+					// DO save scores for a failed Oni/Endless
+					if( m_bFailed && pCourse->IsNonstop() ) continue;
+
 					int score;
 					if( pCourse->IsOni() )
 						score = stageStats.iActualDancePoints[p];