rename "AllSorts" code to "Menu"

This commit is contained in:
Chris Danford
2003-12-02 09:15:35 +00:00
parent 2dc6cb9099
commit ddd9b78af5
4 changed files with 10 additions and 10 deletions
+2 -2
View File
@@ -2025,8 +2025,8 @@ Harder1=Down,Down
Harder2=MenuDown,MenuDown
NextSort1=MenuLeft-MenuRight-Start
NextSort2=MenuLeft+MenuRight
AllSorts1=Up,Down,Up,Down
AllSorts2=MenuUp,MenuDown,MenuUp,MenuDown
Menu1=Up,Down,Up,Down
Menu2=MenuUp,MenuDown,MenuUp,MenuDown
Mirror=Up,Left,Right,Left,Right
Left=Up,Down,Right,Left
Right=Up,Down,Left,Right
+4 -4
View File
@@ -29,8 +29,8 @@ const CString g_sCodeNames[CodeDetector::NUM_CODES] = {
"Harder2",
"NextSort1",
"NextSort2",
"AllSorts1",
"AllSorts2",
"Menu1",
"Menu2",
"Mirror",
"Left",
"Right",
@@ -209,9 +209,9 @@ bool CodeDetector::EnteredNextSort( GameController controller )
return EnteredCode(controller,CODE_NEXT_SORT1) || EnteredCode(controller,CODE_NEXT_SORT2);
}
bool CodeDetector::EnteredAllSorts( GameController controller )
bool CodeDetector::EnteredMenu( GameController controller )
{
return EnteredCode(controller,CODE_ALL_SORTS1) || EnteredCode(controller,CODE_ALL_SORTS2);
return EnteredCode(controller,CODE_MENU1) || EnteredCode(controller,CODE_MENU2);
}
#define TOGGLE(v,a,b) if(v!=a) v=a; else v=b;
+3 -3
View File
@@ -23,8 +23,8 @@ public:
CODE_HARDER2,
CODE_NEXT_SORT1,
CODE_NEXT_SORT2,
CODE_ALL_SORTS1,
CODE_ALL_SORTS2,
CODE_MENU1,
CODE_MENU2,
CODE_MIRROR,
CODE_LEFT,
CODE_RIGHT,
@@ -59,7 +59,7 @@ public:
static bool EnteredEasierDifficulty( GameController controller );
static bool EnteredHarderDifficulty( GameController controller );
static bool EnteredNextSort( GameController controller );
static bool EnteredAllSorts( GameController controller );
static bool EnteredMenu( GameController controller );
static bool DetectAndAdjustMusicOptions( GameController controller );
static bool EnteredCode( GameController controller, Code code );
static bool EnteredNextBannerGroup( GameController controller );
+1 -1
View File
@@ -699,7 +699,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
HarderDifficulty( pn );
return;
}
if( CodeDetector::EnteredAllSorts(GameI.controller) )
if( CodeDetector::EnteredMenu(GameI.controller) )
{
if( ( GAMESTATE->IsExtraStage() && !PREFSMAN->m_bPickExtraStage ) || GAMESTATE->IsExtraStage2() )
m_soundLocked.Play();