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

don't show random/roulette in non-preferred sorts

Browse Source
This commit is contained in:
Chris Danford
2005-01-13 09:56:41 +00:00
parent 725f515adc
commit 4799c3414b
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+4 -3
View File
@@ -505,7 +505,7 @@ NonPresenceP2X=SCREEN_CENTER_X+448
NonPresenceP2Y=SCREEN_CENTER_Y+0 NonPresenceP2Y=SCREEN_CENTER_Y+0
NonPresenceP2OnCommand=x,768;sleep,0.5;linear,1.0;x,607 NonPresenceP2OnCommand=x,768;sleep,0.5;linear,1.0;x,607
NonPresenceP2OffCommand= NonPresenceP2OffCommand=
DefaultSort=Group DefaultSort=Preferred
FOV=0 FOV=0
FOVCenterX=SCREEN_CENTER_X+0 FOVCenterX=SCREEN_CENTER_X+0
FOVCenterY=SCREEN_CENTER_Y+0 FOVCenterY=SCREEN_CENTER_Y+0
@@ -2421,8 +2421,9 @@ Use3D=0
Wheel3DRadius=200 # Possibly safe defaults? Wheel3DRadius=200 # Possibly safe defaults?
CirclePercent=0.5 CirclePercent=0.5
MostPlayedSongsToShow=30 MostPlayedSongsToShow=30
SortMenuChoiceNames=Group,Title,Bpm,Popularity,TopGrade,Artist,EasyMeter,MediumMeter,HardMeter SortMenuChoiceNames=Preferred,Group,Title,Bpm,Popularity,TopGrade,Artist,EasyMeter,MediumMeter,HardMeter
ModeMenuChoiceNames=Group ModeMenuChoiceNames=Preferred
ChoicePreferred=name,PREFERRED;sort,Preferred
ChoiceGroup=name,GROUP;sort,Group ChoiceGroup=name,GROUP;sort,Group
ChoiceTitle=name,TITLE;sort,Title ChoiceTitle=name,TITLE;sort,Title
ChoiceBpm=name,BPM;sort,BPM ChoiceBpm=name,BPM;sort,BPM
stepmania/src/MusicWheel.cpp
+5 -2
View File
@@ -463,10 +463,13 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
switch( so ) switch( so )
{ {
case SORT_PREFERRED: case SORT_PREFERRED:
case SORT_ROULETTE:
SongUtil::SortSongPointerArrayByGroupAndDifficulty( arraySongs ); SongUtil::SortSongPointerArrayByGroupAndDifficulty( arraySongs );
bUseSections = false; bUseSections = false;
break; break;
case SORT_ROULETTE:
// don't sort. We shuffle once this is chosen.
bUseSections = false;
break;
case SORT_GROUP: case SORT_GROUP:
SongUtil::SortSongPointerArrayByGroupAndTitle( arraySongs ); SongUtil::SortSongPointerArrayByGroupAndTitle( arraySongs );
bUseSections = GAMESTATE->m_sPreferredSongGroup == GROUP_ALL_MUSIC; bUseSections = GAMESTATE->m_sPreferredSongGroup == GROUP_ALL_MUSIC;
@@ -555,7 +558,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
} }
} }
if( so != SORT_ROULETTE ) if( so == SORT_PREFERRED )
{ {
if( SHOW_ROULETTE ) if( SHOW_ROULETTE )
arrayWheelItemDatas.push_back( WheelItemData(TYPE_ROULETTE, NULL, "", NULL, RageColor(1,0,0,1)) ); arrayWheelItemDatas.push_back( WheelItemData(TYPE_ROULETTE, NULL, "", NULL, RageColor(1,0,0,1)) );