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

merge code for common GameButtons

Browse Source
This commit is contained in:
Glenn Maynard
2007-01-11 06:31:48 +00:00
parent 606daa7808
commit 59da84966f
3 changed files with 15 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/InputMapper.cpp
+15 -2
View File
@@ -24,6 +24,19 @@ namespace
InputMapper* INPUTMAPPER = NULL; // global and accessable from anywhere in our program
static GameButton g_DedicatedMenuButtons[NUM_MenuButton] =
{
GAME_BUTTON_MENULEFT, // MENU_BUTTON_LEFT
GAME_BUTTON_MENURIGHT, // MENU_BUTTON_RIGHT
GAME_BUTTON_MENUUP, // MENU_BUTTON_UP
GAME_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN
GAME_BUTTON_START, // MENU_BUTTON_START
GAME_BUTTON_SELECT, // MENU_BUTTON_SELECT
GAME_BUTTON_BACK, // MENU_BUTTON_BACK
GAME_BUTTON_COIN, // MENU_BUTTON_COIN
GAME_BUTTON_OPERATOR // MENU_BUTTON_OPERATOR
};
InputMapper::InputMapper()
{
g_JoinControllers = PLAYER_INVALID;
@@ -927,7 +940,7 @@ GameButton InputScheme::ButtonNameToIndex( const RString &sButtonName ) const
MenuButton InputScheme::GameInputToMenuButton( GameInput GameI ) const
{
FOREACH_MenuButton(i)
if( m_DedicatedMenuButton[i] == GameI.button )
if( g_DedicatedMenuButtons[i] == GameI.button )
return i;
if( !PREFSMAN->m_bOnlyDedicatedMenuButtons )
@@ -960,7 +973,7 @@ void InputScheme::MenuButtonToGameInputs( MenuButton MenuI, PlayerNumber pn, Gam
controller.push_back( (GameController)pn );
}
GameButton button[2] = { m_DedicatedMenuButton[MenuI], m_SecondaryMenuButton[MenuI] };
GameButton button[2] = { g_DedicatedMenuButtons[MenuI], m_SecondaryMenuButton[MenuI] };
int iNumButtonsUsing = PREFSMAN->m_bOnlyDedicatedMenuButtons ? 1 : 2;
int iOut = 0;