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

rename "AllSorts" code to "Menu"

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+2 -2
View File
@@ -2025,8 +2025,8 @@ Harder1=Down,Down
Harder2=MenuDown,MenuDown Harder2=MenuDown,MenuDown
NextSort1=MenuLeft-MenuRight-Start NextSort1=MenuLeft-MenuRight-Start
NextSort2=MenuLeft+MenuRight NextSort2=MenuLeft+MenuRight
AllSorts1=Up,Down,Up,Down Menu1=Up,Down,Up,Down
AllSorts2=MenuUp,MenuDown,MenuUp,MenuDown Menu2=MenuUp,MenuDown,MenuUp,MenuDown
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
stepmania/src/CodeDetector.cpp
+4 -4
View File
@@ -29,8 +29,8 @@ const CString g_sCodeNames[CodeDetector::NUM_CODES] = {
"Harder2", "Harder2",
"NextSort1", "NextSort1",
"NextSort2", "NextSort2",
"AllSorts1", "Menu1",
"AllSorts2", "Menu2",
"Mirror", "Mirror",
"Left", "Left",
"Right", "Right",
@@ -209,9 +209,9 @@ bool CodeDetector::EnteredNextSort( GameController controller )
return EnteredCode(controller,CODE_NEXT_SORT1) || EnteredCode(controller,CODE_NEXT_SORT2); 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; #define TOGGLE(v,a,b) if(v!=a) v=a; else v=b;
stepmania/src/CodeDetector.h
+3 -3
View File
@@ -23,8 +23,8 @@ public:
CODE_HARDER2, CODE_HARDER2,
CODE_NEXT_SORT1, CODE_NEXT_SORT1,
CODE_NEXT_SORT2, CODE_NEXT_SORT2,
CODE_ALL_SORTS1, CODE_MENU1,
CODE_ALL_SORTS2, CODE_MENU2,
CODE_MIRROR, CODE_MIRROR,
CODE_LEFT, CODE_LEFT,
CODE_RIGHT, CODE_RIGHT,
@@ -59,7 +59,7 @@ 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 EnteredAllSorts( GameController controller ); static bool EnteredMenu( 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 );
static bool EnteredNextBannerGroup( GameController controller ); static bool EnteredNextBannerGroup( GameController controller );
stepmania/src/ScreenSelectMusic.cpp
+1 -1
View File
@@ -699,7 +699,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
HarderDifficulty( pn ); HarderDifficulty( pn );
return; return;
} }
if( CodeDetector::EnteredAllSorts(GameI.controller) ) if( CodeDetector::EnteredMenu(GameI.controller) )
{ {
if( ( GAMESTATE->IsExtraStage() && !PREFSMAN->m_bPickExtraStage ) || GAMESTATE->IsExtraStage2() ) if( ( GAMESTATE->IsExtraStage() && !PREFSMAN->m_bPickExtraStage ) || GAMESTATE->IsExtraStage2() )
m_soundLocked.Play(); m_soundLocked.Play();