Now that unlocks are handled in the theme anyhow, there's no real point to having two separate implementations of unlocking within the theme

stepmania/Themes/default/metrics.ini

@@ -3242,7 +3242,6 @@ IdleTimeoutSeconds=0
 [ScreenUnlock]
 Class=ScreenUnlock
 Fallback=ScreenAttract
-UseUnlocksDat=1
 TypeOfPointsToDisplay=DP
 TimeToDisplay=10
 PointsDisplayX=SCREEN_CENTER_X-220
@@ -3258,7 +3257,6 @@ UnlockTextScrollX=SCREEN_CENTER_X+55
 UnlockTextScrollStartY=SCREEN_CENTER_Y+200
 UnlockTextScrollEndY=SCREEN_CENTER_Y-200
 NextScreen=ScreenWarning
-NumUnlocks=20
 UnlockIconCommand=zoom,0;linear,0.3;zoom,1;linear,0.2;zoom,0.8;sleep,9;linear,0.5;diffusealpha,0
 Unlock1X=SCREEN_CENTER_X-220
 Unlock1Y=SCREEN_CENTER_Y-115
@@ -3300,26 +3298,6 @@ Unlock19X=SCREEN_CENTER_X-120
 Unlock19Y=SCREEN_CENTER_Y+85
 Unlock20X=SCREEN_CENTER_X-70
 Unlock20Y=SCREEN_CENTER_Y+85
-Unlock1Song=POP 4
-Unlock2Song=SENORITA(Speedy Mix) Speedy Mix
-Unlock3Song=Miracle Moon ~L.E.D.LIGHT STYLE MIX~
-Unlock4Song=CAN'T STOP FALLIN' IN LOVE (SPEED MIX)
-Unlock5Song=xenon
-Unlock6Song=TRIBAL DANCE (Almighty Mix)
-Unlock7Song=DROP THE BOMB (System S.F. Mix)
-Unlock8Song=SAKURA
-Unlock9Song=ABSOLUTE
-Unlock10Song=BURNIN' THE FLOOR (MOMO MIX)
-Unlock11Song=DYNAMITE RAVE (Down Bird SOTA Mix)
-Unlock12Song=bag
-Unlock13Song=CARTOON HEROES (Speedy Mix)
-Unlock14Song=Look To The Sky (True Color Mix)
-Unlock15Song=A
-Unlock16Song=V(for EXTREME)
-Unlock17Song=Do It Right (Harmonized 2Step Mix)
-Unlock18Song=Dance Dance Revolution
-Unlock19Song=The legend of MAX
-Unlock20Song=PARANOIA survivor
 DancePointsZoom=2
 
 [ScreenRanking]

stepmania/src/ScreenUnlock.cpp

@@ -10,7 +10,6 @@
 #include "song.h"
 #include "Course.h"
 
-#define NUM_UNLOCKS						THEME->GetMetricI("ScreenUnlock", "NumUnlocks")
 #define UNLOCK_TEXT_SCROLL_X			THEME->GetMetricF("ScreenUnlock", "UnlockTextScrollX");
 #define UNLOCK_TEXT_SCROLL_START_Y		THEME->GetMetricF("ScreenUnlock", "UnlockTextScrollStartY")
 #define UNLOCK_TEXT_SCROLL_END_Y		THEME->GetMetricF("ScreenUnlock", "UnlockTextScrollEndY")
@@ -19,20 +18,18 @@
 #define UNLOCK_TEXT_SCROLL_MAX_WIDTH	THEME->GetMetricF("ScreenUnlock", "UnlockTextScrollMaxWidth")
 #define UNLOCK_TEXT_SCROLL_ICON_X		THEME->GetMetricF("ScreenUnlock", "UnlockTextScrollIconX")
 #define UNLOCK_TEXT_SCROLL_ICON_SIZE	THEME->GetMetricF("ScreenUnlock", "UnlockTextScrollIconSize")
