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

pull out common code

Browse Source
This commit is contained in:
Glenn Maynard
2002-12-30 22:40:34 +00:00
parent 4cee9ed975
commit 2d7a944f61
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+20 -13
View File
@@ -698,9 +698,7 @@ void MusicWheel::RebuildWheelItemDisplays()
if( iIndex < 0 ) if( iIndex < 0 )
iIndex = GetCurWheelItemDatas().size()-1; iIndex = GetCurWheelItemDatas().size()-1;
} }
while( GetCurWheelItemDatas()[iIndex].m_WheelItemType == TYPE_SONG while( !WheelItemIsVisible(iIndex) );
&& GetCurWheelItemDatas()[iIndex].m_sSectionName != ""
&& GetCurWheelItemDatas()[iIndex].m_sSectionName != m_sExpandedSectionName );
} }
// iIndex is now the index of the lowest WheelItem to draw // iIndex is now the index of the lowest WheelItem to draw
@@ -718,9 +716,7 @@ void MusicWheel::RebuildWheelItemDisplays()
if( iIndex > int(GetCurWheelItemDatas().size()-1) ) if( iIndex > int(GetCurWheelItemDatas().size()-1) )
iIndex = 0; iIndex = 0;
} }
while( GetCurWheelItemDatas()[iIndex].m_WheelItemType == TYPE_SONG while( !WheelItemIsVisible(iIndex) );
&& GetCurWheelItemDatas()[iIndex].m_sSectionName != ""
&& GetCurWheelItemDatas()[iIndex].m_sSectionName != m_sExpandedSectionName );
} }
} }
@@ -1011,9 +1007,7 @@ void MusicWheel::PrevMusic( bool bSendSongChangedMessage )
if( m_iSelection < 0 ) if( m_iSelection < 0 )
m_iSelection = GetCurWheelItemDatas().size()-1; m_iSelection = GetCurWheelItemDatas().size()-1;
} }
while( (GetCurWheelItemDatas()[m_iSelection].m_WheelItemType == TYPE_SONG || GetCurWheelItemDatas()[m_iSelection].m_WheelItemType == TYPE_COURSE) while(!WheelItemIsVisible(m_iSelection));
&& GetCurWheelItemDatas()[m_iSelection].m_sSectionName != ""
&& GetCurWheelItemDatas()[m_iSelection].m_sSectionName != m_sExpandedSectionName );
RebuildWheelItemDisplays(); RebuildWheelItemDisplays();
@@ -1050,16 +1044,14 @@ void MusicWheel::NextMusic( bool bSendSongChangedMessage )
// increment m_iSelection // increment m_iSelection
RageTimer xxx;
do do
{ {
m_iSelection++; m_iSelection++;
if( m_iSelection > int(GetCurWheelItemDatas().size()-1) ) if( m_iSelection > int(GetCurWheelItemDatas().size()-1) )
m_iSelection = 0; m_iSelection = 0;
} }
while( (GetCurWheelItemDatas()[m_iSelection].m_WheelItemType == TYPE_SONG || GetCurWheelItemDatas()[m_iSelection].m_WheelItemType == TYPE_COURSE) while(!WheelItemIsVisible(m_iSelection));
&& GetCurWheelItemDatas()[m_iSelection].m_sSectionName != ""
&& GetCurWheelItemDatas()[m_iSelection].m_sSectionName != m_sExpandedSectionName );
RebuildWheelItemDisplays(); RebuildWheelItemDisplays();
m_fPositionOffsetFromSelection += 1; m_fPositionOffsetFromSelection += 1;
@@ -1262,3 +1254,18 @@ CString MusicWheel::GetSectionNameFromSongAndSort( Song* pSong, SongSortOrder so
return ""; return "";
} }
} }
bool MusicWheel::WheelItemIsVisible(int n)
{
/* Only songs and courses get hidden. */
if(GetCurWheelItemDatas()[n].m_WheelItemType != TYPE_SONG &&
GetCurWheelItemDatas()[n].m_WheelItemType != TYPE_COURSE)
return true;
/* If there's no section name, it's always shown. */
if(GetCurWheelItemDatas()[n].m_sSectionName.empty())
return true;
/* Otherwise, only show it if it's in the selected section. */
return GetCurWheelItemDatas()[n].m_sSectionName == m_sExpandedSectionName;
}
stepmania/src/MusicWheel.h
+1
View File
@@ -165,6 +165,7 @@ protected:
RageSoundSample m_soundLocked; RageSoundSample m_soundLocked;
CString GetSectionNameFromSongAndSort( Song* pSong, SongSortOrder so ); CString GetSectionNameFromSongAndSort( Song* pSong, SongSortOrder so );
bool WheelItemIsVisible(int n);
}; };
#endif #endif