cleanup
This commit is contained in:
@@ -286,7 +286,12 @@ const Profile* ProfileManager::GetProfile( PlayerNumber pn ) const
|
|||||||
{
|
{
|
||||||
ASSERT( pn >= 0 && pn < NUM_PLAYERS );
|
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];
|
return m_pMemoryCardProfile[pn];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -123,7 +123,10 @@ void SongUtil::SortSongPointerArrayByGrades( vector<Song*> &vpSongsInOut, bool b
|
|||||||
Song *pSong = vpSongsInOut[i];
|
Song *pSong = vpSongsInOut[i];
|
||||||
|
|
||||||
int iCounts[NUM_GRADES];
|
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;
|
CString foo;
|
||||||
foo.reserve(256);
|
foo.reserve(256);
|
||||||
|
|||||||
Reference in New Issue
Block a user