New metric: SongsNotAdditional.

Set this to false to have AdditionalSongs be valid for
unlocking purposes.
This commit is contained in:
Jason Felds
2011-06-26 16:14:50 -07:00
parent f706783eb2
commit b026159a27
3 changed files with 7 additions and 2 deletions
+3 -2
View File
@@ -26,6 +26,7 @@ UnlockManager* UNLOCKMAN = NULL; // global and accessable from anywhere in our p
static ThemeMetric<bool> AUTO_LOCK_CHALLENGE_STEPS( "UnlockManager", "AutoLockChallengeSteps" );
static ThemeMetric<bool> AUTO_LOCK_EDIT_STEPS( "UnlockManager", "AutoLockEditSteps" );
static ThemeMetric<bool> SONGS_NOT_ADDITIONAL( "UnlockManager", "SongsNotAdditional" );
static const char *UnlockRequirementNames[] =
{
@@ -520,7 +521,7 @@ void UnlockManager::Load()
if( SongUtil::GetOneSteps(*s, StepsType_Invalid, Difficulty_Challenge) == NULL )
continue;
if( SONGMAN->WasLoadedFromAdditionalSongs(*s) )
if( SONGS_NOT_ADDITIONAL && SONGMAN->WasLoadedFromAdditionalSongs(*s) )
continue;
UnlockEntry ue;
@@ -546,7 +547,7 @@ void UnlockManager::Load()
continue;
// don't add additional songs.
if (SONGMAN->WasLoadedFromAdditionalSongs(*s))
if (SONGS_NOT_ADDITIONAL && SONGMAN->WasLoadedFromAdditionalSongs(*s))
continue;
UnlockEntry ue;