sort update

This commit is contained in:
Glenn Maynard
2005-01-29 21:04:08 +00:00
parent 8d48438c15
commit 9e0d0e0763
3 changed files with 5 additions and 18 deletions
+5 -8
View File
@@ -2328,8 +2328,7 @@ Use3D=0
Wheel3DRadius=200 # Possibly safe defaults? Wheel3DRadius=200 # Possibly safe defaults?
CirclePercent=0.5 CirclePercent=0.5
MostPlayedSongsToShow=30 MostPlayedSongsToShow=30
SortMenuChoiceNames=Preferred,Group,Title,Bpm,Popularity,TopGrade,Artist,EasyMeter,MediumMeter,HardMeter ModeMenuChoiceNames=Preferred,Group,Title,Bpm,Popularity,TopGrade,Artist,EasyMeter,MediumMeter,HardMeter
ModeMenuChoiceNames=Preferred
ChoicePreferred=name,PREFERRED;sort,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
@@ -2712,10 +2711,8 @@ NextSort1=MenuLeft-MenuRight-Start
NextSort2=MenuLeft+MenuRight NextSort2=MenuLeft+MenuRight
NextSort3=Left-Right-Start NextSort3=Left-Right-Start
NextSort4=Left+Right NextSort4=Left+Right
SortMenu1=Up,Down,Up,Down ModeMenu1=Up,Down,Up,Down
SortMenu2=MenuUp,MenuDown,MenuUp,MenuDown ModeMenu2=MenuUp,MenuDown,MenuUp,MenuDown
ModeMenu1=
ModeMenu2=
Mirror=Up,Left,Right,Left,Right Mirror=Up,Left,Right,Left,Right
Left=Up,Down,Right,Left Left=Up,Down,Right,Left
Right=Up,Down,Left,Right Right=Up,Down,Left,Right
@@ -2753,8 +2750,8 @@ NextSort1=
NextSort2= NextSort2=
NextSort3= NextSort3=
NextSort4= NextSort4=
SortMenu1= ModeMenu1=
SortMenu2= ModeMenu2=
[GrooveRadar] [GrooveRadar]
Label1OffsetX=0 Label1OffsetX=0
-7
View File
@@ -21,8 +21,6 @@ const CString g_sCodeNames[CodeDetector::NUM_CODES] = {
"NextSort2", "NextSort2",
"NextSort3", "NextSort3",
"NextSort4", "NextSort4",
"SortMenu1",
"SortMenu2",
"ModeMenu1", "ModeMenu1",
"ModeMenu2", "ModeMenu2",
"Mirror", "Mirror",
@@ -204,11 +202,6 @@ bool CodeDetector::EnteredNextSort( GameController controller )
EnteredCode(controller,CODE_NEXT_SORT4); EnteredCode(controller,CODE_NEXT_SORT4);
} }
bool CodeDetector::EnteredSortMenu( GameController controller )
{
return EnteredCode(controller,CODE_SORT_MENU1) || EnteredCode(controller,CODE_SORT_MENU2);
}
bool CodeDetector::EnteredModeMenu( GameController controller ) bool CodeDetector::EnteredModeMenu( GameController controller )
{ {
return EnteredCode(controller,CODE_MODE_MENU1) || EnteredCode(controller,CODE_MODE_MENU2); return EnteredCode(controller,CODE_MODE_MENU1) || EnteredCode(controller,CODE_MODE_MENU2);
-3
View File
@@ -35,8 +35,6 @@ public:
CODE_NEXT_SORT2, CODE_NEXT_SORT2,
CODE_NEXT_SORT3, CODE_NEXT_SORT3,
CODE_NEXT_SORT4, CODE_NEXT_SORT4,
CODE_SORT_MENU1,
CODE_SORT_MENU2,
CODE_MODE_MENU1, CODE_MODE_MENU1,
CODE_MODE_MENU2, CODE_MODE_MENU2,
CODE_MIRROR, CODE_MIRROR,
@@ -76,7 +74,6 @@ public:
static bool EnteredEasierDifficulty( GameController controller ); static bool EnteredEasierDifficulty( GameController controller );
static bool EnteredHarderDifficulty( GameController controller ); static bool EnteredHarderDifficulty( GameController controller );
static bool EnteredNextSort( GameController controller ); static bool EnteredNextSort( GameController controller );
static bool EnteredSortMenu( GameController controller );
static bool EnteredModeMenu( GameController controller ); static bool EnteredModeMenu( GameController controller );
static bool DetectAndAdjustMusicOptions( GameController controller ); static bool DetectAndAdjustMusicOptions( GameController controller );
static bool EnteredCode( GameController controller, Code code ); static bool EnteredCode( GameController controller, Code code );