PersonalHighScore -> ProfileHighScore
This commit is contained in:
@@ -1411,7 +1411,7 @@ bool GameState::ShowW1() const
|
||||
}
|
||||
|
||||
|
||||
static ThemeMetric<bool> PERSONAL_RECORD_FEATS("GameState","PersonalRecordFeats");
|
||||
static ThemeMetric<bool> PROFILE_RECORD_FEATS("GameState","ProfileRecordFeats");
|
||||
static ThemeMetric<bool> CATEGORY_RECORD_FEATS("GameState","CategoryRecordFeats");
|
||||
void GameState::GetRankingFeats( PlayerNumber pn, vector<RankingFeat> &asFeatsOut ) const
|
||||
{
|
||||
@@ -1494,7 +1494,7 @@ void GameState::GetRankingFeats( PlayerNumber pn, vector<RankingFeat> &asFeatsOu
|
||||
}
|
||||
|
||||
// Find Personal Records
|
||||
if( pProf && PERSONAL_RECORD_FEATS )
|
||||
if( pProf && PROFILE_RECORD_FEATS )
|
||||
{
|
||||
HighScoreList &hsl = pProf->GetStepsHighScoreList(pSong,pSteps);
|
||||
for( unsigned j=0; j<hsl.vHighScores.size(); j++ )
|
||||
@@ -1559,7 +1559,7 @@ void GameState::GetRankingFeats( PlayerNumber pn, vector<RankingFeat> &asFeatsOu
|
||||
if( !CATEGORY_RECORD_FEATS )
|
||||
continue;
|
||||
|
||||
if( pProf && PERSONAL_RECORD_FEATS )
|
||||
if( pProf && PROFILE_RECORD_FEATS )
|
||||
{
|
||||
HighScoreList &hsl = pProf->GetCategoryHighScoreList( st, rc );
|
||||
for( unsigned j=0; j<hsl.vHighScores.size(); j++ )
|
||||
@@ -1619,7 +1619,7 @@ void GameState::GetRankingFeats( PlayerNumber pn, vector<RankingFeat> &asFeatsOu
|
||||
}
|
||||
|
||||
// Find Personal Records
|
||||
if( PERSONAL_RECORD_FEATS && PROFILEMAN->IsPersistentProfile(pn) )
|
||||
if( PROFILE_RECORD_FEATS && PROFILEMAN->IsPersistentProfile(pn) )
|
||||
{
|
||||
HighScoreList &hsl = pProf->GetCourseHighScoreList( pCourse, pTrail );
|
||||
for( unsigned i=0; i<hsl.vHighScores.size(); i++ )
|
||||
|
||||
@@ -57,7 +57,7 @@ void PlayerStageStats::Init()
|
||||
|
||||
m_pdaToShow = PerDifficultyAward_Invalid;
|
||||
m_pcaToShow = PeakComboAward_Invalid;
|
||||
m_iPersonalHighScoreIndex = -1;
|
||||
m_iProfileHighScoreIndex = -1;
|
||||
m_iMachineHighScoreIndex = -1;
|
||||
m_bDisqualified = false;
|
||||
m_rc = RankingCategory_Invalid;
|
||||
@@ -687,7 +687,7 @@ public:
|
||||
DEFINE_METHOD( GetPercentDancePoints, GetPercentDancePoints() )
|
||||
DEFINE_METHOD( GetLessonScoreActual, GetLessonScoreActual() )
|
||||
DEFINE_METHOD( GetLessonScoreNeeded, GetLessonScoreNeeded() )
|
||||
DEFINE_METHOD( GetPersonalHighScoreIndex, m_iPersonalHighScoreIndex )
|
||||
DEFINE_METHOD( GetPersonalHighScoreIndex, m_iProfileHighScoreIndex )
|
||||
DEFINE_METHOD( GetMachineHighScoreIndex, m_iMachineHighScoreIndex )
|
||||
DEFINE_METHOD( GetPerDifficultyAward, m_pdaToShow )
|
||||
DEFINE_METHOD( GetPeakComboAward, m_pcaToShow )
|
||||
|
||||
@@ -110,7 +110,7 @@ public:
|
||||
PerDifficultyAward m_pdaToShow;
|
||||
PeakComboAward m_pcaToShow;
|
||||
|
||||
int m_iPersonalHighScoreIndex;
|
||||
int m_iProfileHighScoreIndex;
|
||||
int m_iMachineHighScoreIndex;
|
||||
bool m_bDisqualified;
|
||||
bool IsDisqualified() const;
|
||||
|
||||
@@ -141,7 +141,7 @@ void StageStats::CommitScores( bool bSummary )
|
||||
{
|
||||
FOREACH_PlayerNumber( pn )
|
||||
{
|
||||
m_player[pn].m_iPersonalHighScoreIndex = 0;
|
||||
m_player[pn].m_iProfileHighScoreIndex = 0;
|
||||
m_player[pn].m_iMachineHighScoreIndex = 0;
|
||||
}
|
||||
}
|
||||
@@ -209,7 +209,7 @@ void StageStats::CommitScores( bool bSummary )
|
||||
int iAverageMeter = GetAverageMeter(p);
|
||||
m_player[p].m_rc = AverageMeterToRankingCategory( iAverageMeter );
|
||||
|
||||
PROFILEMAN->AddCategoryScore( st, m_player[p].m_rc, p, hs, m_player[p].m_iPersonalHighScoreIndex, m_player[p].m_iMachineHighScoreIndex );
|
||||
PROFILEMAN->AddCategoryScore( st, m_player[p].m_rc, p, hs, m_player[p].m_iProfileHighScoreIndex, m_player[p].m_iMachineHighScoreIndex );
|
||||
|
||||
// TRICKY: Increment play count here, and not on ScreenGameplay like the others.
|
||||
PROFILEMAN->IncrementCategoryPlayCount( st, m_player[p].m_rc, p );
|
||||
@@ -220,13 +220,13 @@ void StageStats::CommitScores( bool bSummary )
|
||||
ASSERT( pCourse );
|
||||
Trail* pTrail = GAMESTATE->m_pCurTrail[p];
|
||||
|
||||
PROFILEMAN->AddCourseScore( pCourse, pTrail, p, hs, m_player[p].m_iPersonalHighScoreIndex, m_player[p].m_iMachineHighScoreIndex );
|
||||
PROFILEMAN->AddCourseScore( pCourse, pTrail, p, hs, m_player[p].m_iProfileHighScoreIndex, m_player[p].m_iMachineHighScoreIndex );
|
||||
}
|
||||
else
|
||||
{
|
||||
ASSERT( pSteps );
|
||||
|
||||
PROFILEMAN->AddStepsScore( pSong, pSteps, p, hs, m_player[p].m_iPersonalHighScoreIndex, m_player[p].m_iMachineHighScoreIndex );
|
||||
PROFILEMAN->AddStepsScore( pSong, pSteps, p, hs, m_player[p].m_iProfileHighScoreIndex, m_player[p].m_iMachineHighScoreIndex );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user