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

cleanup

Browse Source
This commit is contained in:
Chris Danford
2005-03-29 00:31:57 +00:00
parent f6ccc8f695
commit d27320e0e4
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/UnlockManager.cpp
+10 -9
View File
@@ -9,6 +9,7 @@
#include "GameState.h" #include "GameState.h"
#include "ProfileManager.h" #include "ProfileManager.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "Foreach.h"
UnlockManager* UNLOCKMAN = NULL; // global and accessable from anywhere in our program UnlockManager* UNLOCKMAN = NULL; // global and accessable from anywhere in our program
@@ -308,19 +309,19 @@ float UnlockManager::PointsUntilNextUnlock( UnlockType t ) const
* such as on load, or when a song title changes in the editor. */ * such as on load, or when a song title changes in the editor. */
void UnlockManager::UpdateSongs() void UnlockManager::UpdateSongs()
{ {
for( unsigned i = 0; i < m_SongEntries.size(); ++i ) FOREACH( UnlockEntry, m_SongEntries, e )
{ {
m_SongEntries[i].m_pSong = NULL; e->m_pSong = NULL;
m_SongEntries[i].m_pCourse = NULL; e->m_pCourse = NULL;
if( m_SongEntries[i].m_sSongName != "" ) if( e->m_sSongName != "" )
m_SongEntries[i].m_pSong = SONGMAN->FindSong( m_SongEntries[i].m_sSongName ); e->m_pSong = SONGMAN->FindSong( e->m_sSongName );
if( m_SongEntries[i].m_pSong == NULL ) if( e->m_pSong == NULL )
m_SongEntries[i].m_pCourse = SONGMAN->FindCourse( m_SongEntries[i].m_sSongName ); e->m_pCourse = SONGMAN->FindCourse( e->m_sSongName );
// display warning on invalid song entry // display warning on invalid song entry
if( m_SongEntries[i].m_pSong == NULL && m_SongEntries[i].m_pCourse == NULL ) if( e->m_pSong == NULL && e->m_pCourse == NULL )
{ {
LOG->Warn( "Unlock: Cannot find a matching entry for \"%s\"", m_SongEntries[i].m_sSongName.c_str() ); LOG->Warn( "Unlock: Cannot find a matching entry for \"%s\"", e->m_sSongName.c_str() );
m_SongEntries.erase( m_SongEntries.begin() + i ); m_SongEntries.erase( m_SongEntries.begin() + i );
--i; --i;
} }