diff --git a/stepmania/src/GameInput.h b/stepmania/src/GameInput.h index 6725cada8c..8baab6ca35 100644 --- a/stepmania/src/GameInput.h +++ b/stepmania/src/GameInput.h @@ -33,6 +33,7 @@ enum // DanceButtons DANCE_BUTTON_UPLEFT, DANCE_BUTTON_UPRIGHT, DANCE_BUTTON_START, + DANCE_BUTTON_SELECT, DANCE_BUTTON_BACK, DANCE_BUTTON_MENULEFT, DANCE_BUTTON_MENURIGHT, @@ -51,6 +52,7 @@ enum // PumpButtons PUMP_BUTTON_DOWNLEFT, PUMP_BUTTON_DOWNRIGHT, PUMP_BUTTON_START, + PUMP_BUTTON_SELECT, PUMP_BUTTON_BACK, PUMP_BUTTON_MENULEFT, PUMP_BUTTON_MENURIGHT, @@ -71,6 +73,7 @@ enum // EZ2Buttons EZ2_BUTTON_HANDLRLEFT, EZ2_BUTTON_HANDLRRIGHT, EZ2_BUTTON_START, + EZ2_BUTTON_SELECT, EZ2_BUTTON_BACK, EZ2_BUTTON_MENULEFT, EZ2_BUTTON_MENURIGHT, @@ -89,6 +92,7 @@ enum // ParaButtons PARA_BUTTON_UPRIGHT, PARA_BUTTON_RIGHT, PARA_BUTTON_START, + PARA_BUTTON_SELECT, PARA_BUTTON_BACK, PARA_BUTTON_MENULEFT, PARA_BUTTON_MENURIGHT, @@ -110,6 +114,7 @@ enum // 3DDX Buttons DS3DDX_BUTTON_FOOTDOWNRIGHT, DS3DDX_BUTTON_HANDRIGHT, DS3DDX_BUTTON_START, + DS3DDX_BUTTON_SELECT, DS3DDX_BUTTON_BACK, DS3DDX_BUTTON_MENULEFT, DS3DDX_BUTTON_MENURIGHT, @@ -134,6 +139,7 @@ enum // BM Buttons * matching. */ BM_BUTTON_SCRATCHDOWN, BM_BUTTON_START, + BM_BUTTON_SELECT, BM_BUTTON_BACK, BM_BUTTON_MENULEFT, BM_BUTTON_MENURIGHT, @@ -151,6 +157,7 @@ enum // ManiaxButtons MANIAX_BUTTON_HANDLRLEFT, MANIAX_BUTTON_HANDLRRIGHT, MANIAX_BUTTON_START, + MANIAX_BUTTON_SELECT, MANIAX_BUTTON_BACK, MANIAX_BUTTON_MENULEFT, MANIAX_BUTTON_MENURIGHT, @@ -173,6 +180,7 @@ enum // TechnoButtons TECHNO_BUTTON_DOWNLEFT, TECHNO_BUTTON_DOWNRIGHT, TECHNO_BUTTON_START, + TECHNO_BUTTON_SELECT, TECHNO_BUTTON_BACK, TECHNO_BUTTON_MENULEFT, TECHNO_BUTTON_MENURIGHT, @@ -195,6 +203,7 @@ enum // PnM Buttons PNM_BUTTON_RIGHT_YELLOW, PNM_BUTTON_RIGHT_WHITE, PNM_BUTTON_START, + PNM_BUTTON_SELECT, PNM_BUTTON_BACK, PNM_BUTTON_MENULEFT, PNM_BUTTON_MENURIGHT, @@ -216,6 +225,7 @@ enum // LightsButtons LIGHTS_BUTTON_BASS_LEFT, LIGHTS_BUTTON_BASS_RIGHT, LIGHTS_BUTTON_START, + LIGHTS_BUTTON_SELECT, LIGHTS_BUTTON_BACK, LIGHTS_BUTTON_MENULEFT, LIGHTS_BUTTON_MENURIGHT, diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index 17f87f7f63..38a5c974ab 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -119,6 +119,7 @@ Game g_Games[NUM_GAMES] = "UpLeft", "UpRight", "Start", + "Select", "Back", "MenuLeft", "MenuRight", @@ -133,6 +134,7 @@ Game g_Games[NUM_GAMES] = DANCE_BUTTON_MENUUP, // MENU_BUTTON_UP DANCE_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN DANCE_BUTTON_START, // MENU_BUTTON_START + DANCE_BUTTON_SELECT, // MENU_BUTTON_SELECT DANCE_BUTTON_BACK, // MENU_BUTTON_BACK DANCE_BUTTON_COIN, // MENU_BUTTON_COIN DANCE_BUTTON_OPERATOR // MENU_BUTTON_OPERATOR @@ -143,6 +145,7 @@ Game g_Games[NUM_GAMES] = DANCE_BUTTON_UP, // MENU_BUTTON_UP DANCE_BUTTON_DOWN, // MENU_BUTTON_DOWN DANCE_BUTTON_START, // MENU_BUTTON_START + DANCE_BUTTON_SELECT, // MENU_BUTTON_SELECT DANCE_BUTTON_BACK, // MENU_BUTTON_BACK DANCE_BUTTON_COIN, // MENU_BUTTON_COIN DANCE_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR @@ -156,6 +159,7 @@ Game g_Games[NUM_GAMES] = NO_DEFAULT_KEY, // DANCE_BUTTON_UPLEFT, NO_DEFAULT_KEY, // DANCE_BUTTON_UPRIGHT, KEY_ENTER, // DANCE_BUTTON_START, + NO_DEFAULT_KEY, // DANCE_BUTTON_SELECT, KEY_ESC, // DANCE_BUTTON_BACK KEY_DEL, // DANCE_BUTTON_MENULEFT KEY_PGDN, // DANCE_BUTTON_MENURIGHT @@ -172,6 +176,7 @@ Game g_Games[NUM_GAMES] = KEY_KP_C7, // DANCE_BUTTON_UPLEFT, KEY_KP_C9, // DANCE_BUTTON_UPRIGHT, KEY_KP_ENTER, // DANCE_BUTTON_START, + NO_DEFAULT_KEY, // DANCE_BUTTON_SELECT, KEY_NUMLOCK, // DANCE_BUTTON_BACK KEY_KP_SLASH, // DANCE_BUTTON_MENULEFT KEY_KP_ASTERISK, // DANCE_BUTTON_MENURIGHT @@ -199,6 +204,7 @@ Game g_Games[NUM_GAMES] = "DownLeft", "DownRight", "Start", + "Select", "Back", "MenuLeft", "MenuRight", @@ -213,6 +219,7 @@ Game g_Games[NUM_GAMES] = PUMP_BUTTON_MENUUP, // MENU_BUTTON_UP PUMP_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN PUMP_BUTTON_START, // MENU_BUTTON_START + PUMP_BUTTON_SELECT, // MENU_BUTTON_SELECT PUMP_BUTTON_BACK, // MENU_BUTTON_BACK PUMP_BUTTON_COIN, // MENU_BUTTON_COIN PUMP_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR @@ -223,6 +230,7 @@ Game g_Games[NUM_GAMES] = PUMP_BUTTON_UPLEFT, // MENU_BUTTON_UP PUMP_BUTTON_UPRIGHT, // MENU_BUTTON_DOWN PUMP_BUTTON_CENTER, // MENU_BUTTON_START + PUMP_BUTTON_SELECT, // MENU_BUTTON_SELECT PUMP_BUTTON_BACK, // MENU_BUTTON_BACK PUMP_BUTTON_COIN, // MENU_BUTTON_COIN PUMP_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR @@ -235,6 +243,7 @@ Game g_Games[NUM_GAMES] = KEY_Cz, // PUMP_BUTTON_DOWNLEFT, KEY_Cc, // PUMP_BUTTON_DOWNRIGHT, KEY_ENTER, // PUMP_BUTTON_START, + NO_DEFAULT_KEY, // PUMP_BUTTON_SELECT, KEY_ESC, // PUMP_BUTTON_BACK, KEY_LEFT, // PUMP_BUTTON_MENULEFT KEY_RIGHT, // PUMP_BUTTON_MENURIGHT @@ -250,6 +259,7 @@ Game g_Games[NUM_GAMES] = KEY_KP_C1, // PUMP_BUTTON_DOWNLEFT, KEY_KP_C3, // PUMP_BUTTON_DOWNRIGHT, KEY_KP_ENTER, // PUMP_BUTTON_START, + NO_DEFAULT_KEY, // PUMP_BUTTON_SELECT, KEY_NUMLOCK, // PUMP_BUTTON_BACK, NO_DEFAULT_KEY // PUMP_BUTTON_MENULEFT NO_DEFAULT_KEY // PUMP_BUTTON_MENURIGHT @@ -279,6 +289,7 @@ Game g_Games[NUM_GAMES] = "HandLrLeft", "HandLrRight", "Start", + "Select", "Back", "MenuLeft", "MenuRight", @@ -293,6 +304,7 @@ Game g_Games[NUM_GAMES] = EZ2_BUTTON_MENUUP, // MENU_BUTTON_UP EZ2_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN EZ2_BUTTON_START, // MENU_BUTTON_START + EZ2_BUTTON_SELECT, // MENU_BUTTON_SELECT EZ2_BUTTON_BACK, // MENU_BUTTON_BACK EZ2_BUTTON_COIN, // MENU_BUTTON_COIN EZ2_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR @@ -303,6 +315,7 @@ Game g_Games[NUM_GAMES] = EZ2_BUTTON_FOOTUPLEFT, // MENU_BUTTON_UP EZ2_BUTTON_FOOTUPRIGHT, // MENU_BUTTON_DOWN EZ2_BUTTON_FOOTDOWN, // MENU_BUTTON_START + EZ2_BUTTON_SELECT, // MENU_BUTTON_SELECT EZ2_BUTTON_BACK, // MENU_BUTTON_BACK EZ2_BUTTON_COIN, // MENU_BUTTON_COIN EZ2_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR @@ -317,6 +330,7 @@ Game g_Games[NUM_GAMES] = KEY_Cs, // EZ2_BUTTON_HANDLRLEFT, KEY_Cf, // EZ2_BUTTON_HANDLRRIGHT, KEY_ENTER, // EZ2_BUTTON_START, + NO_DEFAULT_KEY, // EZ2_BUTTON_SELECT, KEY_ESC, // EZ2_BUTTON_BACK, KEY_LEFT, // EZ2_BUTTON_MENULEFT KEY_RIGHT, // EZ2_BUTTON_MENURIGHT @@ -334,6 +348,7 @@ Game g_Games[NUM_GAMES] = NO_DEFAULT_KEY, // EZ2_BUTTON_HANDLRLEFT, NO_DEFAULT_KEY, // EZ2_BUTTON_HANDLRRIGHT, NO_DEFAULT_KEY, // EZ2_BUTTON_START, + NO_DEFAULT_KEY, // EZ2_BUTTON_SELECT, NO_DEFAULT_KEY, // EZ2_BUTTON_BACK, NO_DEFAULT_KEY // EZ2_BUTTON_MENULEFT NO_DEFAULT_KEY // EZ2_BUTTON_MENURIGHT @@ -361,6 +376,7 @@ Game g_Games[NUM_GAMES] = "UpRight", "Right", "Start", + "Select", "Back", "MenuLeft", "MenuRight", @@ -375,6 +391,7 @@ Game g_Games[NUM_GAMES] = PARA_BUTTON_MENUUP, // MENU_BUTTON_UP PARA_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN PARA_BUTTON_START, // MENU_BUTTON_START + PARA_BUTTON_SELECT, // MENU_BUTTON_SELECT PARA_BUTTON_BACK, // MENU_BUTTON_BACK PARA_BUTTON_COIN, // MENU_BUTTON_COIN PARA_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR @@ -385,6 +402,7 @@ Game g_Games[NUM_GAMES] = PARA_BUTTON_UPRIGHT, // MENU_BUTTON_UP PARA_BUTTON_UPLEFT, // MENU_BUTTON_DOWN PARA_BUTTON_START, // MENU_BUTTON_START + PARA_BUTTON_SELECT, // MENU_BUTTON_SELECT PARA_BUTTON_BACK, // MENU_BUTTON_BACK PARA_BUTTON_COIN, // MENU_BUTTON_COIN PARA_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR @@ -397,6 +415,7 @@ Game g_Games[NUM_GAMES] = KEY_Cv, // PARA_BUTTON_UPRIGHT, KEY_Cb, // PARA_BUTTON_RIGHT, KEY_ENTER, // PARA_BUTTON_START, + NO_DEFAULT_KEY, // PARA_BUTTON_SELECT, KEY_ESC, // PARA_BUTTON_BACK KEY_LEFT, //no default key // PARA_BUTTON_MENULEFT KEY_RIGHT, //no default key // PARA_BUTTON_MENURIGHT @@ -412,6 +431,7 @@ Game g_Games[NUM_GAMES] = NO_DEFAULT_KEY, // PARA_BUTTON_UPRIGHT, NO_DEFAULT_KEY, // PARA_BUTTON_RIGHT, NO_DEFAULT_KEY, // PARA_BUTTON_START, + NO_DEFAULT_KEY, // PARA_BUTTON_SELECT, NO_DEFAULT_KEY, // PARA_BUTTON_BACK NO_DEFAULT_KEY, // PARA_BUTTON_MENULEFT NO_DEFAULT_KEY, // PARA_BUTTON_MENURIGHT @@ -442,6 +462,7 @@ Game g_Games[NUM_GAMES] = "FootDownRight", "HandRight", "Start", + "Select", "Back", "MenuLeft", "MenuRight", @@ -456,6 +477,7 @@ Game g_Games[NUM_GAMES] = DS3DDX_BUTTON_MENUUP, // MENU_BUTTON_UP DS3DDX_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN DS3DDX_BUTTON_START, // MENU_BUTTON_START + DS3DDX_BUTTON_SELECT, // MENU_BUTTON_SELECT DS3DDX_BUTTON_BACK, // MENU_BUTTON_BACK DS3DDX_BUTTON_COIN, // MENU_BUTTON_COIN DS3DDX_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR @@ -466,6 +488,7 @@ Game g_Games[NUM_GAMES] = DS3DDX_BUTTON_HANDUP, // MENU_BUTTON_UP DS3DDX_BUTTON_HANDDOWN, // MENU_BUTTON_DOWN DS3DDX_BUTTON_START, // MENU_BUTTON_START + DS3DDX_BUTTON_SELECT, // MENU_BUTTON_SELECT DS3DDX_BUTTON_BACK, // MENU_BUTTON_BACK DS3DDX_BUTTON_COIN, // MENU_BUTTON_COIN DS3DDX_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR @@ -481,6 +504,7 @@ Game g_Games[NUM_GAMES] = KEY_Cc, // DS3DDX_BUTTON_FOOTDOWNRIGHT, KEY_Cd, // DS3DDX_BUTTON_HANDRIGHT, KEY_ENTER, // DS3DDX_BUTTON_START, + NO_DEFAULT_KEY, // DS3DDX_BUTTON_SELECT, KEY_ESC, // DS3DDX_BUTTON_BACK KEY_LEFT, //no default key // DS3DDX_BUTTON_MENULEFT KEY_RIGHT, //no default key // DS3DDX_BUTTON_MENURIGHT @@ -499,6 +523,7 @@ Game g_Games[NUM_GAMES] = NO_DEFAULT_KEY, // DS3DDX_BUTTON_FOOTDOWNRIGHT, NO_DEFAULT_KEY, // DS3DDX_BUTTON_HANDRIGHT, NO_DEFAULT_KEY, // DS3DDX_BUTTON_START, + NO_DEFAULT_KEY, // DS3DDX_BUTTON_SELECT, NO_DEFAULT_KEY, // DS3DDX_BUTTON_BACK NO_DEFAULT_KEY, // DS3DDX_BUTTON_MENULEFT NO_DEFAULT_KEY, // DS3DDX_BUTTON_MENURIGHT @@ -530,6 +555,7 @@ Game g_Games[NUM_GAMES] = "Scratch up", "Scratch down", "Start", + "Select", "Back", "MenuLeft", "MenuRight", @@ -544,6 +570,7 @@ Game g_Games[NUM_GAMES] = BM_BUTTON_MENUUP, // MENU_BUTTON_UP BM_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN BM_BUTTON_START, // MENU_BUTTON_START + BM_BUTTON_SELECT, // MENU_BUTTON_SELECT BM_BUTTON_BACK, // MENU_BUTTON_BACK BM_BUTTON_COIN, // MENU_BUTTON_COIN BM_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR @@ -554,6 +581,7 @@ Game g_Games[NUM_GAMES] = BM_BUTTON_SCRATCHUP, // MENU_BUTTON_UP BM_BUTTON_SCRATCHDOWN,// MENU_BUTTON_DOWN BM_BUTTON_START, // MENU_BUTTON_START + BM_BUTTON_SELECT, // MENU_BUTTON_SELECT BM_BUTTON_BACK, // MENU_BUTTON_BACK BM_BUTTON_COIN, // MENU_BUTTON_COIN BM_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR @@ -570,6 +598,7 @@ Game g_Games[NUM_GAMES] = KEY_LSHIFT, // BM_BUTTON_SCRATCHUP, NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHDOWN, KEY_ENTER, // BM_BUTTON_START, + NO_DEFAULT_KEY, // BM_BUTTON_SELECT, KEY_ESC, // BM_BUTTON_BACK, KEY_LEFT, // BM_BUTTON_MENULEFT KEY_RIGHT, // BM_BUTTON_MENURIGHT @@ -589,6 +618,7 @@ Game g_Games[NUM_GAMES] = NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHUP, NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHDOWN, NO_DEFAULT_KEY, // BM_BUTTON_START, + NO_DEFAULT_KEY, // BM_BUTTON_SELECT, NO_DEFAULT_KEY, // BM_BUTTON_BACK, NO_DEFAULT_KEY, // BM_BUTTON_MENULEFT NO_DEFAULT_KEY, // BM_BUTTON_MENURIGHT @@ -615,6 +645,7 @@ Game g_Games[NUM_GAMES] = "HandLrLeft", "HandLrRight", "Start", + "Select", "Back", "MenuLeft", "MenuRight", @@ -629,6 +660,7 @@ Game g_Games[NUM_GAMES] = MANIAX_BUTTON_MENUUP, // MENU_BUTTON_UP MANIAX_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN MANIAX_BUTTON_START, // MENU_BUTTON_START + MANIAX_BUTTON_SELECT, // MENU_BUTTON_SELECT MANIAX_BUTTON_BACK, // MENU_BUTTON_BACK MANIAX_BUTTON_COIN, // MENU_BUTTON_COIN MANIAX_BUTTON_OPERATOR // MENU_BUTTON_OPERATOR @@ -639,6 +671,7 @@ Game g_Games[NUM_GAMES] = MANIAX_BUTTON_HANDLRRIGHT, // MENU_BUTTON_UP MANIAX_BUTTON_HANDLRLEFT, // MENU_BUTTON_DOWN MANIAX_BUTTON_START, // MENU_BUTTON_START + MANIAX_BUTTON_SELECT, // MENU_BUTTON_SELECT MANIAX_BUTTON_BACK, // MENU_BUTTON_BACK MANIAX_BUTTON_COIN, // MENU_BUTTON_COIN MANIAX_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR @@ -650,6 +683,7 @@ Game g_Games[NUM_GAMES] = KEY_Cz, // MANIAX_BUTTON_HANDLRLEFT, KEY_Cx, // MANIAX_BUTTON_HANDLRRIGHT, KEY_ENTER, // MANIAX_BUTTON_START, + NO_DEFAULT_KEY, // MANIAX_BUTTON_SELECT, KEY_ESC, // MANIAX_BUTTON_BACK KEY_LEFT, // MANIAX_BUTTON_MENULEFT KEY_RIGHT, // MANIAX_BUTTON_MENURIGHT @@ -664,6 +698,7 @@ Game g_Games[NUM_GAMES] = KEY_KP_C1, // MANIAX_BUTTON_HANDLRLEFT, KEY_KP_C2, // MANIAX_BUTTON_HANDLRRIGHT, KEY_KP_ENTER, // MANIAX_BUTTON_START, + NO_DEFAULT_KEY, // MANIAX_BUTTON_SELECT, KEY_NUMLOCK, // MANIAX_BUTTON_BACK KEY_KP_SLASH, // MANIAX_BUTTON_MENULEFT KEY_KP_ASTERISK, // MANIAX_BUTTON_MENURIGHT @@ -695,6 +730,7 @@ Game g_Games[NUM_GAMES] = "DownLeft", "DownRight", "Start", + "Select", "Back", "MenuLeft", "MenuRight", @@ -709,6 +745,7 @@ Game g_Games[NUM_GAMES] = TECHNO_BUTTON_MENUUP, // MENU_BUTTON_UP TECHNO_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN TECHNO_BUTTON_START, // MENU_BUTTON_START + TECHNO_BUTTON_SELECT, // MENU_BUTTON_SELECT TECHNO_BUTTON_BACK, // MENU_BUTTON_BACK TECHNO_BUTTON_COIN, // MENU_BUTTON_COIN TECHNO_BUTTON_OPERATOR // MENU_BUTTON_OPERATOR @@ -719,6 +756,7 @@ Game g_Games[NUM_GAMES] = TECHNO_BUTTON_UP, // MENU_BUTTON_UP TECHNO_BUTTON_DOWN, // MENU_BUTTON_DOWN TECHNO_BUTTON_START, // MENU_BUTTON_START + TECHNO_BUTTON_SELECT, // MENU_BUTTON_SELECT TECHNO_BUTTON_BACK, // MENU_BUTTON_BACK TECHNO_BUTTON_COIN, // MENU_BUTTON_COIN TECHNO_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR @@ -735,6 +773,7 @@ Game g_Games[NUM_GAMES] = KEY_Cz, // TECHNO_BUTTON_DOWNLEFT, KEY_Cc, // TECHNO_BUTTON_DOWNRIGHT, KEY_ENTER, // TECHNO_BUTTON_START, + NO_DEFAULT_KEY, // TECHNO_BUTTON_SELECT, KEY_ESC, // TECHNO_BUTTON_BACK KEY_LEFT, // TECHNO_BUTTON_MENULEFT KEY_RIGHT, // TECHNO_BUTTON_MENURIGHT @@ -754,6 +793,7 @@ Game g_Games[NUM_GAMES] = KEY_KP_C1, // TECHNO_BUTTON_DOWNLEFT, KEY_KP_C3, // TECHNO_BUTTON_DOWNRIGHT, KEY_KP_ENTER, // TECHNO_BUTTON_START, + NO_DEFAULT_KEY, // TECHNO_BUTTON_SELECT, KEY_NUMLOCK, // TECHNO_BUTTON_BACK KEY_KP_SLASH, // TECHNO_BUTTON_MENULEFT KEY_KP_ASTERISK, // TECHNO_BUTTON_MENURIGHT @@ -786,6 +826,7 @@ Game g_Games[NUM_GAMES] = "Right White", "Back", "Start", + "Select", "MenuLeft", "MenuRight", "MenuUp", @@ -799,6 +840,7 @@ Game g_Games[NUM_GAMES] = PNM_BUTTON_MENUUP, // MENU_BUTTON_UP PNM_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN PNM_BUTTON_START, // MENU_BUTTON_START + PNM_BUTTON_SELECT, // MENU_BUTTON_SELECT PNM_BUTTON_BACK, // MENU_BUTTON_BACK PNM_BUTTON_COIN, // MENU_BUTTON_COIN PNM_BUTTON_OPERATOR // MENU_BUTTON_OPERATOR @@ -809,6 +851,7 @@ Game g_Games[NUM_GAMES] = PNM_BUTTON_LEFT_YELLOW, PNM_BUTTON_RIGHT_YELLOW, PNM_BUTTON_RED, + PNM_BUTTON_SELECT, // MENU_BUTTON_SELECT PNM_BUTTON_BACK, PNM_BUTTON_COIN, // MENU_BUTTON_COIN PNM_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR @@ -825,6 +868,7 @@ Game g_Games[NUM_GAMES] = KEY_Cg, // PNM_BUTTON_RIGHT_YELLOW, KEY_Cb, // PNM_BUTTON_RIGHT_WHITE, KEY_ENTER, // PNM_BUTTON_MENUSTART + NO_DEFAULT_KEY, // PNM_BUTTON_SELECT, KEY_ESC, // PNM_BUTTON_MENUBACK KEY_LEFT, // PNM_BUTTON_MENULEFT, KEY_RIGHT, // PNM_BUTTON_MENURIGHT, @@ -844,6 +888,7 @@ Game g_Games[NUM_GAMES] = NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHUP, NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHDOWN, NO_DEFAULT_KEY, // BM_BUTTON_START, + NO_DEFAULT_KEY, // PNM_BUTTON_SELECT, NO_DEFAULT_KEY, // BM_BUTTON_BACK, NO_DEFAULT_KEY, // BM_BUTTON_MENULEFT NO_DEFAULT_KEY, // BM_BUTTON_MENURIGHT @@ -874,6 +919,7 @@ Game g_Games[NUM_GAMES] = "BassLeft", "BassRight", "Start", + "Select", "Back", "MenuLeft", "MenuRight", @@ -888,6 +934,7 @@ Game g_Games[NUM_GAMES] = LIGHTS_BUTTON_MENUUP, // MENU_BUTTON_UP LIGHTS_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN LIGHTS_BUTTON_START, // MENU_BUTTON_START + LIGHTS_BUTTON_SELECT, // MENU_BUTTON_SELECT LIGHTS_BUTTON_BACK, // MENU_BUTTON_BACK LIGHTS_BUTTON_COIN, // MENU_BUTTON_COIN LIGHTS_BUTTON_OPERATOR // MENU_BUTTON_OPERATOR @@ -898,6 +945,7 @@ Game g_Games[NUM_GAMES] = LIGHTS_BUTTON_MARQUEE_LR_LEFT, // MENU_BUTTON_UP LIGHTS_BUTTON_MARQUEE_LR_RIGHT, // MENU_BUTTON_DOWN LIGHTS_BUTTON_START, // MENU_BUTTON_START + LIGHTS_BUTTON_SELECT, // MENU_BUTTON_SELECT LIGHTS_BUTTON_BACK, // MENU_BUTTON_BACK LIGHTS_BUTTON_COIN, // MENU_BUTTON_COIN LIGHTS_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR @@ -913,6 +961,7 @@ Game g_Games[NUM_GAMES] = KEY_Cu, // LIGHTS_BUTTON_BASS_LEFT, KEY_Ci, // LIGHTS_BUTTON_BASS_RIGHT, KEY_ENTER, // LIGHTS_BUTTON_START, + NO_DEFAULT_KEY, // LIGHTS_BUTTON_SELECT, KEY_ESC, // LIGHTS_BUTTON_BACK KEY_DEL, // LIGHTS_BUTTON_MENULEFT KEY_PGDN, // LIGHTS_BUTTON_MENURIGHT @@ -931,6 +980,7 @@ Game g_Games[NUM_GAMES] = NO_DEFAULT_KEY, // LIGHTS_BUTTON_BASS_LEFT, NO_DEFAULT_KEY, // LIGHTS_BUTTON_BASS_RIGHT, NO_DEFAULT_KEY, // LIGHTS_BUTTON_START, + NO_DEFAULT_KEY, // LIGHTS_BUTTON_SELECT, NO_DEFAULT_KEY, // LIGHTS_BUTTON_BACK NO_DEFAULT_KEY, // LIGHTS_BUTTON_MENULEFT NO_DEFAULT_KEY, // LIGHTS_BUTTON_MENURIGHT @@ -2730,6 +2780,7 @@ CString GameManager::GetMenuButtonSecondaryFunction( const Game *pGame, GameButt "MenuUp", "MenuDown", "MenuStart", + "MenuSelect", "MenuBack", "Coin", "Operator" diff --git a/stepmania/src/MenuInput.h b/stepmania/src/MenuInput.h index 639e434a5c..f9208a0bd9 100644 --- a/stepmania/src/MenuInput.h +++ b/stepmania/src/MenuInput.h @@ -12,6 +12,7 @@ enum MenuButton MENU_BUTTON_UP, MENU_BUTTON_DOWN, MENU_BUTTON_START, + MENU_BUTTON_SELECT, MENU_BUTTON_BACK, MENU_BUTTON_COIN, MENU_BUTTON_OPERATOR,