From 44523f0c482e35044c08dba5a1d5495ecb5c0650 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 27 May 2012 12:55:31 -0500 Subject: [PATCH] [MusicWheel] Added EmptyColor metric. --- Docs/Changelog_sm5.txt | 4 ++++ Themes/_fallback/metrics.ini | 1 + src/MusicWheel.cpp | 9 +++++---- src/MusicWheel.h | 1 + 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 71a63e91c1..dd1cda5840 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -8,6 +8,10 @@ ________________________________________________________________________________ StepMania 5.0 ???? ?? | 20120??? -------------------------------------------------------------------------------- +2012/05/27 +---------- +* [MusicWheel] Added EmptyColor metric. + 2012/05/21 ---------- * [NotesLoaderBMS] Support for #BMP based background changes. [theDtTvB] diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index ea71b0fe17..553ee2a086 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -936,6 +936,7 @@ SortMenuColor=color("1,1,1,1") RouletteColor=color("1,0,0,1") RandomColor=color("1,0,0,1") PortalColor=color("1,0,0,1") +EmptyColor=color("1,0,0,1") SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Artist", "SortOrder_Genre" } # SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Popularity", "SortOrder_Artist", "SortOrder_Genre" } diff --git a/src/MusicWheel.cpp b/src/MusicWheel.cpp index 1b5224e21b..e3f2ffb41a 100644 --- a/src/MusicWheel.cpp +++ b/src/MusicWheel.cpp @@ -99,9 +99,10 @@ void MusicWheel::Load( RString sType ) CUSTOM_CHOICES.Load(sType,CUSTOM_WHEEL_ITEM_NAME,vsCustomItemNames); CUSTOM_CHOICE_COLORS.Load(sType,CUSTOM_WHEEL_ITEM_COLOR,vsCustomItemNames); - ROULETTE_COLOR .Load(sType,"RouletteColor"); - RANDOM_COLOR .Load(sType,"RandomColor"); - PORTAL_COLOR .Load(sType,"PortalColor"); + ROULETTE_COLOR .Load(sType,"RouletteColor"); + RANDOM_COLOR .Load(sType,"RandomColor"); + PORTAL_COLOR .Load(sType,"PortalColor"); + EMPTY_COLOR .Load(sType,"EmptyColor"); WheelBase::Load( sType ); @@ -1050,7 +1051,7 @@ void MusicWheel::FilterWheelItemDatas(vector &aUnFilteredD // If we've filtered all items, insert a dummy. if( aFilteredData.empty() ) - aFilteredData.push_back( new MusicWheelItemData(WheelItemDataType_Section, NULL, EMPTY_STRING, NULL, RageColor(1,0,0,1), 0) ); + aFilteredData.push_back( new MusicWheelItemData(WheelItemDataType_Section, NULL, EMPTY_STRING, NULL, EMPTY_COLOR, 0) ); } void MusicWheel::UpdateSwitch() diff --git a/src/MusicWheel.h b/src/MusicWheel.h index 92df2ab07e..1d029afd07 100644 --- a/src/MusicWheel.h +++ b/src/MusicWheel.h @@ -91,6 +91,7 @@ protected: ThemeMetric ROULETTE_COLOR; ThemeMetric RANDOM_COLOR; ThemeMetric PORTAL_COLOR; + ThemeMetric EMPTY_COLOR; vector m_viWheelPositions; ThemeMetric CUSTOM_WHEEL_ITEM_NAMES; ThemeMetricMap CUSTOM_CHOICES;