From 258a25c6e0827e279a0abeff2569d705b4a097ce Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 4 Jul 2008 09:25:51 +0000 Subject: [PATCH] fix compile --- stepmania/src/ScreenSelectMusic.cpp | 4 ++-- stepmania/src/SongManager.cpp | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 94b070f086..2e8f73dfac 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -536,7 +536,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input ) if( m_SelectionState == SelectionState_SelectingSteps && input.type == IET_FIRST_PRESS && (input.MenuI == m_GameButtonNextSong || input.MenuI == m_GameButtonPreviousSong) && - !m_bStepsSelected[input.pn] ) + !m_bStepsChosen[input.pn] ) { if( input.MenuI == m_GameButtonPreviousSong ) { @@ -1006,7 +1006,7 @@ void ScreenSelectMusic::MenuStart( const InputEventPlus &input ) float fSeconds = m_MenuTimer->GetSeconds(); if( fSeconds < 10 ) { - m_MenuTimer->SetSeconds( 10 ); + m_MenuTimer->SetSeconds( 13 ); m_MenuTimer->Start(); } } diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index 405bb2d297..699573ced8 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -1465,8 +1465,11 @@ void SongManager::UpdatePreferredSort() FOREACH( UnlockEntry, UNLOCKMAN->m_UnlockEntries, ue ) { if( ue->m_Type == UnlockRewardType_Song ) - if( ue->m_pSong ) - section.vpSongs.push_back( ue->m_pSong ); + { + Song *pSong = ue->m_Song.ToSong(); + if( pSong ) + section.vpSongs.push_back( pSong ); + } } FOREACH( PreferredSortSection, m_vPreferredSongSort, v ) @@ -1486,10 +1489,10 @@ void SongManager::UpdatePreferredSort() // prune empty groups for( int i=m_vPreferredSongSort.size()-1; i>=0; i-- ) - if( m_vPreferredSongSort[i].empty() ) + if( m_vPreferredSongSort[i].vpSongs.empty() ) m_vPreferredSongSort.erase( m_vPreferredSongSort.begin()+i ); - FOREACH( SongPointerVector, m_vPreferredSongSort, i ) + FOREACH( PreferredSortSection, m_vPreferredSongSort, i ) FOREACH( Song*, i->vpSongs, j ) ASSERT( *j ); }