simplify, fix rankings
This commit is contained in:
@@ -768,14 +768,14 @@ void GameState::GetRankingFeats( PlayerNumber pn, CStringArray &asFeatsOut, vect
|
|||||||
vector<Steps::MemCardData::HighScore> &vHighScores = pSteps->m_MemCardDatas[MEMORY_CARD_MACHINE].vHighScores;
|
vector<Steps::MemCardData::HighScore> &vHighScores = pSteps->m_MemCardDatas[MEMORY_CARD_MACHINE].vHighScores;
|
||||||
for( unsigned j=0; j<vHighScores.size(); j++ )
|
for( unsigned j=0; j<vHighScores.size(); j++ )
|
||||||
{
|
{
|
||||||
if( vHighScores[j].sName == RANKING_TO_FILL_IN_MARKER[pn] )
|
if( vHighScores[j].sName != RANKING_TO_FILL_IN_MARKER[pn] )
|
||||||
{
|
continue;
|
||||||
|
|
||||||
CString s = ssprintf("No. %d in %s", j+1, pSong->GetFullTranslitTitle().c_str() );
|
CString s = ssprintf("No. %d in %s", j+1, pSong->GetFullTranslitTitle().c_str() );
|
||||||
asFeatsOut.push_back( s );
|
asFeatsOut.push_back( s );
|
||||||
vpStringsToFillOut.push_back( &vHighScores[j].sName );
|
vpStringsToFillOut.push_back( &vHighScores[j].sName );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
StageStats stats;
|
StageStats stats;
|
||||||
vector<Song*> vSongs;
|
vector<Song*> vSongs;
|
||||||
@@ -787,6 +787,9 @@ void GameState::GetRankingFeats( PlayerNumber pn, CStringArray &asFeatsOut, vect
|
|||||||
vector<SongManager::CategoryData::HighScore> &vHighScores = SONGMAN->m_CategoryDatas[nt][i].vHighScores;
|
vector<SongManager::CategoryData::HighScore> &vHighScores = SONGMAN->m_CategoryDatas[nt][i].vHighScores;
|
||||||
for( unsigned j=0; j<vHighScores.size(); j++ )
|
for( unsigned j=0; j<vHighScores.size(); j++ )
|
||||||
{
|
{
|
||||||
|
if( vHighScores[j].sName != RANKING_TO_FILL_IN_MARKER[pn] )
|
||||||
|
continue;
|
||||||
|
|
||||||
CString s = ssprintf("No. %d in Type %c (%d)", j+1, 'A'+i, stats.iMeter[pn] );
|
CString s = ssprintf("No. %d in Type %c (%d)", j+1, 'A'+i, stats.iMeter[pn] );
|
||||||
vpStringsToFillOut.push_back( &vHighScores[j].sName );
|
vpStringsToFillOut.push_back( &vHighScores[j].sName );
|
||||||
}
|
}
|
||||||
@@ -805,14 +808,14 @@ void GameState::GetRankingFeats( PlayerNumber pn, CStringArray &asFeatsOut, vect
|
|||||||
vector<Course::MemCardData::HighScore> &vHighScores = pCourse->m_MemCardDatas[nt][MEMORY_CARD_MACHINE].vHighScores;
|
vector<Course::MemCardData::HighScore> &vHighScores = pCourse->m_MemCardDatas[nt][MEMORY_CARD_MACHINE].vHighScores;
|
||||||
for( unsigned i=0; i<vHighScores.size(); i++ )
|
for( unsigned i=0; i<vHighScores.size(); i++ )
|
||||||
{
|
{
|
||||||
if( vHighScores[i].sName == RANKING_TO_FILL_IN_MARKER[pn] )
|
if( vHighScores[i].sName != RANKING_TO_FILL_IN_MARKER[pn] )
|
||||||
{
|
continue;
|
||||||
|
|
||||||
CString s = ssprintf("No. %d in %s", i+1, pCourse->m_sName.c_str() );
|
CString s = ssprintf("No. %d in %s", i+1, pCourse->m_sName.c_str() );
|
||||||
asFeatsOut.push_back( s );
|
asFeatsOut.push_back( s );
|
||||||
vpStringsToFillOut.push_back( &vHighScores[i].sName );
|
vpStringsToFillOut.push_back( &vHighScores[i].sName );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
ASSERT(0);
|
ASSERT(0);
|
||||||
|
|||||||
Reference in New Issue
Block a user