This commit is contained in:
Chris Danford
2005-08-03 03:23:21 +00:00
parent 7f67cfcac0
commit 71d985f861
2 changed files with 10 additions and 2 deletions
+6 -1
View File
@@ -286,7 +286,12 @@ const Profile* ProfileManager::GetProfile( PlayerNumber pn ) const
{
ASSERT( pn >= 0 && pn < NUM_PLAYERS );
if( m_sProfileDir[pn].empty() || ProfileWasLoadedFromMemoryCard(pn) )
if( m_sProfileDir[pn].empty() )
{
// return an empty profile
return m_pMemoryCardProfile[pn];
}
else if( ProfileWasLoadedFromMemoryCard(pn) )
{
return m_pMemoryCardProfile[pn];
}
+4 -1
View File
@@ -123,7 +123,10 @@ void SongUtil::SortSongPointerArrayByGrades( vector<Song*> &vpSongsInOut, bool b
Song *pSong = vpSongsInOut[i];
int iCounts[NUM_GRADES];
PROFILEMAN->GetMachineProfile()->GetGrades( pSong, GAMESTATE->GetCurrentStyle()->m_StepsType, iCounts );
const Profile *pProfile = PROFILEMAN->GetMachineProfile();
const Style *pStyle = GAMESTATE->GetCurrentStyle();
StepsType st = pStyle->m_StepsType;
pProfile->GetGrades( pSong, st, iCounts );
CString foo;
foo.reserve(256);