do total points from locked songs
This commit is contained in:
+30
-32
@@ -215,8 +215,6 @@ int Profile::GetPossibleSongDancePointsForStepsType( StepsType st ) const
|
|||||||
|
|
||||||
if( pSong->m_SelectionDisplay == Song::SHOW_NEVER )
|
if( pSong->m_SelectionDisplay == Song::SHOW_NEVER )
|
||||||
continue; // skip
|
continue; // skip
|
||||||
if( UNLOCKMAN->SongIsLocked(pSong) )
|
|
||||||
continue;
|
|
||||||
|
|
||||||
vector<Steps*> vSteps = pSong->GetAllSteps();
|
vector<Steps*> vSteps = pSong->GetAllSteps();
|
||||||
for( unsigned j=0; j<vSteps.size(); j++ )
|
for( unsigned j=0; j<vSteps.size(); j++ )
|
||||||
@@ -235,36 +233,6 @@ int Profile::GetPossibleSongDancePointsForStepsType( StepsType st ) const
|
|||||||
return iTotal;
|
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 Profile::GetActualSongDancePointsForStepsType( StepsType st ) const
|
||||||
{
|
{
|
||||||
int iTotal = 0;
|
int iTotal = 0;
|
||||||
@@ -316,6 +284,36 @@ int Profile::GetActualSongDancePointsForStepsType( StepsType st ) const
|
|||||||
return iTotal;
|
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 Profile::GetActualCourseDancePointsForStepsType( StepsType st ) const
|
||||||
{
|
{
|
||||||
int iTotal = 0;
|
int iTotal = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user