From 777745b7fbfb1cd407a28b93c1126a62a1371df0 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sat, 13 Feb 2010 13:37:03 -0600 Subject: [PATCH] sm4svn sync part 2. 528089b: remove preferred group filtering (leaving the setting in for later use) [Glenn Maynard] 96821ad: fix pump routine right side DownLeft not drawn [Chris Danford] fd88c62: easier debug stepping [Chris Danford] --- src/GameManager.cpp | 2 +- src/MusicWheel.cpp | 11 ++++------- src/MusicWheel.h | 2 +- src/SongManager.cpp | 14 -------------- src/SongManager.h | 3 +-- src/Style.cpp | 9 +++++++-- 6 files changed, 14 insertions(+), 27 deletions(-) diff --git a/src/GameManager.cpp b/src/GameManager.cpp index 5aa11fcbfe..8d7319498e 100644 --- a/src/GameManager.cpp +++ b/src/GameManager.cpp @@ -810,7 +810,7 @@ static const Style g_Style_Pump_Routine = { 6, 8, 7, 5, 9, Style::END_MAPPING }, }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; - 2,1,3,0,4,7,6,8,1,9 + 2,1,3,0,4,7,6,8,5,9 }, false, // m_bNeedsZoomOutWith2Players false, // m_bCanUseBeginnerHelper diff --git a/src/MusicWheel.cpp b/src/MusicWheel.cpp index 73daaa859c..479253e5f6 100644 --- a/src/MusicWheel.cpp +++ b/src/MusicWheel.cpp @@ -316,7 +316,7 @@ bool MusicWheel::SelectModeMenuItem() return true; } -void MusicWheel::GetSongList( vector &arraySongs, SortOrder so, const RString &sPreferredGroup ) +void MusicWheel::GetSongList( vector &arraySongs, SortOrder so ) { vector apAllSongs; switch( so ) @@ -325,10 +325,10 @@ void MusicWheel::GetSongList( vector &arraySongs, SortOrder so, const RSt SONGMAN->GetPreferredSortSongs( apAllSongs ); break; case SORT_POPULARITY: - SONGMAN->GetPopularSongs( apAllSongs, GAMESTATE->m_sPreferredSongGroup ); + SONGMAN->GetPopularSongs(); break; default: - apAllSongs = SONGMAN->GetSongs( GAMESTATE->m_sPreferredSongGroup ); + apAllSongs = SONGMAN->GetAllSongs(); break; } @@ -365,7 +365,6 @@ void MusicWheel::GetSongList( vector &arraySongs, SortOrder so, const RSt if( (so!=SORT_ROULETTE || !RANDOM_PICKS_LOCKED_SONGS) && iLocked ) continue; - if( PREFSMAN->m_bOnlyPreferredDifficulties ) { // if the song has steps that fit the preferred difficulty of the default player @@ -377,10 +376,8 @@ void MusicWheel::GetSongList( vector &arraySongs, SortOrder so, const RSt // If the song has at least one steps, add it. if( pSong->HasStepsType(GAMESTATE->GetCurrentStyle()->m_StepsType) ) arraySongs.push_back( pSong ); - } - } /* Hack: Add extra stage item if it was eliminated for any reason (eg. it's a long @@ -440,7 +437,7 @@ void MusicWheel::BuildWheelItemDatas( vector &arrayWheelIt // Make an array of Song*, then sort them vector arraySongs; - GetSongList( arraySongs, so, GAMESTATE->m_sPreferredSongGroup ); + GetSongList(); bool bUseSections = true; diff --git a/src/MusicWheel.h b/src/MusicWheel.h index 8a143c013c..98bd51af70 100644 --- a/src/MusicWheel.h +++ b/src/MusicWheel.h @@ -48,7 +48,7 @@ public: protected: MusicWheelItem *MakeItem(); - void GetSongList( vector &arraySongs, SortOrder so, const RString &sPreferredGroup ); + void GetSongList( vector &arraySongs, SortOrder so ); void BuildWheelItemDatas( vector &arrayWheelItems, SortOrder so ); bool SelectSongOrCourse(); bool SelectCourse( const Course *p ); diff --git a/src/SongManager.cpp b/src/SongManager.cpp index 22cdbaa577..e25aa1cbda 100644 --- a/src/SongManager.cpp +++ b/src/SongManager.cpp @@ -534,20 +534,6 @@ const vector &SongManager::GetSongs( const RString &sGroupName ) const return vEmpty; } -void SongManager::GetPopularSongs( vector &AddTo, const RString &sGroupName ) const -{ - if( sGroupName == GROUP_ALL ) - { - AddTo.insert( AddTo.end(), m_pPopularSongs.begin(), m_pPopularSongs.end() ); - return; - } - FOREACH_CONST( Song*, m_pPopularSongs, song ) - { - if( (*song)->m_sGroupName == sGroupName ) - AddTo.push_back( *song ); - } -} - void SongManager::GetPreferredSortSongs( vector &AddTo ) const { if( m_vPreferredSongSort.empty() ) diff --git a/src/SongManager.h b/src/SongManager.h index ae1aaaedf2..bd66de2ee6 100644 --- a/src/SongManager.h +++ b/src/SongManager.h @@ -79,8 +79,7 @@ public: // Lookup const vector &GetSongs( const RString &sGroupName ) const; const vector &GetAllSongs() const { return GetSongs(GROUP_ALL); } - void GetPopularSongs( vector &AddTo, const RString &sGroupName ) const; - const vector &GetAllPopularSongs() const { return m_pPopularSongs; } + const vector &GetPopularSongs() const { return m_pPopularSongs; } void GetPreferredSortSongs( vector &AddTo ) const; RString SongToPreferredSortSectionName( const Song *pSong ) const; const vector &GetPopularCourses( CourseType ct ) const { return m_pPopularCourses[ct]; } diff --git a/src/Style.cpp b/src/Style.cpp index a3eee51078..e034c2e63f 100644 --- a/src/Style.cpp +++ b/src/Style.cpp @@ -57,9 +57,14 @@ GameInput Style::StyleInputToGameInput( int iCol, PlayerNumber pn ) const if( bUsingOneSide && gc != (int) pn ) continue; - for( GameButton gb=GAME_BUTTON_NEXT; gb < INPUTMAPPER->GetInputScheme()->m_iButtonsPerController && m_iInputColumn[gc][gb-GAME_BUTTON_NEXT] != END_MAPPING; gb=(GameButton)(gb+1) ) + int iButtonsPerController = INPUTMAPPER->GetInputScheme()->m_iButtonsPerController; + for( GameButton gb=GAME_BUTTON_NEXT; gb < iButtonsPerController; gb=(GameButton)(gb+1) ) { - if( m_iInputColumn[gc][gb-GAME_BUTTON_NEXT] == iCol ) + int iThisInputCol = m_iInputColumn[gc][gb-GAME_BUTTON_NEXT]; + if( iThisInputCol == END_MAPPING ) + break; + + if( iThisInputCol == iCol ) return GameInput( gc, gb ); } }