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

If a course uses a song that is disabled, disable the course too.

Browse Source
This commit is contained in:
Glenn Maynard
2007-08-15 20:37:34 +00:00
parent 85732aa4c8
commit 83d64246d9
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/CatalogXml.cpp
+3 -2
View File
@@ -138,7 +138,8 @@ void CatalogXml::Save( LoadingWindow *loading_window )
// the title. // the title.
if( !pCourse->AllSongsAreFixed() ) if( !pCourse->AllSongsAreFixed() )
continue; continue;
if( UNLOCKMAN->CourseIsLocked(pCourse) ) /* Don't write locked songs to the catalog, but do write disabled songs. */
if( UNLOCKMAN->CourseIsLocked(pCourse) & ~LOCKED_DISABLED )
continue; continue;
iTotalCourses++; iTotalCourses++;
} }
@@ -233,7 +234,7 @@ void CatalogXml::Save( LoadingWindow *loading_window )
// the title. // the title.
if( !pCourse->AllSongsAreFixed() ) if( !pCourse->AllSongsAreFixed() )
continue; continue;
if( UNLOCKMAN->CourseIsLocked(pCourse) ) if( UNLOCKMAN->CourseIsLocked(pCourse) & ~LOCKED_DISABLED )
continue; continue;
CourseID courseID; CourseID courseID;
stepmania/src/UnlockManager.cpp
+12
View File
@@ -118,6 +118,18 @@ int UnlockManager::CourseIsLocked( const Course *pCourse ) const
iRet |= LOCKED_LOCK; iRet |= LOCKED_LOCK;
} }
/* If a course uses a song that is disabled, disable the course too. */
FOREACH_CONST( CourseEntry, pCourse->m_vEntries, e )
{
const CourseEntry &ce = *e;
const Song *pSong = ce.songID.ToSong();
if( pSong == NULL )
continue;
int iSongLock = SongIsLocked( pSong );
if( iSongLock & LOCKED_DISABLED )
iRet |= LOCKED_DISABLED;
}
return iRet; return iRet;
} }