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

GameButton_Invalid

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-27 04:44:15 +00:00
parent 6e6ea7971d
commit 7d2a424626
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/CodeDetector.cpp
+1 -1
View File
@@ -133,7 +133,7 @@ bool CodeItem::Load( RString sButtonsNames )
// Search for the corresponding GameButton // Search for the corresponding GameButton
const GameButton gb = pGame->ButtonNameToIndex( sButtonName ); const GameButton gb = pGame->ButtonNameToIndex( sButtonName );
if( gb == GAME_BUTTON_INVALID ) if( gb == GameButton_Invalid )
{ {
LOG->Trace( "The code '%s' contains an unrecognized button '%s'.", sButtonsNames.c_str(), sButtonName.c_str() ); LOG->Trace( "The code '%s' contains an unrecognized button '%s'.", sButtonsNames.c_str(), sButtonName.c_str() );
buttons.clear(); buttons.clear();
stepmania/src/Game.cpp
+2 -2
View File
@@ -9,7 +9,7 @@
int Game::GetNumGameplayButtons() const int Game::GetNumGameplayButtons() const
{ {
int iIndexOfStart = ButtonNameToIndex( "Start" ); int iIndexOfStart = ButtonNameToIndex( "Start" );
ASSERT( iIndexOfStart != GAME_BUTTON_INVALID ); ASSERT( iIndexOfStart != GameButton_Invalid );
return iIndexOfStart; return iIndexOfStart;
} }
@@ -19,7 +19,7 @@ GameButton Game::ButtonNameToIndex( const RString &sButtonName ) const
if( stricmp(m_szButtonNames[i], sButtonName) == 0 ) if( stricmp(m_szButtonNames[i], sButtonName) == 0 )
return i; return i;
return GAME_BUTTON_INVALID; return GameButton_Invalid;
} }
MenuButton Game::GameInputToMenuButton( GameInput GameI ) const MenuButton Game::GameInputToMenuButton( GameInput GameI ) const
stepmania/src/GameInput.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ GameButton StringToGameButton( const Game* pGame, const RString& s )
if( s == GameButtonToString(pGame,(GameButton)i) ) if( s == GameButtonToString(pGame,(GameButton)i) )
return (GameButton)i; return (GameButton)i;
} }
return GAME_BUTTON_INVALID; return GameButton_Invalid;
} }
stepmania/src/GameInput.h
+3 -3
View File
@@ -22,7 +22,7 @@ RString GameButtonToLocalizedString( const Game* pGame, GameButton i );
GameButton StringToGameButton( const Game* pGame, const RString& s ); GameButton StringToGameButton( const Game* pGame, const RString& s );
const GameButton NUM_GameButton = 20; const GameButton NUM_GameButton = 20;
const GameButton GAME_BUTTON_INVALID = NUM_GameButton+1; const GameButton GameButton_Invalid = NUM_GameButton+1;
#define FOREACH_GameButton( gb ) FOREACH_ENUM( GameButton, NUM_GameButton, gb ) #define FOREACH_GameButton( gb ) FOREACH_ENUM( GameButton, NUM_GameButton, gb )
enum // DanceButtons enum // DanceButtons
@@ -240,7 +240,7 @@ enum // LightsButtons
struct GameInput struct GameInput
{ {
GameInput(): controller(GameController_Invalid), button(GAME_BUTTON_INVALID) { } GameInput(): controller(GameController_Invalid), button(GameButton_Invalid) { }
GameInput( GameController c, GameButton b ): controller(c), button(b) { } GameInput( GameController c, GameButton b ): controller(c), button(b) { }
@@ -258,7 +258,7 @@ struct GameInput
} }
inline bool IsValid() const { return controller != GameController_Invalid; }; inline bool IsValid() const { return controller != GameController_Invalid; };
inline void MakeInvalid() { controller = GameController_Invalid; button = GAME_BUTTON_INVALID; }; inline void MakeInvalid() { controller = GameController_Invalid; button = GameButton_Invalid; };
RString ToString( const Game* pGame ) const; RString ToString( const Game* pGame ) const;
bool FromString( const Game* pGame, const RString &s ); bool FromString( const Game* pGame, const RString &s );
stepmania/src/LightsManager.cpp
+1 -1
View File
@@ -465,7 +465,7 @@ void LightsManager::GetFirstLitGameButtonLight( GameController &gcOut, GameButto
} }
} }
gcOut = GameController_Invalid; gcOut = GameController_Invalid;
gbOut = GAME_BUTTON_INVALID; gbOut = GameButton_Invalid;
} }
bool LightsManager::IsEnabled() const bool LightsManager::IsEnabled() const
stepmania/src/Style.h
+1 -1
View File
@@ -47,7 +47,7 @@ public:
/* This maps from game inputs to columns. More than one button may map to a /* This maps from game inputs to columns. More than one button may map to a
* single column. */ * single column. */
enum { NO_MAPPING = -1, END_MAPPING = -2 }; enum { NO_MAPPING = -1, END_MAPPING = -2 };
int m_iInputColumn[NUM_GameController][NUM_GameButton]; // maps each input to a column, or GAME_BUTTON_INVALID int m_iInputColumn[NUM_GameController][NUM_GameButton]; // maps each input to a column, or GameButton_Invalid
int m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; int m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
bool m_bNeedsZoomOutWith2Players; bool m_bNeedsZoomOutWith2Players;
bool m_bCanUseBeginnerHelper; bool m_bCanUseBeginnerHelper;