From 6886b09e454832dfec49e501edae1ce269054c10 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sat, 8 May 2004 08:20:16 +0000
Subject: [PATCH] do total points from locked songs

---
 stepmania/src/Profile.cpp | 62 +++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp
index dfdbd16bcf..83336eae03 100644
--- a/stepmania/src/Profile.cpp
+++ b/stepmania/src/Profile.cpp
@@ -215,8 +215,6 @@ int Profile::GetPossibleSongDancePointsForStepsType( StepsType st ) const
 			
 			if( pSong->m_SelectionDisplay == Song::SHOW_NEVER )
 				continue;	// skip
-			if( UNLOCKMAN->SongIsLocked(pSong) )
-				continue;
 
 			vector<Steps*> vSteps = pSong->GetAllSteps();
 			for( unsigned j=0; j<vSteps.size(); j++ )
@@ -235,36 +233,6 @@ int Profile::GetPossibleSongDancePointsForStepsType( StepsType st ) const
 	return iTotal;
 }
 
-int Profile::GetPossibleCourseDancePointsForStepsType( StepsType st ) const
-{
-	int iTotal = 0;
-
-	// add course high scores
-	{
-		vector<Course*> vCourses;
-		SONGMAN->GetAllCourses( vCourses, false );
-		for( unsigned i=0; i<vCourses.size(); i++ )
-		{
-			const Course* pCourse = vCourses[i];
-			
-			// Don't count any course that has any entries that change over time.
-			if( !pCourse->AllSongsAreFixed() )
-				continue;
-
-			FOREACH_CourseDifficulty( cd )
-			{
-				if( !pCourse->HasCourseDifficulty(st,cd) )
-					continue;
-
-				const RadarValues& fRadars = pCourse->GetRadarValues(st,cd);
-				iTotal += ScoreKeeperMAX2::GetPossibleDancePoints( fRadars );
-			}
-		}
-	}
-
-	return iTotal;
-}
-
 int Profile::GetActualSongDancePointsForStepsType( StepsType st ) const
 {
 	int iTotal = 0;
@@ -316,6 +284,36 @@ int Profile::GetActualSongDancePointsForStepsType( StepsType st ) const
 	return iTotal;
 }
 
+int Profile::GetPossibleCourseDancePointsForStepsType( StepsType st ) const
+{
+	int iTotal = 0;
+
+	// add course high scores
+	{
+		vector<Course*> vCourses;
+		SONGMAN->GetAllCourses( vCourses, false );
+		for( unsigned i=0; i<vCourses.size(); i++ )
+		{
+			const Course* pCourse = vCourses[i];
+			
+			// Don't count any course that has any entries that change over time.
+			if( !pCourse->AllSongsAreFixed() )
+				continue;
+
+			FOREACH_CourseDifficulty( cd )
+			{
+				if( !pCourse->HasCourseDifficulty(st,cd) )
+					continue;
+
+				const RadarValues& fRadars = pCourse->GetRadarValues(st,cd);
+				iTotal += ScoreKeeperMAX2::GetPossibleDancePoints( fRadars );
+			}
+		}
+	}
+
+	return iTotal;
+}
+
 int Profile::GetActualCourseDancePointsForStepsType( StepsType st ) const
 {
 	int iTotal = 0;