From 3e647b5b927dbf942d830bd58f7a3c3e67abb09e Mon Sep 17 00:00:00 2001 From: Sean Burke Date: Sat, 12 Mar 2005 08:15:36 +0000 Subject: [PATCH] cleanup and compile fix --- stepmania/src/ScreenUnlock.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScreenUnlock.cpp b/stepmania/src/ScreenUnlock.cpp index 46bb1b618a..a2ab801db7 100644 --- a/stepmania/src/ScreenUnlock.cpp +++ b/stepmania/src/ScreenUnlock.cpp @@ -51,8 +51,7 @@ void ScreenUnlock::Init() for( unsigned i=1; i <= NumUnlocks; i++ ) { // get pertaining UnlockEntry - if ((unsigned)i <= UNLOCKMAN->m_SongEntries.size() ) - SongTitle = UNLOCKMAN->m_SongEntries[i-1].m_sSongName; + CString SongTitle = UNLOCKMAN->m_SongEntries[i-1].m_sSongName; LOG->Trace("UnlockScreen: Searching for %s", SongTitle.c_str()); const UnlockEntry *pSong = UNLOCKMAN->FindLockEntry( SongTitle ); @@ -102,8 +101,7 @@ void ScreenUnlock::Init() for(unsigned i = 1; i <= NumUnlocks; i++) { - if ((unsigned)i <= UNLOCKMAN->m_SongEntries.size() ) - DisplayedSong = UNLOCKMAN->m_SongEntries[i-1].m_sSongName; + CString DisplayedSong = UNLOCKMAN->m_SongEntries[i-1].m_sSongName; DisplayedSong.MakeUpper(); const UnlockEntry *pSong = UNLOCKMAN->FindLockEntry(DisplayedSong); @@ -234,8 +232,7 @@ void ScreenUnlock::Init() unsigned NextIcon = LastUnlocks[LastUnlocks.size() - i]; - if (NextIcon <= UNLOCKMAN->m_SongEntries.size() ) - DisplayedSong = UNLOCKMAN->m_SongEntries[NextIcon-1].m_sSongName; + CString DisplayedSong = UNLOCKMAN->m_SongEntries[NextIcon-1].m_sSongName; DisplayedSong.MakeUpper(); const UnlockEntry *pSong = UNLOCKMAN->FindLockEntry(DisplayedSong);