actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

well, it doesn't crash anymore. not sure if it breaks anything yet.

Browse Source
This commit is contained in:
AJ Kelly
2011-06-15 21:50:43 -05:00
parent bfe6e0076d
commit e26bccdf27
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/UnlockManager.cpp
+7 -3
View File
@@ -295,7 +295,7 @@ void UnlockManager::GetPoints( const Profile *pProfile, float fScores[NUM_Unlock
fScores[UnlockRequirement_SongPoints] = GetSongPoints( pProfile );
fScores[UnlockRequirement_DancePoints] = (float) pProfile->m_iTotalDancePoints;
fScores[UnlockRequirement_StagesCleared] = (float) pProfile->GetTotalNumSongsPassed();
fScores[UnlockRequirement_NumUnlocked] = (float) GetNumUnlocked();
//fScores[UnlockRequirement_NumUnlocked] = (float) GetNumUnlocked();
}
/* Return true if all songs and/or courses referenced by an unlock are available. */
@@ -330,8 +330,13 @@ UnlockEntryStatus UnlockEntry::GetUnlockEntryStatus() const
UNLOCKMAN->GetPoints( PROFILEMAN->GetMachineProfile(), fScores );
for( int i = 0; i < NUM_UnlockRequirement; ++i )
{
if( i == UnlockRequirement_NumUnlocked )
continue;
if( m_fRequirement[i] && fScores[i] >= m_fRequirement[i] )
return UnlockEntryStatus_RequirementsMet;
}
if( m_bRequirePassHardSteps && m_Song.IsValid() )
{
@@ -348,7 +353,6 @@ UnlockEntryStatus UnlockEntry::GetUnlockEntryStatus() const
return UnlockEntryStatus_RequirementsMet;
}
return UnlockEntryStatus_RequrementsNotMet;
}
@@ -601,7 +605,7 @@ int UnlockManager::GetNumUnlocked() const
int count = 0;
FOREACH_CONST( UnlockEntry, m_UnlockEntries, ue )
{
if( ue->GetUnlockEntryStatus() == UnlockEntryStatus_Unlocked )
if( !ue->IsLocked() )
count++;
}
return count;