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

fix compile

Browse Source
This commit is contained in:
Chris Danford
2008-07-04 09:25:51 +00:00
parent 81958f5b8d
commit 258a25c6e0
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+2 -2
View File
@@ -536,7 +536,7 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
if( m_SelectionState == SelectionState_SelectingSteps && if( m_SelectionState == SelectionState_SelectingSteps &&
input.type == IET_FIRST_PRESS && input.type == IET_FIRST_PRESS &&
(input.MenuI == m_GameButtonNextSong || input.MenuI == m_GameButtonPreviousSong) && (input.MenuI == m_GameButtonNextSong || input.MenuI == m_GameButtonPreviousSong) &&
!m_bStepsSelected[input.pn] ) !m_bStepsChosen[input.pn] )
{ {
if( input.MenuI == m_GameButtonPreviousSong ) if( input.MenuI == m_GameButtonPreviousSong )
{ {
@@ -1006,7 +1006,7 @@ void ScreenSelectMusic::MenuStart( const InputEventPlus &input )
float fSeconds = m_MenuTimer->GetSeconds(); float fSeconds = m_MenuTimer->GetSeconds();
if( fSeconds < 10 ) if( fSeconds < 10 )
{ {
m_MenuTimer->SetSeconds( 10 ); m_MenuTimer->SetSeconds( 13 );
m_MenuTimer->Start(); m_MenuTimer->Start();
} }
} }
stepmania/src/SongManager.cpp
+7 -4
View File
@@ -1465,8 +1465,11 @@ void SongManager::UpdatePreferredSort()
FOREACH( UnlockEntry, UNLOCKMAN->m_UnlockEntries, ue ) FOREACH( UnlockEntry, UNLOCKMAN->m_UnlockEntries, ue )
{ {
if( ue->m_Type == UnlockRewardType_Song ) 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 ) FOREACH( PreferredSortSection, m_vPreferredSongSort, v )
@@ -1486,10 +1489,10 @@ void SongManager::UpdatePreferredSort()
// prune empty groups // prune empty groups
for( int i=m_vPreferredSongSort.size()-1; i>=0; i-- ) 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 ); m_vPreferredSongSort.erase( m_vPreferredSongSort.begin()+i );
FOREACH( SongPointerVector, m_vPreferredSongSort, i ) FOREACH( PreferredSortSection, m_vPreferredSongSort, i )
FOREACH( Song*, i->vpSongs, j ) FOREACH( Song*, i->vpSongs, j )
ASSERT( *j ); ASSERT( *j );
} }