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

slight comment/cleanup

Browse Source
This commit is contained in:
AJ Kelly
2010-07-25 19:39:07 -05:00
parent 102b896fbc
commit cc0996f653
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MusicWheel.cpp
+7 -5
View File
@@ -616,7 +616,8 @@ void MusicWheel::BuildWheelItemDatas( vector<MusicWheelItemData *> &arrayWheelIt
// new section, make a section item // new section, make a section item
RageColor colorSection = (so==SORT_GROUP) ? SONGMAN->GetSongGroupColor(pSong->m_sGroupName) : SECTION_COLORS.GetValue(iSectionColorIndex); RageColor colorSection = (so==SORT_GROUP) ? SONGMAN->GetSongGroupColor(pSong->m_sGroupName) : SECTION_COLORS.GetValue(iSectionColorIndex);
iSectionColorIndex = (iSectionColorIndex+1) % NUM_SECTION_COLORS; iSectionColorIndex = (iSectionColorIndex+1) % NUM_SECTION_COLORS;
// This restricts to show only one group at time (ever heard about exceed or zero?) // In certain situations (e.g. simulating Pump it Up), themes may
// want to only show one group at a time.
if( !HIDE_INACTIVE_SECTIONS ) if( !HIDE_INACTIVE_SECTIONS )
arrayWheelItemDatas.push_back( new MusicWheelItemData(TYPE_SECTION, NULL, sThisSection, NULL, colorSection, iSectionCount) ); arrayWheelItemDatas.push_back( new MusicWheelItemData(TYPE_SECTION, NULL, sThisSection, NULL, colorSection, iSectionCount) );
sLastSection = sThisSection; sLastSection = sThisSection;
@@ -1132,7 +1133,7 @@ void MusicWheel::SetOpenSection( RString group )
// sm-ssc additions: jump to group // sm-ssc additions: jump to group
RString MusicWheel::JumpToNextGroup() RString MusicWheel::JumpToNextGroup()
{ {
//Thanks to Juanelote for this small addition // Thanks to Juanelote for this logic:
if( HIDE_INACTIVE_SECTIONS ) if( HIDE_INACTIVE_SECTIONS )
{ {
unsigned iNumGroups = SONGMAN->GetNumSongGroups(); unsigned iNumGroups = SONGMAN->GetNumSongGroups();
@@ -1151,7 +1152,8 @@ RString MusicWheel::JumpToNextGroup()
} }
} }
} }
else{ else
{
unsigned int iLastSelection = m_iSelection; unsigned int iLastSelection = m_iSelection;
for( unsigned int i = m_iSelection; i < m_CurWheelItemData.size(); ++i ) for( unsigned int i = m_iSelection; i < m_CurWheelItemData.size(); ++i )
{ {
@@ -1172,7 +1174,7 @@ RString MusicWheel::JumpToNextGroup()
} }
} }
} }
// and this would be el bad: // it shouldn't get here, but just in case...
return ""; return "";
} }
@@ -1218,7 +1220,7 @@ RString MusicWheel::JumpToPrevGroup()
} }
} }
} }
// and this would be el bad: // it shouldn't get here, but just in case...
return ""; return "";
} }
src/MusicWheel.h
+1 -1
View File
@@ -84,8 +84,8 @@ protected:
ThemeMetric1D<RageColor> SECTION_COLORS; ThemeMetric1D<RageColor> SECTION_COLORS;
ThemeMetric<LuaReference> SORT_ORDERS; ThemeMetric<LuaReference> SORT_ORDERS;
ThemeMetric<bool> SHOW_EASY_FLAG; ThemeMetric<bool> SHOW_EASY_FLAG;
// sm-ssc additions:
ThemeMetric<bool> USE_SECTIONS_WITH_PREFERRED_GROUP; ThemeMetric<bool> USE_SECTIONS_WITH_PREFERRED_GROUP;
//sm-ssc additions -DaisuMaster
ThemeMetric<bool> HIDE_INACTIVE_SECTIONS; ThemeMetric<bool> HIDE_INACTIVE_SECTIONS;
}; };