diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 0399a4b696..ac6b97b931 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -24,6 +24,7 @@ sm-ssc v1.2.1 | 2011011? to be changed. [Wolfman2000] * [NoteField] Allow for adjustable fade fail time (for AJ). [Wolfman2000] * [MenuTimer] Allow the hurry up transition to be adjusted. [Wolfman2000] +* [MusicWheel] Added RouletteColor, RandomColor, and PortalColor metrics. [freem] 20110112 -------- diff --git a/src/MusicWheel.cpp b/src/MusicWheel.cpp index 979320f22d..ec0a1b4b7f 100644 --- a/src/MusicWheel.cpp +++ b/src/MusicWheel.cpp @@ -86,6 +86,10 @@ void MusicWheel::Load( RString sType ) CHOICE .Load(sType,CHOICE_NAME,vsModeChoiceNames); SECTION_COLORS .Load(sType,SECTION_COLORS_NAME,NUM_SECTION_COLORS); + ROULETTE_COLOR .Load(sType,"RouletteColor"); + RANDOM_COLOR .Load(sType,"RandomColor"); + PORTAL_COLOR .Load(sType,"PortalColor"); + WheelBase::Load( sType ); SONGMAN->UpdateRankingCourses(); @@ -645,7 +649,7 @@ void MusicWheel::BuildWheelItemDatas( vector &arrayWheelIt if( so != SORT_ROULETTE ) { if( SHOW_ROULETTE ) - arrayWheelItemDatas.push_back( new MusicWheelItemData(TYPE_ROULETTE, NULL, "", NULL, RageColor(1,0,0,1), 0) ); + arrayWheelItemDatas.push_back( new MusicWheelItemData(TYPE_ROULETTE, NULL, "", NULL, ROULETTE_COLOR, 0) ); // Only add TYPE_PORTAL if there's at least one song on the list. bool bFoundAnySong = false; @@ -654,10 +658,10 @@ void MusicWheel::BuildWheelItemDatas( vector &arrayWheelIt bFoundAnySong = true; if( SHOW_RANDOM && bFoundAnySong ) - arrayWheelItemDatas.push_back( new MusicWheelItemData(TYPE_RANDOM, NULL, "", NULL, RageColor(1,0,0,1), 0) ); + arrayWheelItemDatas.push_back( new MusicWheelItemData(TYPE_RANDOM, NULL, "", NULL, RANDOM_COLOR, 0) ); if( SHOW_PORTAL && bFoundAnySong ) - arrayWheelItemDatas.push_back( new MusicWheelItemData(TYPE_PORTAL, NULL, "", NULL, RageColor(1,0,0,1), 0) ); + arrayWheelItemDatas.push_back( new MusicWheelItemData(TYPE_PORTAL, NULL, "", NULL, PORTAL_COLOR, 0) ); } if( GAMESTATE->IsAnExtraStageAndSelectionLocked() ) diff --git a/src/MusicWheel.h b/src/MusicWheel.h index 92b3263988..78e6206856 100644 --- a/src/MusicWheel.h +++ b/src/MusicWheel.h @@ -88,6 +88,9 @@ protected: ThemeMetric USE_SECTIONS_WITH_PREFERRED_GROUP; ThemeMetric HIDE_INACTIVE_SECTIONS; ThemeMetric REMIND_WHEEL_POSITIONS; + ThemeMetric ROULETTE_COLOR; + ThemeMetric RANDOM_COLOR; + ThemeMetric PORTAL_COLOR; vector m_viWheelPositions; };