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

add constants for NO_DEFAULT_KEY and joy mapping end marker

Browse Source
This commit is contained in:
Chris Danford
2004-04-20 08:27:40 +00:00
parent 9f386b10d6
commit dede9ec8cd
3 changed files with 146 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameDef.h
+2
View File
@@ -41,6 +41,8 @@ const int MAX_STYLES_PER_GAME = 10;
class StyleDef; class StyleDef;
#define NO_DEFAULT_KEY -1
class GameDef class GameDef
{ {
public: public:
stepmania/src/GameManager.cpp
+127 -127
View File
@@ -139,8 +139,8 @@ GameDef g_GameDefs[NUM_GAMES] =
SDLK_RIGHT, // DANCE_BUTTON_RIGHT, SDLK_RIGHT, // DANCE_BUTTON_RIGHT,
SDLK_UP, // DANCE_BUTTON_UP, SDLK_UP, // DANCE_BUTTON_UP,
SDLK_DOWN, // DANCE_BUTTON_DOWN, SDLK_DOWN, // DANCE_BUTTON_DOWN,
-1, //no default key // DANCE_BUTTON_UPLEFT, NO_DEFAULT_KEY, // DANCE_BUTTON_UPLEFT,
-1, //no default key // DANCE_BUTTON_UPRIGHT, NO_DEFAULT_KEY, // DANCE_BUTTON_UPRIGHT,
SDLK_RETURN, // DANCE_BUTTON_START, SDLK_RETURN, // DANCE_BUTTON_START,
SDLK_ESCAPE, // DANCE_BUTTON_BACK SDLK_ESCAPE, // DANCE_BUTTON_BACK
SDLK_DELETE, // DANCE_BUTTON_MENULEFT SDLK_DELETE, // DANCE_BUTTON_MENULEFT
@@ -163,8 +163,8 @@ GameDef g_GameDefs[NUM_GAMES] =
SDLK_KP_MULTIPLY, // DANCE_BUTTON_MENURIGHT SDLK_KP_MULTIPLY, // DANCE_BUTTON_MENURIGHT
SDLK_KP_MINUS, // DANCE_BUTTON_MENUUP SDLK_KP_MINUS, // DANCE_BUTTON_MENUUP
SDLK_KP_PLUS, // DANCE_BUTTON_MENUDOWN SDLK_KP_PLUS, // DANCE_BUTTON_MENUDOWN
-1, // DANCE_BUTTON_COIN NO_DEFAULT_KEY, // DANCE_BUTTON_COIN
-1 // DANCE_BUTTON_OPERATOR NO_DEFAULT_KEY // DANCE_BUTTON_OPERATOR
}, },
} }
}, },
@@ -247,12 +247,12 @@ GameDef g_GameDefs[NUM_GAMES] =
SDLK_KP3, // PUMP_BUTTON_DOWNRIGHT, SDLK_KP3, // PUMP_BUTTON_DOWNRIGHT,
SDLK_KP_ENTER, // PUMP_BUTTON_START, SDLK_KP_ENTER, // PUMP_BUTTON_START,
SDLK_KP0, // PUMP_BUTTON_BACK, SDLK_KP0, // PUMP_BUTTON_BACK,
-1, //no default key // PUMP_BUTTON_MENULEFT NO_DEFAULT_KEY // PUMP_BUTTON_MENULEFT
-1, //no default key // PUMP_BUTTON_MENURIGHT NO_DEFAULT_KEY // PUMP_BUTTON_MENURIGHT
-1, //no default key // PUMP_BUTTON_MENUUP NO_DEFAULT_KEY // PUMP_BUTTON_MENUUP
-1, //no default key // PUMP_BUTTON_MENUDOWN NO_DEFAULT_KEY // PUMP_BUTTON_MENUDOWN
-1, // PUMP_BUTTON_COIN NO_DEFAULT_KEY, // PUMP_BUTTON_COIN
-1 // PUMP_BUTTON_OPERATOR NO_DEFAULT_KEY // PUMP_BUTTON_OPERATOR
}, },
} }
}, },
@@ -334,21 +334,21 @@ GameDef g_GameDefs[NUM_GAMES] =
SDLK_SCROLLOCK // EZ2_BUTTON_OPERATOR SDLK_SCROLLOCK // EZ2_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
-1, // EZ2_BUTTON_FOOTUPLEFT, NO_DEFAULT_KEY, // EZ2_BUTTON_FOOTUPLEFT,
-1, // EZ2_BUTTON_FOOTUPRIGHT, NO_DEFAULT_KEY, // EZ2_BUTTON_FOOTUPRIGHT,
-1, // EZ2_BUTTON_FOOTDOWN, NO_DEFAULT_KEY, // EZ2_BUTTON_FOOTDOWN,
-1, // EZ2_BUTTON_HANDUPLEFT, NO_DEFAULT_KEY, // EZ2_BUTTON_HANDUPLEFT,
-1, // EZ2_BUTTON_HANDUPRIGHT, NO_DEFAULT_KEY, // EZ2_BUTTON_HANDUPRIGHT,
-1, // EZ2_BUTTON_HANDLRLEFT, NO_DEFAULT_KEY, // EZ2_BUTTON_HANDLRLEFT,
-1, // EZ2_BUTTON_HANDLRRIGHT, NO_DEFAULT_KEY, // EZ2_BUTTON_HANDLRRIGHT,
-1, // EZ2_BUTTON_START, NO_DEFAULT_KEY, // EZ2_BUTTON_START,
-1, // EZ2_BUTTON_BACK, NO_DEFAULT_KEY, // EZ2_BUTTON_BACK,
-1, //no default key // EZ2_BUTTON_MENULEFT NO_DEFAULT_KEY // EZ2_BUTTON_MENULEFT
-1, //no default key // EZ2_BUTTON_MENURIGHT NO_DEFAULT_KEY // EZ2_BUTTON_MENURIGHT
-1, //no default key // EZ2_BUTTON_MENUUP NO_DEFAULT_KEY // EZ2_BUTTON_MENUUP
-1, //no default key // EZ2_BUTTON_MENUDOWN NO_DEFAULT_KEY // EZ2_BUTTON_MENUDOWN
-1, // EZ2_BUTTON_COIN NO_DEFAULT_KEY, // EZ2_BUTTON_COIN
-1 // EZ2_BUTTON_OPERATOR NO_DEFAULT_KEY // EZ2_BUTTON_OPERATOR
}, },
}, },
}, },
@@ -424,19 +424,19 @@ GameDef g_GameDefs[NUM_GAMES] =
SDLK_SCROLLOCK // PARA_BUTTON_OPERATOR SDLK_SCROLLOCK // PARA_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
-1, // PARA_BUTTON_LEFT, NO_DEFAULT_KEY, // PARA_BUTTON_LEFT,
-1, // PARA_BUTTON_UPLEFT, NO_DEFAULT_KEY, // PARA_BUTTON_UPLEFT,
-1, // PARA_BUTTON_UP, NO_DEFAULT_KEY, // PARA_BUTTON_UP,
-1, // PARA_BUTTON_UPRIGHT, NO_DEFAULT_KEY, // PARA_BUTTON_UPRIGHT,
-1, // PARA_BUTTON_RIGHT, NO_DEFAULT_KEY, // PARA_BUTTON_RIGHT,
-1, // PARA_BUTTON_START, NO_DEFAULT_KEY, // PARA_BUTTON_START,
-1, // PARA_BUTTON_BACK NO_DEFAULT_KEY, // PARA_BUTTON_BACK
-1, //no default key // PARA_BUTTON_MENULEFT NO_DEFAULT_KEY // PARA_BUTTON_MENULEFT
-1, //no default key // PARA_BUTTON_MENURIGHT NO_DEFAULT_KEY // PARA_BUTTON_MENURIGHT
-1, // PARA_BUTTON_MENUUP NO_DEFAULT_KEY, // PARA_BUTTON_MENUUP
-1, NO_DEFAULT_KEY,
-1, // PARA_BUTTON_COIN NO_DEFAULT_KEY, // PARA_BUTTON_COIN
-1 // PARA_BUTTON_OPERATOR NO_DEFAULT_KEY // PARA_BUTTON_OPERATOR
}, },
} }
}, },
@@ -521,22 +521,22 @@ GameDef g_GameDefs[NUM_GAMES] =
SDLK_SCROLLOCK // DS3DDX_BUTTON_OPERATOR SDLK_SCROLLOCK // DS3DDX_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
-1, // DS3DDX_BUTTON_HANDLEFT, NO_DEFAULT_KEY, // DS3DDX_BUTTON_HANDLEFT,
-1, // DS3DDX_BUTTON_FOOTDOWNLEFT, NO_DEFAULT_KEY, // DS3DDX_BUTTON_FOOTDOWNLEFT,
-1, // DS3DDX_BUTTON_FOOTUPLEFT, NO_DEFAULT_KEY, // DS3DDX_BUTTON_FOOTUPLEFT,
-1, // DS3DDX_BUTTON_HANDUP, NO_DEFAULT_KEY, // DS3DDX_BUTTON_HANDUP,
-1, // DS3DDX_BUTTON_HANDDOWN, NO_DEFAULT_KEY, // DS3DDX_BUTTON_HANDDOWN,
-1, // DS3DDX_BUTTON_FOOTUPRIGHT, NO_DEFAULT_KEY, // DS3DDX_BUTTON_FOOTUPRIGHT,
-1, // DS3DDX_BUTTON_FOOTDOWNRIGHT, NO_DEFAULT_KEY, // DS3DDX_BUTTON_FOOTDOWNRIGHT,
-1, // DS3DDX_BUTTON_HANDRIGHT, NO_DEFAULT_KEY, // DS3DDX_BUTTON_HANDRIGHT,
-1, // DS3DDX_BUTTON_START, NO_DEFAULT_KEY, // DS3DDX_BUTTON_START,
-1, // DS3DDX_BUTTON_BACK NO_DEFAULT_KEY, // DS3DDX_BUTTON_BACK
-1, //no default key // DS3DDX_BUTTON_MENULEFT NO_DEFAULT_KEY // DS3DDX_BUTTON_MENULEFT
-1, //no default key // DS3DDX_BUTTON_MENURIGHT NO_DEFAULT_KEY // DS3DDX_BUTTON_MENURIGHT
-1, // DS3DDX_BUTTON_MENUUP NO_DEFAULT_KEY, // DS3DDX_BUTTON_MENUUP
-1, // DS3DDX_BUTTON_MENUDOWN NO_DEFAULT_KEY, // DS3DDX_BUTTON_MENUDOWN
-1, // DS3DDX_BUTTON_COIN NO_DEFAULT_KEY, // DS3DDX_BUTTON_COIN
-1 // DS3DDX_BUTTON_OPERATOR NO_DEFAULT_KEY // DS3DDX_BUTTON_OPERATOR
}, },
} }
}, },
@@ -608,9 +608,9 @@ GameDef g_GameDefs[NUM_GAMES] =
SDLK_l, // BM_BUTTON_KEY4, SDLK_l, // BM_BUTTON_KEY4,
SDLK_PERIOD, // BM_BUTTON_KEY5, SDLK_PERIOD, // BM_BUTTON_KEY5,
SDLK_LSHIFT, // BM_BUTTON_SCRATCHUP, SDLK_LSHIFT, // BM_BUTTON_SCRATCHUP,
-1, // BM_BUTTON_SCRATCHDOWN, NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHDOWN,
SDLK_RETURN, // BM_BUTTON_START, SDLK_RETURN, // BM_BUTTON_START,
-1, // BM_BUTTON_SELECT, NO_DEFAULT_KEY, // BM_BUTTON_SELECT,
SDLK_LEFT, // BM_BUTTON_MENULEFT SDLK_LEFT, // BM_BUTTON_MENULEFT
SDLK_RIGHT, // BM_BUTTON_MENURIGHT SDLK_RIGHT, // BM_BUTTON_MENURIGHT
SDLK_UP, // BM_BUTTON_MENUUP SDLK_UP, // BM_BUTTON_MENUUP
@@ -619,21 +619,21 @@ GameDef g_GameDefs[NUM_GAMES] =
SDLK_SCROLLOCK // BM_BUTTON_OPERATOR SDLK_SCROLLOCK // BM_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
-1, // BM_BUTTON_KEY1, NO_DEFAULT_KEY, // BM_BUTTON_KEY1,
-1, // BM_BUTTON_KEY2, NO_DEFAULT_KEY, // BM_BUTTON_KEY2,
-1, // BM_BUTTON_KEY3, NO_DEFAULT_KEY, // BM_BUTTON_KEY3,
-1, // BM_BUTTON_KEY4, NO_DEFAULT_KEY, // BM_BUTTON_KEY4,
-1, // BM_BUTTON_KEY5, NO_DEFAULT_KEY, // BM_BUTTON_KEY5,
-1, // BM_BUTTON_SCRATCHUP, NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHUP,
-1, // BM_BUTTON_SCRATCHDOWN, NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHDOWN,
-1, // BM_BUTTON_START, NO_DEFAULT_KEY, // BM_BUTTON_START,
-1, // BM_BUTTON_SELECT, NO_DEFAULT_KEY, // BM_BUTTON_SELECT,
-1, // BM_BUTTON_MENULEFT NO_DEFAULT_KEY, // BM_BUTTON_MENULEFT
-1, // BM_BUTTON_MENURIGHT NO_DEFAULT_KEY, // BM_BUTTON_MENURIGHT
-1, // BM_BUTTON_MENUUP NO_DEFAULT_KEY, // BM_BUTTON_MENUUP
-1, // BM_BUTTON_MENUDOWN NO_DEFAULT_KEY, // BM_BUTTON_MENUDOWN
-1, // BM_BUTTON_COIN NO_DEFAULT_KEY, // BM_BUTTON_COIN
-1 // BM_BUTTON_OPERATOR NO_DEFAULT_KEY // BM_BUTTON_OPERATOR
}, },
} }
}, },
@@ -711,9 +711,9 @@ GameDef g_GameDefs[NUM_GAMES] =
SDLK_SEMICOLON, // IIDX_BUTTON_KEY6, SDLK_SEMICOLON, // IIDX_BUTTON_KEY6,
SDLK_SLASH, // IIDX_BUTTON_KEY7, SDLK_SLASH, // IIDX_BUTTON_KEY7,
SDLK_LSHIFT, // IIDX_BUTTON_SCRATCHUP, SDLK_LSHIFT, // IIDX_BUTTON_SCRATCHUP,
-1, // IIDX_BUTTON_SCRATCHDOWN, NO_DEFAULT_KEY, // IIDX_BUTTON_SCRATCHDOWN,
SDLK_RETURN, // IIDX_BUTTON_START, SDLK_RETURN, // IIDX_BUTTON_START,
-1, // IIDX_BUTTON_SELECT, NO_DEFAULT_KEY, // IIDX_BUTTON_SELECT,
SDLK_LEFT, // IIDX_BUTTON_MENULEFT SDLK_LEFT, // IIDX_BUTTON_MENULEFT
SDLK_RIGHT, // IIDX_BUTTON_MENURIGHT SDLK_RIGHT, // IIDX_BUTTON_MENURIGHT
SDLK_UP, // IIDX_BUTTON_MENUUP SDLK_UP, // IIDX_BUTTON_MENUUP
@@ -722,23 +722,23 @@ GameDef g_GameDefs[NUM_GAMES] =
SDLK_SCROLLOCK // IIDX_BUTTON_OPERATOR SDLK_SCROLLOCK // IIDX_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
-1, // IIDX_BUTTON_KEY1, NO_DEFAULT_KEY, // IIDX_BUTTON_KEY1,
-1, // IIDX_BUTTON_KEY2, NO_DEFAULT_KEY, // IIDX_BUTTON_KEY2,
-1, // IIDX_BUTTON_KEY3, NO_DEFAULT_KEY, // IIDX_BUTTON_KEY3,
-1, // IIDX_BUTTON_KEY4, NO_DEFAULT_KEY, // IIDX_BUTTON_KEY4,
-1, // IIDX_BUTTON_KEY5, NO_DEFAULT_KEY, // IIDX_BUTTON_KEY5,
-1, // IIDX_BUTTON_KEY6, NO_DEFAULT_KEY, // IIDX_BUTTON_KEY6,
-1, // IIDX_BUTTON_KEY7, NO_DEFAULT_KEY, // IIDX_BUTTON_KEY7,
-1, // IIDX_BUTTON_SCRATCHUP, NO_DEFAULT_KEY, // IIDX_BUTTON_SCRATCHUP,
-1, // IIDX_BUTTON_SCRATCHDOWN, NO_DEFAULT_KEY, // IIDX_BUTTON_SCRATCHDOWN,
-1, // IIDX_BUTTON_START, NO_DEFAULT_KEY, // IIDX_BUTTON_START,
-1, // IIDX_BUTTON_SELECT, NO_DEFAULT_KEY, // IIDX_BUTTON_SELECT,
-1, // IIDX_BUTTON_MENULEFT NO_DEFAULT_KEY, // IIDX_BUTTON_MENULEFT
-1, // IIDX_BUTTON_MENURIGHT NO_DEFAULT_KEY, // IIDX_BUTTON_MENURIGHT
-1, // IIDX_BUTTON_MENUUP NO_DEFAULT_KEY, // IIDX_BUTTON_MENUUP
-1, // IIDX_BUTTON_MENUDOWN NO_DEFAULT_KEY, // IIDX_BUTTON_MENUDOWN
-1, // IIDX_BUTTON_COIN NO_DEFAULT_KEY, // IIDX_BUTTON_COIN
-1 // IIDX_BUTTON_OPERATOR NO_DEFAULT_KEY // IIDX_BUTTON_OPERATOR
}, },
} }
}, },
@@ -821,8 +821,8 @@ GameDef g_GameDefs[NUM_GAMES] =
SDLK_KP_MULTIPLY, // MANIAX_BUTTON_MENURIGHT SDLK_KP_MULTIPLY, // MANIAX_BUTTON_MENURIGHT
SDLK_KP_MINUS, // MANIAX_BUTTON_MENUUP SDLK_KP_MINUS, // MANIAX_BUTTON_MENUUP
SDLK_KP_PLUS, // MANIAX_BUTTON_MENUDOWN SDLK_KP_PLUS, // MANIAX_BUTTON_MENUDOWN
-1, // MANIAX_BUTTON_COIN NO_DEFAULT_KEY, // MANIAX_BUTTON_COIN
-1 // MANIAX_BUTTON_OPERATOR NO_DEFAULT_KEY // MANIAX_BUTTON_OPERATOR
}, },
} }
}, },
@@ -923,8 +923,8 @@ GameDef g_GameDefs[NUM_GAMES] =
SDLK_KP_MULTIPLY, // TECHNO_BUTTON_MENURIGHT SDLK_KP_MULTIPLY, // TECHNO_BUTTON_MENURIGHT
SDLK_KP_MINUS, // TECHNO_BUTTON_MENUUP SDLK_KP_MINUS, // TECHNO_BUTTON_MENUUP
SDLK_KP_PLUS, // TECHNO_BUTTON_MENUDOWN SDLK_KP_PLUS, // TECHNO_BUTTON_MENUDOWN
-1, // TECHNO_BUTTON_COIN NO_DEFAULT_KEY, // TECHNO_BUTTON_COIN
-1 // TECHNO_BUTTON_OPERATOR NO_DEFAULT_KEY // TECHNO_BUTTON_OPERATOR
}, },
} }
}, },
@@ -1013,23 +1013,23 @@ GameDef g_GameDefs[NUM_GAMES] =
SDLK_SCROLLOCK // PNM_BUTTON_OPERATOR SDLK_SCROLLOCK // PNM_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
-1, // BM_BUTTON_KEY1, NO_DEFAULT_KEY, // BM_BUTTON_KEY1,
-1, // BM_BUTTON_KEY2, NO_DEFAULT_KEY, // BM_BUTTON_KEY2,
-1, // BM_BUTTON_KEY3, NO_DEFAULT_KEY, // BM_BUTTON_KEY3,
-1, // BM_BUTTON_KEY4, NO_DEFAULT_KEY, // BM_BUTTON_KEY4,
-1, // BM_BUTTON_KEY5, NO_DEFAULT_KEY, // BM_BUTTON_KEY5,
-1, // BM_BUTTON_KEY6, NO_DEFAULT_KEY, // BM_BUTTON_KEY6,
-1, // BM_BUTTON_KEY7, NO_DEFAULT_KEY, // BM_BUTTON_KEY7,
-1, // BM_BUTTON_SCRATCHUP, NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHUP,
-1, // BM_BUTTON_SCRATCHDOWN, NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHDOWN,
-1, // BM_BUTTON_START, NO_DEFAULT_KEY, // BM_BUTTON_START,
-1, // BM_BUTTON_SELECT, NO_DEFAULT_KEY, // BM_BUTTON_SELECT,
-1, // BM_BUTTON_MENULEFT NO_DEFAULT_KEY, // BM_BUTTON_MENULEFT
-1, // BM_BUTTON_MENURIGHT NO_DEFAULT_KEY, // BM_BUTTON_MENURIGHT
-1, // BM_BUTTON_MENUUP NO_DEFAULT_KEY, // BM_BUTTON_MENUUP
-1, // BM_BUTTON_MENUDOWN NO_DEFAULT_KEY, // BM_BUTTON_MENUDOWN
-1, // BM_BUTTON_COIN NO_DEFAULT_KEY, // BM_BUTTON_COIN
-1 // BM_BUTTON_OPERATOR NO_DEFAULT_KEY // BM_BUTTON_OPERATOR
}, },
} }
}, },
@@ -1114,22 +1114,22 @@ GameDef g_GameDefs[NUM_GAMES] =
SDLK_SCROLLOCK // LIGHTS_BUTTON_OPERATOR SDLK_SCROLLOCK // LIGHTS_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
-1, //no default key // LIGHTS_BUTTON_MARQUEE_UP_LEFT, NO_DEFAULT_KEY // LIGHTS_BUTTON_MARQUEE_UP_LEFT,
-1, //no default key // LIGHTS_BUTTON_MARQUEE_UP_RIGHT, NO_DEFAULT_KEY // LIGHTS_BUTTON_MARQUEE_UP_RIGHT,
-1, //no default key // LIGHTS_BUTTON_MARQUEE_LR_LEFT, NO_DEFAULT_KEY // LIGHTS_BUTTON_MARQUEE_LR_LEFT,
-1, //no default key // LIGHTS_BUTTON_MARQUEE_LR_RIGHT, NO_DEFAULT_KEY // LIGHTS_BUTTON_MARQUEE_LR_RIGHT,
-1, //no default key // LIGHTS_BUTTON_BUTTONS_LEFT, NO_DEFAULT_KEY // LIGHTS_BUTTON_BUTTONS_LEFT,
-1, //no default key // LIGHTS_BUTTON_BUTTONS_RIGHT, NO_DEFAULT_KEY // LIGHTS_BUTTON_BUTTONS_RIGHT,
-1, //no default key // LIGHTS_BUTTON_BASS_LEFT, NO_DEFAULT_KEY // LIGHTS_BUTTON_BASS_LEFT,
-1, //no default key // LIGHTS_BUTTON_BASS_RIGHT, NO_DEFAULT_KEY // LIGHTS_BUTTON_BASS_RIGHT,
-1, //no default key // LIGHTS_BUTTON_START, NO_DEFAULT_KEY // LIGHTS_BUTTON_START,
-1, //no default key // LIGHTS_BUTTON_BACK NO_DEFAULT_KEY // LIGHTS_BUTTON_BACK
-1, //no default key // LIGHTS_BUTTON_MENULEFT NO_DEFAULT_KEY // LIGHTS_BUTTON_MENULEFT
-1, //no default key // LIGHTS_BUTTON_MENURIGHT NO_DEFAULT_KEY // LIGHTS_BUTTON_MENURIGHT
-1, //no default key // LIGHTS_BUTTON_MENUUP NO_DEFAULT_KEY // LIGHTS_BUTTON_MENUUP
-1, //no default key // LIGHTS_BUTTON_MENUDOWN NO_DEFAULT_KEY // LIGHTS_BUTTON_MENUDOWN
-1, //no default key // LIGHTS_BUTTON_COIN NO_DEFAULT_KEY // LIGHTS_BUTTON_COIN
-1, //no default key // LIGHTS_BUTTON_OPERATOR NO_DEFAULT_KEY // LIGHTS_BUTTON_OPERATOR
}, },
} }
}, },
stepmania/src/InputMapper.cpp
+17 -14
View File
@@ -58,7 +58,7 @@ void InputMapper::AddDefaultMappingsForCurrentGameIfUnmapped()
for( int b=0; b<pGameDef->m_iButtonsPerController; b++ ) for( int b=0; b<pGameDef->m_iButtonsPerController; b++ )
{ {
int key = pGameDef->m_iDefaultKeyboardKey[c][b]; int key = pGameDef->m_iDefaultKeyboardKey[c][b];
if( key == -1 ) // "no key" marker" if( key == NO_DEFAULT_KEY )
continue; continue;
DeviceInput DeviceI( DEVICE_KEYBOARD, key ); DeviceInput DeviceI( DEVICE_KEYBOARD, key );
GameInput GameI( (GameController)c, (GameButton)b ); GameInput GameI( (GameController)c, (GameButton)b );
@@ -73,7 +73,9 @@ struct AutoJoyMapping
Game game; Game game;
const char *szDriverRegex; // reported by InputHandler const char *szDriverRegex; // reported by InputHandler
const char *szControllerName; // the product name of the controller const char *szControllerName; // the product name of the controller
struct { struct Mapping {
bool IsEndMarker() const { return iSlotIndex==-1; }
int iSlotIndex; // -1 == end marker int iSlotIndex; // -1 == end marker
int deviceButton; int deviceButton;
GameButton gb; GameButton gb;
@@ -88,6 +90,7 @@ struct AutoJoyMapping
bool SecondController; bool SecondController;
} maps[32]; } maps[32];
}; };
#define END_MARKER {-1, -1, -1, false }, // end marker
const AutoJoyMapping g_AutoJoyMappings[] = const AutoJoyMapping g_AutoJoyMappings[] =
{ {
{ {
@@ -99,7 +102,7 @@ const AutoJoyMapping g_AutoJoyMappings[] =
{ 0, JOY_14, DANCE_BUTTON_RIGHT, false }, { 0, JOY_14, DANCE_BUTTON_RIGHT, false },
{ 0, JOY_13, DANCE_BUTTON_UP, false }, { 0, JOY_13, DANCE_BUTTON_UP, false },
{ 0, JOY_15, DANCE_BUTTON_DOWN, false }, { 0, JOY_15, DANCE_BUTTON_DOWN, false },
{-1, -1, -1, false }, // end marker END_MARKER
} }
}, },
{ {
@@ -111,7 +114,7 @@ const AutoJoyMapping g_AutoJoyMappings[] =
{ 0, JOY_14, DANCE_BUTTON_RIGHT, false }, { 0, JOY_14, DANCE_BUTTON_RIGHT, false },
{ 0, JOY_13, DANCE_BUTTON_UP, false }, { 0, JOY_13, DANCE_BUTTON_UP, false },
{ 0, JOY_15, DANCE_BUTTON_DOWN, false }, { 0, JOY_15, DANCE_BUTTON_DOWN, false },
{-1, -1, -1, false }, // end marker END_MARKER
} }
}, },
{ {
@@ -131,7 +134,7 @@ const AutoJoyMapping g_AutoJoyMappings[] =
{ 0, JOY_6, DANCE_BUTTON_UPRIGHT, false }, { 0, JOY_6, DANCE_BUTTON_UPRIGHT, false },
{ 0, JOY_9, DANCE_BUTTON_BACK, false }, { 0, JOY_9, DANCE_BUTTON_BACK, false },
{ 0, JOY_10, DANCE_BUTTON_START, false }, { 0, JOY_10, DANCE_BUTTON_START, false },
{-1, -1, -1, false }, // end marker END_MARKER
} }
}, },
{ {
@@ -151,7 +154,7 @@ const AutoJoyMapping g_AutoJoyMappings[] =
{ 0, JOY_8, DANCE_BUTTON_UPRIGHT, false }, { 0, JOY_8, DANCE_BUTTON_UPRIGHT, false },
{ 0, JOY_9, DANCE_BUTTON_BACK, false }, { 0, JOY_9, DANCE_BUTTON_BACK, false },
{ 0, JOY_10, DANCE_BUTTON_START, false }, { 0, JOY_10, DANCE_BUTTON_START, false },
{-1, -1, -1, false }, // end marker END_MARKER
} }
}, },
{ {
@@ -173,7 +176,7 @@ const AutoJoyMapping g_AutoJoyMappings[] =
{ 1, JOY_8, DANCE_BUTTON_UPRIGHT, false }, { 1, JOY_8, DANCE_BUTTON_UPRIGHT, false },
{ 0, JOY_10, DANCE_BUTTON_BACK, false }, { 0, JOY_10, DANCE_BUTTON_BACK, false },
{ 0, JOY_9, DANCE_BUTTON_START, false }, { 0, JOY_9, DANCE_BUTTON_START, false },
{-1, -1, -1, false }, // end marker END_MARKER
} }
}, },
{ {
@@ -195,7 +198,7 @@ const AutoJoyMapping g_AutoJoyMappings[] =
{ 1, JOY_8, DANCE_BUTTON_UPRIGHT, false }, { 1, JOY_8, DANCE_BUTTON_UPRIGHT, false },
{ 0, JOY_10, DANCE_BUTTON_BACK, false }, { 0, JOY_10, DANCE_BUTTON_BACK, false },
{ 0, JOY_9, DANCE_BUTTON_START, false }, { 0, JOY_9, DANCE_BUTTON_START, false },
{-1, -1, -1, false }, // end marker END_MARKER
} }
}, },
{ {
@@ -217,7 +220,7 @@ const AutoJoyMapping g_AutoJoyMappings[] =
{ 1, JOY_8, DANCE_BUTTON_UPRIGHT, false }, { 1, JOY_8, DANCE_BUTTON_UPRIGHT, false },
{ 0, JOY_9, DANCE_BUTTON_BACK, false }, { 0, JOY_9, DANCE_BUTTON_BACK, false },
{ 0, JOY_10, DANCE_BUTTON_START, false }, { 0, JOY_10, DANCE_BUTTON_START, false },
{-1, -1, -1, false }, // end marker END_MARKER
} }
}, },
{ {
@@ -239,7 +242,7 @@ const AutoJoyMapping g_AutoJoyMappings[] =
{ 1, JOY_6, DANCE_BUTTON_UPRIGHT, false }, { 1, JOY_6, DANCE_BUTTON_UPRIGHT, false },
{ 0, JOY_10, DANCE_BUTTON_BACK, false }, { 0, JOY_10, DANCE_BUTTON_BACK, false },
{ 0, JOY_9, DANCE_BUTTON_START, false }, { 0, JOY_9, DANCE_BUTTON_START, false },
{-1, -1, -1, false }, // end marker END_MARKER
} }
}, },
{ {
@@ -259,7 +262,7 @@ const AutoJoyMapping g_AutoJoyMappings[] =
{ 0, JOY_8, DANCE_BUTTON_UPRIGHT, false }, // R shoulder { 0, JOY_8, DANCE_BUTTON_UPRIGHT, false }, // R shoulder
{ 0, JOY_9, DANCE_BUTTON_START, false }, { 0, JOY_9, DANCE_BUTTON_START, false },
{ 0, JOY_10, DANCE_BUTTON_BACK, false }, { 0, JOY_10, DANCE_BUTTON_BACK, false },
{-1, -1, -1, false }, // end marker END_MARKER
} }
}, },
{ {
@@ -284,7 +287,7 @@ const AutoJoyMapping g_AutoJoyMappings[] =
{ 0, JOY_18, DANCE_BUTTON_UPRIGHT, true }, { 0, JOY_18, DANCE_BUTTON_UPRIGHT, true },
{ 0, JOY_19, DANCE_BUTTON_UPLEFT, true }, { 0, JOY_19, DANCE_BUTTON_UPLEFT, true },
{ 0, JOY_26, DANCE_BUTTON_START, true }, { 0, JOY_26, DANCE_BUTTON_START, true },
{-1, -1, -1, false }, // end marker END_MARKER
} }
}, },
{ {
@@ -303,7 +306,7 @@ const AutoJoyMapping g_AutoJoyMappings[] =
{ 0, PUMP_2P_MID, PUMP_BUTTON_CENTER, true }, { 0, PUMP_2P_MID, PUMP_BUTTON_CENTER, true },
{ 0, PUMP_2P_DL, PUMP_BUTTON_DOWNLEFT, true }, { 0, PUMP_2P_DL, PUMP_BUTTON_DOWNLEFT, true },
{ 0, PUMP_2P_DR, PUMP_BUTTON_DOWNRIGHT, true }, { 0, PUMP_2P_DR, PUMP_BUTTON_DOWNRIGHT, true },
{-1, -1, -1, false }, // end marker END_MARKER
} }
}, },
}; };
@@ -338,7 +341,7 @@ void InputMapper::AutoMapJoysticksForCurrentGame()
LOG->Info( "Applying default joystick mapping #%d for device '%s' (%s)", LOG->Info( "Applying default joystick mapping #%d for device '%s' (%s)",
iNumJoysticksMapped+1, mapping.szDriverRegex, mapping.szControllerName ); iNumJoysticksMapped+1, mapping.szDriverRegex, mapping.szControllerName );
for( int k=0; mapping.maps[k].iSlotIndex != -1; k++ ) for( int k=0; !mapping.maps[k].IsEndMarker(); k++ )
{ {
if( mapping.maps[k].SecondController ) if( mapping.maps[k].SecondController )
{ {