cleanups, fix memleaks

2004-01-24 22:55:59 +00:00
parent 4bec346b2c
commit ec5d3282bf
4 changed files with 39 additions and 79 deletions
@@ -96,6 +96,9 @@ bool UnlockSystem::SongIsLocked( const Song *song )

 bool UnlockSystem::SongIsRoulette( const Song *song )
 {
+	if( !PREFSMAN->m_bUseUnlockSystem )
+		return false;
+
 	const UnlockEntry *p = FindSong( song );

 	return p && p->m_iRouletteSeed != 0;
@@ -286,21 +289,6 @@ bool UnlockSystem::LoadFromDATFile()
 	return true;
 }

-bool UnlockEntry::SelectableWheel() const
-{
-	return !isLocked;  // cached
-}
-
-bool UnlockEntry::SelectableRoulette() const
-{
-	if( !isLocked )
-		return true;
-
-	if( m_iRouletteSeed != 0 )
-		return true;
-	return false;
-}
-
 float UnlockSystem::DancePointsUntilNextUnlock()
 {
 	float fSmallestPoints = 400000000;   // or an arbitrarily large value