-#define DISPLAYED_SONG(i)				THEME->GetMetric ("ScreenUnlock", ssprintf("Unlock%dSong", i))
 #define UNLOCK_TEXT_SCROLL				THEME->GetMetricI("ScreenUnlock", "UnlockTextScroll")
 #define TYPE_TO_DISPLAY					THEME->GetMetric ("ScreenUnlock", "TypeOfPointsToDisplay")
 #define ICON_COMMAND					THEME->GetMetricA("ScreenUnlock", "UnlockIconCommand")
 #define TIME_TO_DISPLAY					THEME->GetMetricF("ScreenUnlock", "TimeToDisplay")
 #define POINTS_ZOOM						THEME->GetMetricF("ScreenUnlock","PointsZoom")
-#define USE_UNLOCKS_DAT					THEME->GetMetricI("ScreenUnlock","UseUnlocksDat")
 
 REGISTER_SCREEN_CLASS( ScreenUnlock );
 ScreenUnlock::ScreenUnlock( CString sClassName ) : ScreenAttract( sClassName )
 {
 	LOG->Trace("ScreenUnlock::ScreenUnlock()");
 
-	unsigned NumUnlocks = min( (unsigned) NUM_UNLOCKS, UNLOCKMAN->m_SongEntries.size() );
+	unsigned NumUnlocks = UNLOCKMAN->m_SongEntries.size();
 
 	if (!PREFSMAN->m_bUseUnlockSystem || NumUnlocks == 0)
 	{
@@ -45,7 +42,7 @@ void ScreenUnlock::Init()
 {
 	ScreenAttract::Init();
 
-	unsigned NumUnlocks = min( (unsigned) NUM_UNLOCKS, UNLOCKMAN->m_SongEntries.size() );
+	unsigned NumUnlocks = UNLOCKMAN->m_SongEntries.size();
 
 	PointsUntilNextUnlock.LoadFromFont( THEME->GetPathF("Common","normal") );
 	PointsUntilNextUnlock.SetHorizAlign( Actor::align_left );
@@ -54,10 +51,8 @@ void ScreenUnlock::Init()
 	for( unsigned i=1; i <= NumUnlocks; i++ )
 	{
 		// get pertaining UnlockEntry
-		CString SongTitle = DISPLAYED_SONG(i);
+		if ((unsigned)i <= UNLOCKMAN->m_SongEntries.size() )
-		if (USE_UNLOCKS_DAT == 1)
+			SongTitle = UNLOCKMAN->m_SongEntries[i-1].m_sSongName;
-			if ((unsigned)i <= UNLOCKMAN->m_SongEntries.size() )
-				SongTitle = UNLOCKMAN->m_SongEntries[i-1].m_sSongName;
 		LOG->Trace("UnlockScreen: Searching for %s", SongTitle.c_str());
 		
 		const UnlockEntry *pSong = UNLOCKMAN->FindLockEntry( SongTitle );
@@ -107,10 +102,8 @@ void ScreenUnlock::Init()
 
 		for(unsigned i = 1; i <= NumUnlocks; i++)
 		{
-			CString DisplayedSong = DISPLAYED_SONG(i);
+			if ((unsigned)i <= UNLOCKMAN->m_SongEntries.size() )
-			if (USE_UNLOCKS_DAT == 1)
+				DisplayedSong = UNLOCKMAN->m_SongEntries[i-1].m_sSongName;
-				if ((unsigned)i <= UNLOCKMAN->m_SongEntries.size() )
-					DisplayedSong = UNLOCKMAN->m_SongEntries[i-1].m_sSongName;
 			
 			DisplayedSong.MakeUpper();
 			const UnlockEntry *pSong = UNLOCKMAN->FindLockEntry(DisplayedSong);
@@ -241,12 +234,8 @@ void ScreenUnlock::Init()
 
 			unsigned NextIcon = LastUnlocks[LastUnlocks.size() - i];
 
-			CString DisplayedSong = DISPLAYED_SONG(NextIcon);
+			if (NextIcon <= UNLOCKMAN->m_SongEntries.size() )
-			if (USE_UNLOCKS_DAT == 1)
+				DisplayedSong = UNLOCKMAN->m_SongEntries[NextIcon-1].m_sSongName;
-			{
-				if (NextIcon <= UNLOCKMAN->m_SongEntries.size() )
-					DisplayedSong = UNLOCKMAN->m_SongEntries[NextIcon-1].m_sSongName;
-			}
 
 			DisplayedSong.MakeUpper();
 			const UnlockEntry *pSong = UNLOCKMAN->FindLockEntry(DisplayedSong);