diff --git a/stepmania/src/CodeDetector.cpp b/stepmania/src/CodeDetector.cpp index dffa3da208..223f989372 100644 --- a/stepmania/src/CodeDetector.cpp +++ b/stepmania/src/CodeDetector.cpp @@ -11,10 +11,10 @@ #include "InputEventPlus.h" const char *CodeNames[] = { - "Easier1", - "Easier2", - "Harder1", - "Harder2", + "PrevSteps1", + "PrevSteps2", + "NextSteps1", + "NextSteps2", "NextSort1", "NextSort2", "NextSort3", @@ -80,14 +80,14 @@ bool CodeDetector::EnteredNextBannerGroup( GameController controller ) return EnteredCode(controller,CODE_BW_NEXT_GROUP) || EnteredCode(controller,CODE_BW_NEXT_GROUP2); } -bool CodeDetector::EnteredEasierDifficulty( GameController controller ) +bool CodeDetector::EnteredPrevSteps( GameController controller ) { - return EnteredCode(controller,CODE_EASIER1) || EnteredCode(controller,CODE_EASIER2); + return EnteredCode(controller,Code_PrevSteps1) || EnteredCode(controller,Code_PrevSteps2); } -bool CodeDetector::EnteredHarderDifficulty( GameController controller ) +bool CodeDetector::EnteredNextSteps( GameController controller ) { - return EnteredCode(controller,CODE_HARDER1) || EnteredCode(controller,CODE_HARDER2); + return EnteredCode(controller,Code_NextSteps1) || EnteredCode(controller,Code_NextSteps2); } bool CodeDetector::EnteredNextSort( GameController controller ) diff --git a/stepmania/src/CodeDetector.h b/stepmania/src/CodeDetector.h index 1e8e8353f6..f13e32c2f7 100644 --- a/stepmania/src/CodeDetector.h +++ b/stepmania/src/CodeDetector.h @@ -6,10 +6,10 @@ #include "GameInput.h" enum Code { - CODE_EASIER1, - CODE_EASIER2, - CODE_HARDER1, - CODE_HARDER2, + Code_PrevSteps1, + Code_PrevSteps2, + Code_NextSteps1, + Code_NextSteps2, CODE_NEXT_SORT1, CODE_NEXT_SORT2, CODE_NEXT_SORT3, @@ -52,8 +52,8 @@ class CodeDetector { public: static void RefreshCacheItems( RString sClass="" ); // call this before checking codes, but call infrequently - static bool EnteredEasierDifficulty( GameController controller ); - static bool EnteredHarderDifficulty( GameController controller ); + static bool EnteredPrevSteps( GameController controller ); + static bool EnteredNextSteps( GameController controller ); static bool EnteredNextSort( GameController controller ); static bool EnteredModeMenu( GameController controller ); static bool DetectAndAdjustMusicOptions( GameController controller );