diff --git a/stepmania/src/GameInput.h b/stepmania/src/GameInput.h index 12b09b3835..dd7981f6b3 100644 --- a/stepmania/src/GameInput.h +++ b/stepmania/src/GameInput.h @@ -33,18 +33,23 @@ const GameButton NUM_GameButton = 20; const GameButton GameButton_Invalid = NUM_GameButton+1; #define FOREACH_GameButton( gb ) FOREACH_ENUM( GameButton, gb ) +enum // common GameButtons +{ + GAME_BUTTON_MENULEFT, + GAME_BUTTON_MENURIGHT, + GAME_BUTTON_MENUUP, + GAME_BUTTON_MENUDOWN, + GAME_BUTTON_START, + GAME_BUTTON_SELECT, + GAME_BUTTON_BACK, + GAME_BUTTON_COIN, + GAME_BUTTON_OPERATOR, + GAME_BUTTON_NEXT +}; + enum // DanceButtons { - DANCE_BUTTON_START, - DANCE_BUTTON_SELECT, - DANCE_BUTTON_BACK, - DANCE_BUTTON_MENULEFT, - DANCE_BUTTON_MENURIGHT, - DANCE_BUTTON_MENUUP, - DANCE_BUTTON_MENUDOWN, - DANCE_BUTTON_COIN, - DANCE_BUTTON_OPERATOR, - DANCE_BUTTON_LEFT, + DANCE_BUTTON_LEFT = GAME_BUTTON_NEXT, DANCE_BUTTON_RIGHT, DANCE_BUTTON_UP, DANCE_BUTTON_DOWN, @@ -55,16 +60,7 @@ enum // DanceButtons enum // PumpButtons { - PUMP_BUTTON_START, - PUMP_BUTTON_SELECT, - PUMP_BUTTON_BACK, - PUMP_BUTTON_MENULEFT, - PUMP_BUTTON_MENURIGHT, - PUMP_BUTTON_MENUUP, - PUMP_BUTTON_MENUDOWN, - PUMP_BUTTON_COIN, - PUMP_BUTTON_OPERATOR, - PUMP_BUTTON_UPLEFT, + PUMP_BUTTON_UPLEFT = GAME_BUTTON_NEXT, PUMP_BUTTON_UPRIGHT, PUMP_BUTTON_CENTER, PUMP_BUTTON_DOWNLEFT, @@ -74,16 +70,7 @@ enum // PumpButtons enum // EZ2Buttons { - EZ2_BUTTON_START, - EZ2_BUTTON_SELECT, - EZ2_BUTTON_BACK, - EZ2_BUTTON_MENULEFT, - EZ2_BUTTON_MENURIGHT, - EZ2_BUTTON_MENUUP, - EZ2_BUTTON_MENUDOWN, - EZ2_BUTTON_COIN, - EZ2_BUTTON_OPERATOR, - EZ2_BUTTON_FOOTUPLEFT, + EZ2_BUTTON_FOOTUPLEFT = GAME_BUTTON_NEXT, EZ2_BUTTON_FOOTUPRIGHT, EZ2_BUTTON_FOOTDOWN, EZ2_BUTTON_HANDUPLEFT, @@ -95,16 +82,7 @@ enum // EZ2Buttons enum // ParaButtons { - PARA_BUTTON_START, - PARA_BUTTON_SELECT, - PARA_BUTTON_BACK, - PARA_BUTTON_MENULEFT, - PARA_BUTTON_MENURIGHT, - PARA_BUTTON_MENUUP, - PARA_BUTTON_MENUDOWN, - PARA_BUTTON_COIN, - PARA_BUTTON_OPERATOR, - PARA_BUTTON_LEFT, + PARA_BUTTON_LEFT = GAME_BUTTON_NEXT, PARA_BUTTON_UPLEFT, PARA_BUTTON_UP, PARA_BUTTON_UPRIGHT, @@ -114,16 +92,7 @@ enum // ParaButtons enum // 3DDX Buttons { - DS3DDX_BUTTON_START, - DS3DDX_BUTTON_SELECT, - DS3DDX_BUTTON_BACK, - DS3DDX_BUTTON_MENULEFT, - DS3DDX_BUTTON_MENURIGHT, - DS3DDX_BUTTON_MENUUP, - DS3DDX_BUTTON_MENUDOWN, - DS3DDX_BUTTON_COIN, - DS3DDX_BUTTON_OPERATOR, - DS3DDX_BUTTON_HANDLEFT, + DS3DDX_BUTTON_HANDLEFT = GAME_BUTTON_NEXT, DS3DDX_BUTTON_FOOTDOWNLEFT, DS3DDX_BUTTON_FOOTUPLEFT, DS3DDX_BUTTON_HANDUP, @@ -136,16 +105,7 @@ enum // 3DDX Buttons enum // BEAT Buttons { - BEAT_BUTTON_START, - BEAT_BUTTON_SELECT, - BEAT_BUTTON_BACK, - BEAT_BUTTON_MENULEFT, - BEAT_BUTTON_MENURIGHT, - BEAT_BUTTON_MENUUP, - BEAT_BUTTON_MENUDOWN, - BEAT_BUTTON_COIN, - BEAT_BUTTON_OPERATOR, - BEAT_BUTTON_KEY1, + BEAT_BUTTON_KEY1 = GAME_BUTTON_NEXT, BEAT_BUTTON_KEY2, BEAT_BUTTON_KEY3, BEAT_BUTTON_KEY4, @@ -161,16 +121,7 @@ enum // BEAT Buttons enum // ManiaxButtons { - MANIAX_BUTTON_START, - MANIAX_BUTTON_SELECT, - MANIAX_BUTTON_BACK, - MANIAX_BUTTON_MENULEFT, - MANIAX_BUTTON_MENURIGHT, - MANIAX_BUTTON_MENUUP, - MANIAX_BUTTON_MENUDOWN, - MANIAX_BUTTON_COIN, - MANIAX_BUTTON_OPERATOR, - MANIAX_BUTTON_HANDUPLEFT, + MANIAX_BUTTON_HANDUPLEFT = GAME_BUTTON_NEXT, MANIAX_BUTTON_HANDUPRIGHT, MANIAX_BUTTON_HANDLRLEFT, MANIAX_BUTTON_HANDLRRIGHT, @@ -179,16 +130,7 @@ enum // ManiaxButtons enum // TechnoButtons { - TECHNO_BUTTON_START, - TECHNO_BUTTON_SELECT, - TECHNO_BUTTON_BACK, - TECHNO_BUTTON_MENULEFT, - TECHNO_BUTTON_MENURIGHT, - TECHNO_BUTTON_MENUUP, - TECHNO_BUTTON_MENUDOWN, - TECHNO_BUTTON_COIN, - TECHNO_BUTTON_OPERATOR, - TECHNO_BUTTON_LEFT, + TECHNO_BUTTON_LEFT = GAME_BUTTON_NEXT, TECHNO_BUTTON_RIGHT, TECHNO_BUTTON_UP, TECHNO_BUTTON_DOWN, @@ -202,16 +144,7 @@ enum // TechnoButtons enum // PnM Buttons { - POPN_BUTTON_START, - POPN_BUTTON_SELECT, - POPN_BUTTON_BACK, - POPN_BUTTON_MENULEFT, - POPN_BUTTON_MENURIGHT, - POPN_BUTTON_MENUUP, - POPN_BUTTON_MENUDOWN, - POPN_BUTTON_COIN, - POPN_BUTTON_OPERATOR, - POPN_BUTTON_LEFT_WHITE, + POPN_BUTTON_LEFT_WHITE = GAME_BUTTON_NEXT, POPN_BUTTON_LEFT_YELLOW, POPN_BUTTON_LEFT_GREEN, POPN_BUTTON_LEFT_BLUE, @@ -225,16 +158,7 @@ enum // PnM Buttons enum // LightsButtons { - LIGHTS_BUTTON_START, - LIGHTS_BUTTON_SELECT, - LIGHTS_BUTTON_BACK, - LIGHTS_BUTTON_MENULEFT, - LIGHTS_BUTTON_MENURIGHT, - LIGHTS_BUTTON_MENUUP, - LIGHTS_BUTTON_MENUDOWN, - LIGHTS_BUTTON_COIN, - LIGHTS_BUTTON_OPERATOR, - LIGHTS_BUTTON_MARQUEE_UP_LEFT, + LIGHTS_BUTTON_MARQUEE_UP_LEFT = GAME_BUTTON_NEXT, LIGHTS_BUTTON_MARQUEE_UP_RIGHT, LIGHTS_BUTTON_MARQUEE_LR_LEFT, LIGHTS_BUTTON_MARQUEE_LR_RIGHT, diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index e6906dc1b9..33afe90468 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -104,7 +104,6 @@ static struct { "techno-double5", 10, ST_FLAGS_NONE }, { "pnm-five", 5, ST_FLAGS_NONE }, // called "pnm" for backward compat { "pnm-nine", 9, ST_FLAGS_NONE }, // called "pnm" for backward compat - { "guitar-five", 5, ST_FLAGS_NONE }, { "lights-cabinet", NUM_CabinetLight, ST_FLAGS_DONT_AUTOGEN }, // XXX disable lights autogen for now }; @@ -121,32 +120,32 @@ static Game g_Games[NUM_GAMES] = "dance", // m_szName NUM_DANCE_BUTTONS, // m_iButtonsPerController { // m_szButtonNames + { "MenuLeft", GameButtonType_INVALID, KEY_DEL, KEY_KP_SLASH }, + { "MenuRight", GameButtonType_INVALID, KEY_PGDN, KEY_KP_ASTERISK }, + { "MenuUp", GameButtonType_INVALID, KEY_HOME, KEY_KP_HYPHEN }, + { "MenuDown", GameButtonType_INVALID, KEY_END, KEY_KP_PLUS }, + { "Start", GameButtonType_INVALID, KEY_ENTER, KEY_KP_ENTER }, + { "Select", GameButtonType_INVALID, KEY_BACKSLASH, KEY_KP_C0 }, + { "Back", GameButtonType_INVALID, KEY_ESC, KEY_NUMLOCK }, + { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, + { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, { "Left", GameButtonType_Step, KEY_LEFT, KEY_KP_C4 }, { "Right", GameButtonType_Step, KEY_RIGHT, KEY_KP_C6 }, { "Up", GameButtonType_Step, KEY_UP, KEY_KP_C8 }, { "Down", GameButtonType_Step, KEY_DOWN, KEY_KP_C2 }, { "UpLeft", GameButtonType_Step, NO_DEFAULT_KEY, KEY_KP_C7 }, { "UpRight", GameButtonType_Step, NO_DEFAULT_KEY, KEY_KP_C9 }, - { "Start", GameButtonType_INVALID, KEY_ENTER, KEY_KP_ENTER }, - { "Select", GameButtonType_INVALID, KEY_BACKSLASH, KEY_KP_C0 }, - { "Back", GameButtonType_INVALID, KEY_ESC, KEY_NUMLOCK }, - { "MenuLeft", GameButtonType_INVALID, KEY_DEL, KEY_KP_SLASH }, - { "MenuRight", GameButtonType_INVALID, KEY_PGDN, KEY_KP_ASTERISK }, - { "MenuUp", GameButtonType_INVALID, KEY_HOME, KEY_KP_HYPHEN }, - { "MenuDown", GameButtonType_INVALID, KEY_END, KEY_KP_PLUS }, - { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, - { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, }, { // m_DedicatedMenuButton - DANCE_BUTTON_MENULEFT, // MENU_BUTTON_LEFT - DANCE_BUTTON_MENURIGHT, // MENU_BUTTON_RIGHT - 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 + 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 }, { // m_SecondaryMenuButton DANCE_BUTTON_LEFT, // MENU_BUTTON_LEFT @@ -174,31 +173,31 @@ static Game g_Games[NUM_GAMES] = "pump", // m_szName NUM_PUMP_BUTTONS, // m_iButtonsPerController { // m_szButtonNames + { "MenuLeft", GameButtonType_INVALID, KEY_LEFT, NO_DEFAULT_KEY }, + { "MenuRight", GameButtonType_INVALID, KEY_RIGHT, NO_DEFAULT_KEY }, + { "MenuUp", GameButtonType_INVALID, KEY_UP, NO_DEFAULT_KEY }, + { "MenuDown", GameButtonType_INVALID, KEY_DOWN, NO_DEFAULT_KEY }, + { "Start", GameButtonType_INVALID, KEY_ENTER, KEY_KP_ENTER }, + { "Select", GameButtonType_INVALID, KEY_BACKSLASH, KEY_KP_C0 }, + { "Back", GameButtonType_INVALID, KEY_ESC, KEY_NUMLOCK }, + { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, + { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, { "UpLeft", GameButtonType_Step, KEY_Cq, KEY_KP_C7 }, { "UpRight", GameButtonType_Step, KEY_Ce, KEY_KP_C9 }, { "Center", GameButtonType_Step, KEY_Cs, KEY_KP_C5 }, { "DownLeft", GameButtonType_Step, KEY_Cz, KEY_KP_C1 }, { "DownRight", GameButtonType_Step, KEY_Cc, KEY_KP_C3 }, - { "Start", GameButtonType_INVALID, KEY_ENTER, KEY_KP_ENTER }, - { "Select", GameButtonType_INVALID, KEY_BACKSLASH, KEY_KP_C0 }, - { "Back", GameButtonType_INVALID, KEY_ESC, KEY_NUMLOCK }, - { "MenuLeft", GameButtonType_INVALID, KEY_LEFT, NO_DEFAULT_KEY }, - { "MenuRight", GameButtonType_INVALID, KEY_RIGHT, NO_DEFAULT_KEY }, - { "MenuUp", GameButtonType_INVALID, KEY_UP, NO_DEFAULT_KEY }, - { "MenuDown", GameButtonType_INVALID, KEY_DOWN, NO_DEFAULT_KEY }, - { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, - { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, }, { // m_DedicatedMenuButton - PUMP_BUTTON_MENULEFT, // MENU_BUTTON_LEFT - PUMP_BUTTON_MENURIGHT, // MENU_BUTTON_RIGHT - 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 + 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 }, { // m_SecondaryMenuButton PUMP_BUTTON_DOWNLEFT, // MENU_BUTTON_LEFT @@ -226,6 +225,15 @@ static Game g_Games[NUM_GAMES] = "ez2", // m_szName NUM_EZ2_BUTTONS, // m_iButtonsPerController { // m_szButtonNames + { "MenuLeft", GameButtonType_INVALID, KEY_LEFT, NO_DEFAULT_KEY }, + { "MenuRight", GameButtonType_INVALID, KEY_RIGHT, NO_DEFAULT_KEY }, + { "MenuUp", GameButtonType_INVALID, KEY_UP, NO_DEFAULT_KEY }, + { "MenuDown", GameButtonType_INVALID, KEY_DOWN, NO_DEFAULT_KEY }, + { "Start", GameButtonType_INVALID, KEY_ENTER, NO_DEFAULT_KEY }, + { "Select", GameButtonType_INVALID, KEY_BACKSLASH, NO_DEFAULT_KEY }, + { "Back", GameButtonType_INVALID, KEY_ESC, NO_DEFAULT_KEY }, + { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, + { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, { "FootUpLeft", GameButtonType_Step, KEY_Cz, NO_DEFAULT_KEY }, { "FootUpRight", GameButtonType_Step, KEY_Cb, NO_DEFAULT_KEY }, { "FootDown", GameButtonType_Step, KEY_Cc, NO_DEFAULT_KEY }, @@ -233,26 +241,17 @@ static Game g_Games[NUM_GAMES] = { "HandUpRight", GameButtonType_Step, KEY_Cv, NO_DEFAULT_KEY }, { "HandLrLeft", GameButtonType_Step, KEY_Cs, NO_DEFAULT_KEY }, { "HandLrRight", GameButtonType_Step, KEY_Cf, NO_DEFAULT_KEY }, - { "Start", GameButtonType_INVALID, KEY_ENTER, NO_DEFAULT_KEY }, - { "Select", GameButtonType_INVALID, KEY_BACKSLASH, NO_DEFAULT_KEY }, - { "Back", GameButtonType_INVALID, KEY_ESC, NO_DEFAULT_KEY }, - { "MenuLeft", GameButtonType_INVALID, KEY_LEFT, NO_DEFAULT_KEY }, - { "MenuRight", GameButtonType_INVALID, KEY_RIGHT, NO_DEFAULT_KEY }, - { "MenuUp", GameButtonType_INVALID, KEY_UP, NO_DEFAULT_KEY }, - { "MenuDown", GameButtonType_INVALID, KEY_DOWN, NO_DEFAULT_KEY }, - { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, - { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, }, { // m_DedicatedMenuButton - EZ2_BUTTON_MENULEFT, // MENU_BUTTON_LEFT - EZ2_BUTTON_MENURIGHT, // MENU_BUTTON_RIGHT - 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 + 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 }, { // m_SecondaryMenuButton EZ2_BUTTON_HANDUPLEFT, // MENU_BUTTON_LEFT @@ -280,31 +279,31 @@ static Game g_Games[NUM_GAMES] = "para", // m_szName NUM_PARA_BUTTONS, // m_iButtonsPerController { // m_szButtonNames + { "MenuLeft", GameButtonType_INVALID, KEY_LEFT, NO_DEFAULT_KEY }, + { "MenuRight", GameButtonType_INVALID, KEY_RIGHT, NO_DEFAULT_KEY }, + { "MenuUp", GameButtonType_INVALID, KEY_UP, NO_DEFAULT_KEY }, + { "MenuDown", GameButtonType_INVALID, KEY_DOWN, NO_DEFAULT_KEY }, + { "Start", GameButtonType_INVALID, KEY_ENTER, NO_DEFAULT_KEY }, + { "Select", GameButtonType_INVALID, KEY_BACKSLASH, NO_DEFAULT_KEY }, + { "Back", GameButtonType_INVALID, KEY_ESC, NO_DEFAULT_KEY }, + { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, + { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, { "Left", GameButtonType_Step, KEY_Cz, NO_DEFAULT_KEY }, { "UpLeft", GameButtonType_Step, KEY_Cx, NO_DEFAULT_KEY }, { "Up", GameButtonType_Step, KEY_Cc, NO_DEFAULT_KEY }, { "UpRight", GameButtonType_Step, KEY_Cv, NO_DEFAULT_KEY }, { "Right", GameButtonType_Step, KEY_Cb, NO_DEFAULT_KEY }, - { "Start", GameButtonType_INVALID, KEY_ENTER, NO_DEFAULT_KEY }, - { "Select", GameButtonType_INVALID, KEY_BACKSLASH, NO_DEFAULT_KEY }, - { "Back", GameButtonType_INVALID, KEY_ESC, NO_DEFAULT_KEY }, - { "MenuLeft", GameButtonType_INVALID, KEY_LEFT, NO_DEFAULT_KEY }, - { "MenuRight", GameButtonType_INVALID, KEY_RIGHT, NO_DEFAULT_KEY }, - { "MenuUp", GameButtonType_INVALID, KEY_UP, NO_DEFAULT_KEY }, - { "MenuDown", GameButtonType_INVALID, KEY_DOWN, NO_DEFAULT_KEY }, - { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, - { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, }, { // m_DedicatedMenuButton - PARA_BUTTON_MENULEFT, // MENU_BUTTON_LEFT - PARA_BUTTON_MENURIGHT, // MENU_BUTTON_RIGHT - 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 + 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 }, { // m_SecondaryMenuButton PARA_BUTTON_LEFT, // MENU_BUTTON_LEFT @@ -332,6 +331,15 @@ static Game g_Games[NUM_GAMES] = "ds3ddx", // m_szName NUM_DS3DDX_BUTTONS, // m_iButtonsPerController { // m_szButtonNames + { "MenuLeft", GameButtonType_INVALID, KEY_LEFT, NO_DEFAULT_KEY }, + { "MenuRight", GameButtonType_INVALID, KEY_RIGHT, NO_DEFAULT_KEY }, + { "MenuUp", GameButtonType_INVALID, KEY_UP, NO_DEFAULT_KEY }, + { "MenuDown", GameButtonType_INVALID, KEY_DOWN, NO_DEFAULT_KEY }, + { "Start", GameButtonType_INVALID, KEY_ENTER, NO_DEFAULT_KEY }, + { "Select", GameButtonType_INVALID, KEY_BACKSLASH, NO_DEFAULT_KEY }, + { "Back", GameButtonType_INVALID, KEY_ESC, NO_DEFAULT_KEY }, + { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, + { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, { "HandLeft", GameButtonType_Step, KEY_Ca, NO_DEFAULT_KEY }, { "FootDownLeft", GameButtonType_Step, KEY_Cz, NO_DEFAULT_KEY }, { "FootUpLeft", GameButtonType_Step, KEY_Cq, NO_DEFAULT_KEY }, @@ -340,26 +348,17 @@ static Game g_Games[NUM_GAMES] = { "FootUpRight", GameButtonType_Step, KEY_Ce, NO_DEFAULT_KEY }, { "FootDownRight", GameButtonType_Step, KEY_Cc, NO_DEFAULT_KEY }, { "HandRight", GameButtonType_Step, KEY_Cd, NO_DEFAULT_KEY }, - { "Start", GameButtonType_INVALID, KEY_ENTER, NO_DEFAULT_KEY }, - { "Select", GameButtonType_INVALID, KEY_BACKSLASH, NO_DEFAULT_KEY }, - { "Back", GameButtonType_INVALID, KEY_ESC, NO_DEFAULT_KEY }, - { "MenuLeft", GameButtonType_INVALID, KEY_LEFT, NO_DEFAULT_KEY }, - { "MenuRight", GameButtonType_INVALID, KEY_RIGHT, NO_DEFAULT_KEY }, - { "MenuUp", GameButtonType_INVALID, KEY_UP, NO_DEFAULT_KEY }, - { "MenuDown", GameButtonType_INVALID, KEY_DOWN, NO_DEFAULT_KEY }, - { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, - { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, }, { // m_DedicatedMenuButton - DS3DDX_BUTTON_MENULEFT, // MENU_BUTTON_LEFT - DS3DDX_BUTTON_MENURIGHT, // MENU_BUTTON_RIGHT - 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 + 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 }, { // m_SecondaryMenuButton DS3DDX_BUTTON_HANDLEFT, // MENU_BUTTON_LEFT @@ -387,6 +386,15 @@ static Game g_Games[NUM_GAMES] = "beat", // m_szName NUM_BEAT_BUTTONS, // m_iButtonsPerController { // m_szButtonNames + { "MenuLeft", GameButtonType_INVALID, KEY_LEFT, NO_DEFAULT_KEY }, + { "MenuRight", GameButtonType_INVALID, KEY_RIGHT, NO_DEFAULT_KEY }, + { "MenuUp", GameButtonType_INVALID, KEY_UP, NO_DEFAULT_KEY }, + { "MenuDown", GameButtonType_INVALID, KEY_DOWN, NO_DEFAULT_KEY }, + { "Start", GameButtonType_INVALID, KEY_ENTER, NO_DEFAULT_KEY }, + { "Select", GameButtonType_INVALID, KEY_BACKSLASH, NO_DEFAULT_KEY }, + { "Back", GameButtonType_INVALID, KEY_ESC, NO_DEFAULT_KEY }, + { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, + { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, { "Key1", GameButtonType_Step, KEY_Cm, NO_DEFAULT_KEY }, { "Key2", GameButtonType_Step, KEY_Ck, NO_DEFAULT_KEY }, { "Key3", GameButtonType_Step, KEY_COMMA, NO_DEFAULT_KEY }, @@ -396,26 +404,17 @@ static Game g_Games[NUM_GAMES] = { "Key7", GameButtonType_Step, KEY_SLASH, NO_DEFAULT_KEY }, { "Scratch up", GameButtonType_Step, KEY_LSHIFT, NO_DEFAULT_KEY }, { "Scratch down", GameButtonType_Step, NO_DEFAULT_KEY, NO_DEFAULT_KEY }, - { "Start", GameButtonType_INVALID, KEY_ENTER, NO_DEFAULT_KEY }, - { "Select", GameButtonType_INVALID, KEY_BACKSLASH, NO_DEFAULT_KEY }, - { "Back", GameButtonType_INVALID, KEY_ESC, NO_DEFAULT_KEY }, - { "MenuLeft", GameButtonType_INVALID, KEY_LEFT, NO_DEFAULT_KEY }, - { "MenuRight", GameButtonType_INVALID, KEY_RIGHT, NO_DEFAULT_KEY }, - { "MenuUp", GameButtonType_INVALID, KEY_UP, NO_DEFAULT_KEY }, - { "MenuDown", GameButtonType_INVALID, KEY_DOWN, NO_DEFAULT_KEY }, - { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, - { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, }, { // m_DedicatedMenuButton - BEAT_BUTTON_MENULEFT, // MENU_BUTTON_LEFT - BEAT_BUTTON_MENURIGHT, // MENU_BUTTON_RIGHT - BEAT_BUTTON_MENUUP, // MENU_BUTTON_UP - BEAT_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN - BEAT_BUTTON_START, // MENU_BUTTON_START - BEAT_BUTTON_SELECT, // MENU_BUTTON_SELECT - BEAT_BUTTON_BACK, // MENU_BUTTON_BACK - BEAT_BUTTON_COIN, // MENU_BUTTON_COIN - BEAT_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR + 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 }, { // m_SecondaryMenuButton BEAT_BUTTON_KEY1, // MENU_BUTTON_LEFT @@ -443,30 +442,30 @@ static Game g_Games[NUM_GAMES] = "maniax", // m_szName NUM_MANIAX_BUTTONS, // m_iButtonsPerController { // m_szButtonNames - { "HandUpLeft", GameButtonType_Step, KEY_Ca, KEY_KP_C4 }, - { "HandUpRight", GameButtonType_Step, KEY_Cs, KEY_KP_C5 }, - { "HandLrLeft", GameButtonType_Step, KEY_Cz, KEY_KP_C1 }, - { "HandLrRight", GameButtonType_Step, KEY_Cx, KEY_KP_C2 }, - { "Start", GameButtonType_INVALID, KEY_ENTER, KEY_KP_ENTER }, - { "Select", GameButtonType_INVALID, KEY_BACKSLASH, KEY_KP_C0 }, - { "Back", GameButtonType_INVALID, KEY_ESC, KEY_NUMLOCK }, { "MenuLeft", GameButtonType_INVALID, KEY_LEFT, KEY_KP_SLASH }, { "MenuRight", GameButtonType_INVALID, KEY_RIGHT, KEY_KP_ASTERISK }, { "MenuUp", GameButtonType_INVALID, KEY_UP, KEY_KP_HYPHEN }, { "MenuDown", GameButtonType_INVALID, KEY_DOWN, KEY_KP_PLUS }, + { "Start", GameButtonType_INVALID, KEY_ENTER, KEY_KP_ENTER }, + { "Select", GameButtonType_INVALID, KEY_BACKSLASH, KEY_KP_C0 }, + { "Back", GameButtonType_INVALID, KEY_ESC, KEY_NUMLOCK }, { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, + { "HandUpLeft", GameButtonType_Step, KEY_Ca, KEY_KP_C4 }, + { "HandUpRight", GameButtonType_Step, KEY_Cs, KEY_KP_C5 }, + { "HandLrLeft", GameButtonType_Step, KEY_Cz, KEY_KP_C1 }, + { "HandLrRight", GameButtonType_Step, KEY_Cx, KEY_KP_C2 }, }, { // m_DedicatedMenuButton - MANIAX_BUTTON_MENULEFT, // MENU_BUTTON_LEFT - MANIAX_BUTTON_MENURIGHT, // MENU_BUTTON_RIGHT - 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 + 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 }, { // m_SecondaryMenuButton MANIAX_BUTTON_HANDUPLEFT, // MENU_BUTTON_LEFT @@ -494,6 +493,15 @@ static Game g_Games[NUM_GAMES] = "techno", // m_szName NUM_TECHNO_BUTTONS, // m_iButtonsPerController { // m_szButtonNames + { "MenuLeft", GameButtonType_INVALID, KEY_LEFT, KEY_KP_SLASH }, + { "MenuRight", GameButtonType_INVALID, KEY_RIGHT, KEY_KP_ASTERISK }, + { "MenuUp", GameButtonType_INVALID, KEY_UP, KEY_KP_HYPHEN }, + { "MenuDown", GameButtonType_INVALID, KEY_DOWN, KEY_KP_PLUS }, + { "Start", GameButtonType_INVALID, KEY_ENTER, KEY_KP_ENTER }, + { "Select", GameButtonType_INVALID, KEY_BACKSLASH, KEY_KP_C0 }, + { "Back", GameButtonType_INVALID, KEY_ESC, KEY_NUMLOCK }, + { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, + { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, { "Left", GameButtonType_Step, KEY_Ca, KEY_KP_C4 }, { "Right", GameButtonType_Step, KEY_Cd, KEY_KP_C6 }, { "Up", GameButtonType_Step, KEY_Cw, KEY_KP_C8 }, @@ -503,26 +511,17 @@ static Game g_Games[NUM_GAMES] = { "Center", GameButtonType_Step, KEY_Cs, KEY_KP_C5 }, { "DownLeft", GameButtonType_Step, KEY_Cz, KEY_KP_C1 }, { "DownRight", GameButtonType_Step, KEY_Cc, KEY_KP_C3 }, - { "Start", GameButtonType_INVALID, KEY_ENTER, KEY_KP_ENTER }, - { "Select", GameButtonType_INVALID, KEY_BACKSLASH, KEY_KP_C0 }, - { "Back", GameButtonType_INVALID, KEY_ESC, KEY_NUMLOCK }, - { "MenuLeft", GameButtonType_INVALID, KEY_LEFT, KEY_KP_SLASH }, - { "MenuRight", GameButtonType_INVALID, KEY_RIGHT, KEY_KP_ASTERISK }, - { "MenuUp", GameButtonType_INVALID, KEY_UP, KEY_KP_HYPHEN }, - { "MenuDown", GameButtonType_INVALID, KEY_DOWN, KEY_KP_PLUS }, - { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, - { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, }, { // m_DedicatedMenuButton - TECHNO_BUTTON_MENULEFT, // MENU_BUTTON_LEFT - TECHNO_BUTTON_MENURIGHT, // MENU_BUTTON_RIGHT - 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 + 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 }, { // m_SecondaryMenuButton TECHNO_BUTTON_LEFT, // MENU_BUTTON_LEFT @@ -550,6 +549,15 @@ static Game g_Games[NUM_GAMES] = "popn", // m_szName NUM_POPN_BUTTONS, // m_iButtonsPerController { // m_szButtonNames + { "MenuLeft", GameButtonType_Step, KEY_LEFT, NO_DEFAULT_KEY }, + { "MenuRight", GameButtonType_Step, KEY_RIGHT, NO_DEFAULT_KEY }, + { "MenuUp", GameButtonType_Step, KEY_UP, NO_DEFAULT_KEY }, + { "MenuDown", GameButtonType_Step, KEY_DOWN, NO_DEFAULT_KEY }, + { "Start", GameButtonType_Step, KEY_BACKSLASH, NO_DEFAULT_KEY }, + { "Back", GameButtonType_Step, KEY_ENTER, NO_DEFAULT_KEY }, + { "Select", GameButtonType_Step, KEY_ESC, NO_DEFAULT_KEY }, + { "Coin", GameButtonType_Step, KEY_F1, NO_DEFAULT_KEY }, + { "Operator", GameButtonType_Step, KEY_SCRLLOCK, NO_DEFAULT_KEY }, { "Left White", GameButtonType_Step, KEY_Cz, NO_DEFAULT_KEY }, { "Left Yellow", GameButtonType_Step, KEY_Cs, NO_DEFAULT_KEY }, { "Left Green", GameButtonType_Step, KEY_Cx, NO_DEFAULT_KEY }, @@ -559,26 +567,17 @@ static Game g_Games[NUM_GAMES] = { "Right Green", GameButtonType_Step, KEY_Cv, NO_DEFAULT_KEY }, { "Right Yellow", GameButtonType_Step, KEY_Cg, NO_DEFAULT_KEY }, { "Right White", GameButtonType_Step, KEY_Cb, NO_DEFAULT_KEY }, - { "Back", GameButtonType_Step, KEY_ENTER, NO_DEFAULT_KEY }, - { "Start", GameButtonType_Step, KEY_BACKSLASH, NO_DEFAULT_KEY }, - { "Select", GameButtonType_Step, KEY_ESC, NO_DEFAULT_KEY }, - { "MenuLeft", GameButtonType_Step, KEY_LEFT, NO_DEFAULT_KEY }, - { "MenuRight", GameButtonType_Step, KEY_RIGHT, NO_DEFAULT_KEY }, - { "MenuUp", GameButtonType_Step, KEY_UP, NO_DEFAULT_KEY }, - { "MenuDown", GameButtonType_Step, KEY_DOWN, NO_DEFAULT_KEY }, - { "Coin", GameButtonType_Step, KEY_F1, NO_DEFAULT_KEY }, - { "Operator", GameButtonType_Step, KEY_SCRLLOCK, NO_DEFAULT_KEY }, }, { // m_DedicatedMenuButton - POPN_BUTTON_MENULEFT, // MENU_BUTTON_LEFT - POPN_BUTTON_MENURIGHT, // MENU_BUTTON_RIGHT - POPN_BUTTON_MENUUP, // MENU_BUTTON_UP - POPN_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN - POPN_BUTTON_START, // MENU_BUTTON_START - POPN_BUTTON_SELECT, // MENU_BUTTON_SELECT - POPN_BUTTON_BACK, // MENU_BUTTON_START - POPN_BUTTON_COIN, // MENU_BUTTON_COIN - POPN_BUTTON_OPERATOR // MENU_BUTTON_OPERATOR + 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_START + GAME_BUTTON_COIN, // MENU_BUTTON_COIN + GAME_BUTTON_OPERATOR // MENU_BUTTON_OPERATOR }, { // m_SecondaryMenuButton POPN_BUTTON_LEFT_BLUE, // MENU_BUTTON_LEFT @@ -606,6 +605,15 @@ static Game g_Games[NUM_GAMES] = "lights", // m_szName NUM_LIGHTS_BUTTONS, // m_iButtonsPerController { // m_szButtonNames + { "MenuLeft", GameButtonType_INVALID, KEY_DEL, NO_DEFAULT_KEY }, + { "MenuRight", GameButtonType_INVALID, KEY_PGDN, NO_DEFAULT_KEY }, + { "MenuUp", GameButtonType_INVALID, KEY_HOME, NO_DEFAULT_KEY }, + { "MenuDown", GameButtonType_INVALID, KEY_END, NO_DEFAULT_KEY }, + { "Start", GameButtonType_INVALID, KEY_ENTER, NO_DEFAULT_KEY }, + { "Select", GameButtonType_INVALID, KEY_BACKSLASH, NO_DEFAULT_KEY }, + { "Back", GameButtonType_INVALID, KEY_ESC, NO_DEFAULT_KEY }, + { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, + { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, { "MarqueeUpLeft", GameButtonType_Step, KEY_Cq, NO_DEFAULT_KEY }, { "MarqueeUpRight", GameButtonType_Step, KEY_Cw, NO_DEFAULT_KEY }, { "MarqueeLrLeft", GameButtonType_Step, KEY_Ce, NO_DEFAULT_KEY }, @@ -614,26 +622,17 @@ static Game g_Games[NUM_GAMES] = { "ButtonsRight", GameButtonType_Step, KEY_Cy, NO_DEFAULT_KEY }, { "BassLeft", GameButtonType_Step, KEY_Cu, NO_DEFAULT_KEY }, { "BassRight", GameButtonType_Step, KEY_Ci, NO_DEFAULT_KEY }, - { "Start", GameButtonType_INVALID, KEY_ENTER, NO_DEFAULT_KEY }, - { "Select", GameButtonType_INVALID, KEY_BACKSLASH, NO_DEFAULT_KEY }, - { "Back", GameButtonType_INVALID, KEY_ESC, NO_DEFAULT_KEY }, - { "MenuLeft", GameButtonType_INVALID, KEY_DEL, NO_DEFAULT_KEY }, - { "MenuRight", GameButtonType_INVALID, KEY_PGDN, NO_DEFAULT_KEY }, - { "MenuUp", GameButtonType_INVALID, KEY_HOME, NO_DEFAULT_KEY }, - { "MenuDown", GameButtonType_INVALID, KEY_END, NO_DEFAULT_KEY }, - { "Coin", GameButtonType_INVALID, KEY_F1, NO_DEFAULT_KEY }, - { "Operator", GameButtonType_INVALID, KEY_SCRLLOCK, NO_DEFAULT_KEY }, }, { // m_DedicatedMenuButton - LIGHTS_BUTTON_MENULEFT, // MENU_BUTTON_LEFT - LIGHTS_BUTTON_MENURIGHT, // MENU_BUTTON_RIGHT - 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 + 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 }, { // m_SecondaryMenuButton LIGHTS_BUTTON_MARQUEE_UP_LEFT, // MENU_BUTTON_LEFT diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp index 80d9bf0bbe..efccae52b0 100644 --- a/stepmania/src/InputMapper.cpp +++ b/stepmania/src/InputMapper.cpp @@ -93,8 +93,8 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 1, JOY_BUTTON_3, DANCE_BUTTON_DOWN, false }, { 0, JOY_BUTTON_7, DANCE_BUTTON_UPLEFT, false }, { 0, JOY_BUTTON_8, DANCE_BUTTON_UPRIGHT, false }, - { 0, JOY_BUTTON_9, DANCE_BUTTON_BACK, false }, - { 0, JOY_BUTTON_12, DANCE_BUTTON_START, false }, + { 0, JOY_BUTTON_9, GAME_BUTTON_BACK, false }, + { 0, JOY_BUTTON_12, GAME_BUTTON_START, false }, END_MARKER } }, @@ -113,8 +113,8 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 1, JOY_BUTTON_3, DANCE_BUTTON_DOWN, false }, { 0, JOY_BUTTON_7, DANCE_BUTTON_UPLEFT, false }, { 0, JOY_BUTTON_8, DANCE_BUTTON_UPRIGHT, false }, - { 0, JOY_BUTTON_9, DANCE_BUTTON_BACK, false }, - { 0, JOY_BUTTON_10, DANCE_BUTTON_START, false }, + { 0, JOY_BUTTON_9, GAME_BUTTON_BACK, false }, + { 0, JOY_BUTTON_10, GAME_BUTTON_START, false }, END_MARKER } }, @@ -133,8 +133,8 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 1, JOY_BUTTON_2, DANCE_BUTTON_DOWN, false }, { 0, JOY_BUTTON_5, DANCE_BUTTON_UPLEFT, false }, { 0, JOY_BUTTON_6, DANCE_BUTTON_UPRIGHT, false }, - { 0, JOY_BUTTON_9, DANCE_BUTTON_BACK, false }, - { 0, JOY_BUTTON_10, DANCE_BUTTON_START, false }, + { 0, JOY_BUTTON_9, GAME_BUTTON_BACK, false }, + { 0, JOY_BUTTON_10, GAME_BUTTON_START, false }, END_MARKER } }, @@ -153,8 +153,8 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 1, JOY_BUTTON_1, DANCE_BUTTON_DOWN, false }, { 0, JOY_BUTTON_7, DANCE_BUTTON_UPLEFT, false }, { 0, JOY_BUTTON_8, DANCE_BUTTON_UPRIGHT, false }, - { 0, JOY_BUTTON_9, DANCE_BUTTON_BACK, false }, - { 0, JOY_BUTTON_10, DANCE_BUTTON_START, false }, + { 0, JOY_BUTTON_9, GAME_BUTTON_BACK, false }, + { 0, JOY_BUTTON_10, GAME_BUTTON_START, false }, END_MARKER } }, @@ -173,8 +173,8 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 1, JOY_BUTTON_3, DANCE_BUTTON_DOWN, false }, { 0, JOY_BUTTON_7, DANCE_BUTTON_UPLEFT, false }, { 0, JOY_BUTTON_8, DANCE_BUTTON_UPRIGHT, false }, - { 0, JOY_BUTTON_10, DANCE_BUTTON_BACK, false }, - { 0, JOY_BUTTON_9, DANCE_BUTTON_START, false }, + { 0, JOY_BUTTON_10, GAME_BUTTON_BACK, false }, + { 0, JOY_BUTTON_9, GAME_BUTTON_START, false }, END_MARKER } }, @@ -195,8 +195,8 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 0, JOY_BUTTON_6, DANCE_BUTTON_UPRIGHT, false }, { 1, JOY_BUTTON_7, DANCE_BUTTON_UPLEFT, false }, { 1, JOY_BUTTON_8, DANCE_BUTTON_UPRIGHT, false }, - { 0, JOY_BUTTON_10, DANCE_BUTTON_BACK, false }, - { 0, JOY_BUTTON_9, DANCE_BUTTON_START, false }, + { 0, JOY_BUTTON_10, GAME_BUTTON_BACK, false }, + { 0, JOY_BUTTON_9, GAME_BUTTON_START, false }, END_MARKER } }, @@ -217,8 +217,8 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 0, JOY_BUTTON_6, DANCE_BUTTON_UPRIGHT, false }, { 1, JOY_BUTTON_7, DANCE_BUTTON_UPLEFT, false }, { 1, JOY_BUTTON_8, DANCE_BUTTON_UPRIGHT, false }, - { 0, JOY_BUTTON_9, DANCE_BUTTON_BACK, false }, - { 0, JOY_BUTTON_10, DANCE_BUTTON_START, false }, + { 0, JOY_BUTTON_9, GAME_BUTTON_BACK, false }, + { 0, JOY_BUTTON_10, GAME_BUTTON_START, false }, END_MARKER } }, @@ -239,8 +239,8 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 0, JOY_BUTTON_5, DANCE_BUTTON_UPRIGHT, false }, { 1, JOY_BUTTON_8, DANCE_BUTTON_UPLEFT, false }, { 1, JOY_BUTTON_6, DANCE_BUTTON_UPRIGHT, false }, - { 0, JOY_BUTTON_10, DANCE_BUTTON_BACK, false }, - { 0, JOY_BUTTON_9, DANCE_BUTTON_START, false }, + { 0, JOY_BUTTON_10, GAME_BUTTON_BACK, false }, + { 0, JOY_BUTTON_9, GAME_BUTTON_START, false }, END_MARKER } }, @@ -259,8 +259,8 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 1, JOY_BUTTON_4, DANCE_BUTTON_UP, false }, // Y { 0, JOY_BUTTON_7, DANCE_BUTTON_UPLEFT, false }, // L shoulder { 0, JOY_BUTTON_8, DANCE_BUTTON_UPRIGHT, false }, // R shoulder - { 0, JOY_BUTTON_9, DANCE_BUTTON_START, false }, - { 0, JOY_BUTTON_10, DANCE_BUTTON_BACK, false }, + { 0, JOY_BUTTON_9, GAME_BUTTON_START, false }, + { 0, JOY_BUTTON_10, GAME_BUTTON_BACK, false }, END_MARKER } }, @@ -281,10 +281,10 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 1, JOY_BUTTON_3, DANCE_BUTTON_DOWN, false }, { 0, JOY_BUTTON_7, DANCE_BUTTON_UPLEFT, false }, { 0, JOY_BUTTON_8, DANCE_BUTTON_UPRIGHT, false }, - { 0, JOY_BUTTON_9, DANCE_BUTTON_SELECT, false }, - { 0, JOY_BUTTON_10, DANCE_BUTTON_START, false }, - { 0, JOY_BUTTON_5, DANCE_BUTTON_BACK, false }, - { 0, JOY_BUTTON_6, DANCE_BUTTON_COIN, false }, + { 0, JOY_BUTTON_9, GAME_BUTTON_SELECT, false }, + { 0, JOY_BUTTON_10, GAME_BUTTON_START, false }, + { 0, JOY_BUTTON_5, GAME_BUTTON_BACK, false }, + { 0, JOY_BUTTON_6, GAME_BUTTON_COIN, false }, // Player 2. { 0, JOY_BUTTON_32, DANCE_BUTTON_LEFT, true }, { 0, JOY_BUTTON_30, DANCE_BUTTON_RIGHT, true }, @@ -296,10 +296,10 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 1, JOY_BUTTON_19, DANCE_BUTTON_DOWN, true }, { 0, JOY_BUTTON_23, DANCE_BUTTON_UPRIGHT, true }, { 0, JOY_BUTTON_24, DANCE_BUTTON_UPLEFT, true }, - { 0, JOY_BUTTON_25, DANCE_BUTTON_SELECT, true }, - { 0, JOY_BUTTON_26, DANCE_BUTTON_START, true }, - { 0, JOY_BUTTON_21, DANCE_BUTTON_BACK, true }, - { 0, JOY_BUTTON_22, DANCE_BUTTON_COIN, true }, + { 0, JOY_BUTTON_25, GAME_BUTTON_SELECT, true }, + { 0, JOY_BUTTON_26, GAME_BUTTON_START, true }, + { 0, JOY_BUTTON_21, GAME_BUTTON_BACK, true }, + { 0, JOY_BUTTON_22, GAME_BUTTON_COIN, true }, END_MARKER } }, @@ -314,8 +314,8 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 0, JOY_BUTTON_4, DANCE_BUTTON_RIGHT, false }, { 0, JOY_BUTTON_7, DANCE_BUTTON_UPRIGHT, false }, { 0, JOY_BUTTON_8, DANCE_BUTTON_UPLEFT, false }, - { 0, JOY_BUTTON_9, DANCE_BUTTON_BACK, false }, - { 0, JOY_BUTTON_10, DANCE_BUTTON_START, false }, + { 0, JOY_BUTTON_9, GAME_BUTTON_BACK, false }, + { 0, JOY_BUTTON_10, GAME_BUTTON_START, false }, END_MARKER } }, @@ -334,10 +334,10 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 1, JOY_BUTTON_3, /* X */ DANCE_BUTTON_DOWN, false }, { 0, JOY_BUTTON_7, /* L1 */ DANCE_BUTTON_UPLEFT, false }, { 0, JOY_BUTTON_8, /* R1 */ DANCE_BUTTON_UPRIGHT, false }, - { 0, JOY_BUTTON_10, /* Select */ DANCE_BUTTON_BACK, false }, - { 0, JOY_BUTTON_9, /* Start */ DANCE_BUTTON_START, false }, - { 0, JOY_BUTTON_5, /* R1 */ DANCE_BUTTON_SELECT, false }, - { 0, JOY_BUTTON_6, /* R2 */ DANCE_BUTTON_COIN, false }, + { 0, JOY_BUTTON_10, /* Select */ GAME_BUTTON_BACK, false }, + { 0, JOY_BUTTON_9, /* Start */ GAME_BUTTON_START, false }, + { 0, JOY_BUTTON_5, /* R1 */ GAME_BUTTON_SELECT, false }, + { 0, JOY_BUTTON_6, /* R2 */ GAME_BUTTON_COIN, false }, END_MARKER } }, @@ -350,12 +350,12 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 0, JOY_BUTTON_4, /* dpad R */ DANCE_BUTTON_RIGHT, false }, { 0, JOY_BUTTON_3, /* dpad U */ DANCE_BUTTON_UP, false }, { 0, JOY_BUTTON_2, /* dpad D */ DANCE_BUTTON_DOWN, false }, - //{ 0, JOY_BUTTON_5, /* Tri */ DANCE_BUTTON_BACK, false }, - //{ 0, JOY_BUTTON_6, /* Square */ DANCE_BUTTON_BACK, false }, - //{ 1, JOY_BUTTON_7, /* X */ DANCE_BUTTON_START, false }, - { 0, JOY_BUTTON_8, /* O */ DANCE_BUTTON_START, false }, - { 1, JOY_BUTTON_9, /* Start */ DANCE_BUTTON_START, false }, - { 0, JOY_BUTTON_10, /* Sel */ DANCE_BUTTON_BACK, false }, + //{ 0, JOY_BUTTON_5, /* Tri */ GAME_BUTTON_BACK, false }, + //{ 0, JOY_BUTTON_6, /* Square */ GAME_BUTTON_BACK, false }, + //{ 1, JOY_BUTTON_7, /* X */ GAME_BUTTON_START, false }, + { 0, JOY_BUTTON_8, /* O */ GAME_BUTTON_START, false }, + { 1, JOY_BUTTON_9, /* Start */ GAME_BUTTON_START, false }, + { 0, JOY_BUTTON_10, /* Sel */ GAME_BUTTON_BACK, false }, END_MARKER } }, @@ -368,12 +368,12 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 0, JOY_BUTTON_14, /* dpad R */ DANCE_BUTTON_RIGHT, false }, { 0, JOY_BUTTON_13, /* dpad U */ DANCE_BUTTON_UP, false }, { 0, JOY_BUTTON_15, /* dpad D */ DANCE_BUTTON_DOWN, false }, - //{ 0, JOY_BUTTON_5, /* Tri */ DANCE_BUTTON_BACK, false }, - //{ 0, JOY_BUTTON_6, /* Square */ DANCE_BUTTON_BACK, false }, - //{ 1, JOY_BUTTON_7, /* X */ DANCE_BUTTON_START, false }, - { 0, JOY_BUTTON_2, /* O */ DANCE_BUTTON_START, false }, - { 1, JOY_BUTTON_10, /* Start */ DANCE_BUTTON_START, false }, - { 0, JOY_BUTTON_9, /* Sel */ DANCE_BUTTON_BACK, false }, + //{ 0, JOY_BUTTON_5, /* Tri */ GAME_BUTTON_BACK, false }, + //{ 0, JOY_BUTTON_6, /* Square */ GAME_BUTTON_BACK, false }, + //{ 1, JOY_BUTTON_7, /* X */ GAME_BUTTON_START, false }, + { 0, JOY_BUTTON_2, /* O */ GAME_BUTTON_START, false }, + { 1, JOY_BUTTON_10, /* Start */ GAME_BUTTON_START, false }, + { 0, JOY_BUTTON_9, /* Sel */ GAME_BUTTON_BACK, false }, END_MARKER } }, @@ -386,12 +386,12 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 0, JOY_BUTTON_4, /* dpad R */ DANCE_BUTTON_RIGHT, false }, { 0, JOY_BUTTON_3, /* dpad U */ DANCE_BUTTON_UP, false }, { 0, JOY_BUTTON_2, /* dpad D */ DANCE_BUTTON_DOWN, false }, - //{ 0, JOY_BUTTON_5, /* Tri */ DANCE_BUTTON_BACK, false }, - //{ 0, JOY_BUTTON_6, /* Square */ DANCE_BUTTON_BACK, false }, - //{ 1, JOY_BUTTON_7, /* X */ DANCE_BUTTON_START, false }, - { 0, JOY_BUTTON_8, /* O */ DANCE_BUTTON_START, false }, - { 1, JOY_BUTTON_9, /* Start */ DANCE_BUTTON_START, false }, - { 0, JOY_BUTTON_10, /* Sel */ DANCE_BUTTON_BACK, false }, + //{ 0, JOY_BUTTON_5, /* Tri */ GAME_BUTTON_BACK, false }, + //{ 0, JOY_BUTTON_6, /* Square */ GAME_BUTTON_BACK, false }, + //{ 1, JOY_BUTTON_7, /* X */ GAME_BUTTON_START, false }, + { 0, JOY_BUTTON_8, /* O */ GAME_BUTTON_START, false }, + { 1, JOY_BUTTON_9, /* Start */ GAME_BUTTON_START, false }, + { 0, JOY_BUTTON_10, /* Sel */ GAME_BUTTON_BACK, false }, END_MARKER } }, @@ -405,7 +405,7 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 0, JOY_BUTTON_3, PUMP_BUTTON_CENTER, false }, { 0, JOY_BUTTON_4, PUMP_BUTTON_DOWNLEFT, false }, { 0, JOY_BUTTON_5, PUMP_BUTTON_DOWNRIGHT, false }, - { 0, JOY_BUTTON_6, PUMP_BUTTON_BACK, false }, + { 0, JOY_BUTTON_6, GAME_BUTTON_BACK, false }, { 0, JOY_BUTTON_7, PUMP_BUTTON_UPLEFT, true }, { 0, JOY_BUTTON_8, PUMP_BUTTON_UPRIGHT, true }, { 0, JOY_BUTTON_9, PUMP_BUTTON_CENTER, true }, @@ -424,10 +424,10 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 0, JOY_BUTTON_3, PARA_BUTTON_UP, false }, { 0, JOY_BUTTON_2, PARA_BUTTON_UPRIGHT, false }, { 0, JOY_BUTTON_1, PARA_BUTTON_RIGHT, false }, - { 0, JOY_BUTTON_10, PARA_BUTTON_START, false }, - { 0, JOY_BUTTON_11, PARA_BUTTON_BACK, false }, - { 0, JOY_BUTTON_12, PARA_BUTTON_MENULEFT, false }, - { 0, JOY_BUTTON_9, PARA_BUTTON_MENURIGHT, false }, + { 0, JOY_BUTTON_10, GAME_BUTTON_START, false }, + { 0, JOY_BUTTON_11, GAME_BUTTON_BACK, false }, + { 0, JOY_BUTTON_12, GAME_BUTTON_MENULEFT, false }, + { 0, JOY_BUTTON_9, GAME_BUTTON_MENURIGHT, false }, END_MARKER } }, @@ -444,8 +444,8 @@ const AutoJoyMapping g_AutoJoyMappings[] = { 0, JOY_BUTTON_6, TECHNO_BUTTON_DOWNLEFT, false }, { 0, JOY_BUTTON_7, TECHNO_BUTTON_UPRIGHT, false }, { 0, JOY_BUTTON_8, TECHNO_BUTTON_UPLEFT, false }, - { 0, JOY_BUTTON_9, TECHNO_BUTTON_BACK, false }, - { 0, JOY_BUTTON_10, TECHNO_BUTTON_START, false }, + { 0, JOY_BUTTON_9, GAME_BUTTON_BACK, false }, + { 0, JOY_BUTTON_10, GAME_BUTTON_START, false }, END_MARKER } },