diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 8a01f08d25..5ef8fe38b0 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -2738,6 +2738,7 @@ ShowRandom=1 Use3D=0 Wheel3DRadius=200 # Possibly safe defaults? CirclePercent=0.5 +MostPlayedSongsToShow=30 SortMenuNames=GROUP:TITLE:BPM:PLAYERS' BEST:TOP GRADE:ARTIST:EASY METER:MEDIUM METER:HARD METER SortMenuActions=sort,GROUP:sort,TITLE:sort,BPM:sort,PLAYERS BEST:sort,TOP GRADE:sort,ARTIST:sort,EASY METER:sort,MEDIUM METER:sort,HARD METER ModeMenuNames=GROUP diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index de45f82db3..dedde8ec7d 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -56,6 +56,7 @@ CachedThemeMetricF CIRCLE_PERCENT ("MusicWheel","CirclePercent"); CachedThemeMetricB USE_3D ("MusicWheel","Use3D"); CachedThemeMetricI NUM_WHEEL_ITEMS_METRIC ("MusicWheel","NumWheelItems"); #define NUM_WHEEL_ITEMS min( MAX_WHEEL_ITEMS, (int) NUM_WHEEL_ITEMS_METRIC ) +#define MOST_PLAYED_SONGS_TO_SHOW THEME->GetMetricI("MusicWheel","MostPlayedSongsToShow") #define SORT_MENU_NAMES THEME->GetMetric ("MusicWheel","SortMenuNames") #define SORT_MENU_ACTIONS THEME->GetMetric ("MusicWheel","SortMenuActions") #define MODE_MENU_NAMES THEME->GetMetric ("MusicWheel","ModeMenuNames") @@ -474,7 +475,8 @@ void MusicWheel::BuildWheelItemDatas( vector &arrayWheelItemDatas const vector arrayAllSongs = SONGMAN->GetBestSongs(); - for ( i=0; arraySongs.size() < 30 && i < arrayAllSongs.size(); i++ ) + const unsigned SongsToShow = MOST_PLAYED_SONGS_TO_SHOW; + for ( i=0; arraySongs.size() < SongsToShow && i < arrayAllSongs.size(); i++ ) { // weed out songs that require more songs than are available Song *pSong = arrayAllSongs[i];