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

update

Browse Source
This commit is contained in:
Glenn Maynard
2004-09-09 17:48:25 +00:00
parent 120c09a9fb
commit 09d9197e29
9 changed files with 343 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameManager.cpp
+203 -203
View File
@@ -149,34 +149,34 @@ Game g_Games[NUM_GAMES] =
}, },
{ // m_iDefaultKeyboardKey { // m_iDefaultKeyboardKey
{ // PLAYER_1 { // PLAYER_1
SDLK_LEFT, // DANCE_BUTTON_LEFT, KEY_LEFT, // DANCE_BUTTON_LEFT,
SDLK_RIGHT, // DANCE_BUTTON_RIGHT, KEY_RIGHT, // DANCE_BUTTON_RIGHT,
SDLK_UP, // DANCE_BUTTON_UP, KEY_UP, // DANCE_BUTTON_UP,
SDLK_DOWN, // DANCE_BUTTON_DOWN, KEY_DOWN, // DANCE_BUTTON_DOWN,
NO_DEFAULT_KEY, // DANCE_BUTTON_UPLEFT, NO_DEFAULT_KEY, // DANCE_BUTTON_UPLEFT,
NO_DEFAULT_KEY, // DANCE_BUTTON_UPRIGHT, NO_DEFAULT_KEY, // DANCE_BUTTON_UPRIGHT,
SDLK_RETURN, // DANCE_BUTTON_START, KEY_ENTER, // DANCE_BUTTON_START,
SDLK_ESCAPE, // DANCE_BUTTON_BACK KEY_ESC, // DANCE_BUTTON_BACK
SDLK_DELETE, // DANCE_BUTTON_MENULEFT KEY_DEL, // DANCE_BUTTON_MENULEFT
SDLK_PAGEDOWN, // DANCE_BUTTON_MENURIGHT KEY_PGDN, // DANCE_BUTTON_MENURIGHT
SDLK_HOME, // DANCE_BUTTON_MENUUP KEY_HOME, // DANCE_BUTTON_MENUUP
SDLK_END, // DANCE_BUTTON_MENUDOWN KEY_END, // DANCE_BUTTON_MENUDOWN
SDLK_F1, // DANCE_BUTTON_COIN KEY_F1, // DANCE_BUTTON_COIN
SDLK_SCROLLOCK // DANCE_BUTTON_OPERATOR KEY_SCRLLOCK // DANCE_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
SDLK_KP4, // DANCE_BUTTON_LEFT, KEY_KP_C4, // DANCE_BUTTON_LEFT,
SDLK_KP6, // DANCE_BUTTON_RIGHT, KEY_KP_C6, // DANCE_BUTTON_RIGHT,
SDLK_KP8, // DANCE_BUTTON_UP, KEY_KP_C8, // DANCE_BUTTON_UP,
SDLK_KP2, // DANCE_BUTTON_DOWN, KEY_KP_C2, // DANCE_BUTTON_DOWN,
SDLK_KP7, // DANCE_BUTTON_UPLEFT, KEY_KP_C7, // DANCE_BUTTON_UPLEFT,
SDLK_KP9, // DANCE_BUTTON_UPRIGHT, KEY_KP_C9, // DANCE_BUTTON_UPRIGHT,
SDLK_KP_ENTER, // DANCE_BUTTON_START, KEY_KP_ENTER, // DANCE_BUTTON_START,
SDLK_NUMLOCK, // DANCE_BUTTON_BACK KEY_NUMLOCK, // DANCE_BUTTON_BACK
SDLK_KP_DIVIDE, // DANCE_BUTTON_MENULEFT KEY_KP_SLASH, // DANCE_BUTTON_MENULEFT
SDLK_KP_MULTIPLY, // DANCE_BUTTON_MENURIGHT KEY_KP_ASTERISK, // DANCE_BUTTON_MENURIGHT
SDLK_KP_MINUS, // DANCE_BUTTON_MENUUP KEY_KP_HYPHEN, // DANCE_BUTTON_MENUUP
SDLK_KP_PLUS, // DANCE_BUTTON_MENUDOWN KEY_KP_PLUS, // DANCE_BUTTON_MENUDOWN
NO_DEFAULT_KEY, // DANCE_BUTTON_COIN NO_DEFAULT_KEY, // DANCE_BUTTON_COIN
NO_DEFAULT_KEY // DANCE_BUTTON_OPERATOR NO_DEFAULT_KEY // DANCE_BUTTON_OPERATOR
}, },
@@ -244,28 +244,28 @@ Game g_Games[NUM_GAMES] =
}, },
{ // m_iDefaultKeyboardKey { // m_iDefaultKeyboardKey
{ // PLAYER_1 { // PLAYER_1
SDLK_q, // PUMP_BUTTON_UPLEFT, KEY_Cq, // PUMP_BUTTON_UPLEFT,
SDLK_e, // PUMP_BUTTON_UPRIGHT, KEY_Ce, // PUMP_BUTTON_UPRIGHT,
SDLK_s, // PUMP_BUTTON_CENTER, KEY_Cs, // PUMP_BUTTON_CENTER,
SDLK_z, // PUMP_BUTTON_DOWNLEFT, KEY_Cz, // PUMP_BUTTON_DOWNLEFT,
SDLK_c, // PUMP_BUTTON_DOWNRIGHT, KEY_Cc, // PUMP_BUTTON_DOWNRIGHT,
SDLK_RETURN, // PUMP_BUTTON_START, KEY_ENTER, // PUMP_BUTTON_START,
SDLK_ESCAPE, // PUMP_BUTTON_BACK, KEY_ESC, // PUMP_BUTTON_BACK,
SDLK_LEFT, // PUMP_BUTTON_MENULEFT KEY_LEFT, // PUMP_BUTTON_MENULEFT
SDLK_RIGHT, // PUMP_BUTTON_MENURIGHT KEY_RIGHT, // PUMP_BUTTON_MENURIGHT
SDLK_UP, // PUMP_BUTTON_MENUUP KEY_UP, // PUMP_BUTTON_MENUUP
SDLK_DOWN, // PUMP_BUTTON_MENUDOWN KEY_DOWN, // PUMP_BUTTON_MENUDOWN
SDLK_F1, // PUMP_BUTTON_COIN KEY_F1, // PUMP_BUTTON_COIN
SDLK_SCROLLOCK // PUMP_BUTTON_OPERATOR KEY_SCRLLOCK // PUMP_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
SDLK_KP7, // PUMP_BUTTON_UPLEFT, KEY_KP_C7, // PUMP_BUTTON_UPLEFT,
SDLK_KP9, // PUMP_BUTTON_UPRIGHT, KEY_KP_C9, // PUMP_BUTTON_UPRIGHT,
SDLK_KP5, // PUMP_BUTTON_CENTER, KEY_KP_C5, // PUMP_BUTTON_CENTER,
SDLK_KP1, // PUMP_BUTTON_DOWNLEFT, KEY_KP_C1, // PUMP_BUTTON_DOWNLEFT,
SDLK_KP3, // PUMP_BUTTON_DOWNRIGHT, KEY_KP_C3, // PUMP_BUTTON_DOWNRIGHT,
SDLK_KP_ENTER, // PUMP_BUTTON_START, KEY_KP_ENTER, // PUMP_BUTTON_START,
SDLK_NUMLOCK, // PUMP_BUTTON_BACK, KEY_NUMLOCK, // PUMP_BUTTON_BACK,
NO_DEFAULT_KEY // PUMP_BUTTON_MENULEFT NO_DEFAULT_KEY // PUMP_BUTTON_MENULEFT
NO_DEFAULT_KEY // PUMP_BUTTON_MENURIGHT NO_DEFAULT_KEY // PUMP_BUTTON_MENURIGHT
NO_DEFAULT_KEY // PUMP_BUTTON_MENUUP NO_DEFAULT_KEY // PUMP_BUTTON_MENUUP
@@ -341,21 +341,21 @@ Game g_Games[NUM_GAMES] =
}, },
{ // m_iDefaultKeyboardKey { // m_iDefaultKeyboardKey
{ // PLAYER_1 { // PLAYER_1
SDLK_z, // EZ2_BUTTON_FOOTUPLEFT, KEY_Cz, // EZ2_BUTTON_FOOTUPLEFT,
SDLK_b, // EZ2_BUTTON_FOOTUPRIGHT, KEY_Cb, // EZ2_BUTTON_FOOTUPRIGHT,
SDLK_c, // EZ2_BUTTON_FOOTDOWN, KEY_Cc, // EZ2_BUTTON_FOOTDOWN,
SDLK_x, // EZ2_BUTTON_HANDUPLEFT, KEY_Cx, // EZ2_BUTTON_HANDUPLEFT,
SDLK_v, // EZ2_BUTTON_HANDUPRIGHT, KEY_Cv, // EZ2_BUTTON_HANDUPRIGHT,
SDLK_s, // EZ2_BUTTON_HANDLRLEFT, KEY_Cs, // EZ2_BUTTON_HANDLRLEFT,
SDLK_f, // EZ2_BUTTON_HANDLRRIGHT, KEY_Cf, // EZ2_BUTTON_HANDLRRIGHT,
SDLK_RETURN, // EZ2_BUTTON_START, KEY_ENTER, // EZ2_BUTTON_START,
SDLK_ESCAPE, // EZ2_BUTTON_BACK, KEY_ESC, // EZ2_BUTTON_BACK,
SDLK_LEFT, // EZ2_BUTTON_MENULEFT KEY_LEFT, // EZ2_BUTTON_MENULEFT
SDLK_RIGHT, // EZ2_BUTTON_MENURIGHT KEY_RIGHT, // EZ2_BUTTON_MENURIGHT
SDLK_UP, // EZ2_BUTTON_MENUUP KEY_UP, // EZ2_BUTTON_MENUUP
SDLK_DOWN, // EZ2_BUTTON_MENUDOWN KEY_DOWN, // EZ2_BUTTON_MENUDOWN
SDLK_F1, // EZ2_BUTTON_COIN KEY_F1, // EZ2_BUTTON_COIN
SDLK_SCROLLOCK // EZ2_BUTTON_OPERATOR KEY_SCRLLOCK // EZ2_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
NO_DEFAULT_KEY, // EZ2_BUTTON_FOOTUPLEFT, NO_DEFAULT_KEY, // EZ2_BUTTON_FOOTUPLEFT,
@@ -438,19 +438,19 @@ Game g_Games[NUM_GAMES] =
}, },
{ // m_iDefaultKeyboardKey { // m_iDefaultKeyboardKey
{ // PLAYER_1 { // PLAYER_1
SDLK_z, // PARA_BUTTON_LEFT, KEY_Cz, // PARA_BUTTON_LEFT,
SDLK_x, // PARA_BUTTON_UPLEFT, KEY_Cx, // PARA_BUTTON_UPLEFT,
SDLK_c, // PARA_BUTTON_UP, KEY_Cc, // PARA_BUTTON_UP,
SDLK_v, // PARA_BUTTON_UPRIGHT, KEY_Cv, // PARA_BUTTON_UPRIGHT,
SDLK_b, // PARA_BUTTON_RIGHT, KEY_Cb, // PARA_BUTTON_RIGHT,
SDLK_RETURN, // PARA_BUTTON_START, KEY_ENTER, // PARA_BUTTON_START,
SDLK_ESCAPE, // PARA_BUTTON_BACK KEY_ESC, // PARA_BUTTON_BACK
SDLK_LEFT, //no default key // PARA_BUTTON_MENULEFT KEY_LEFT, //no default key // PARA_BUTTON_MENULEFT
SDLK_RIGHT, //no default key // PARA_BUTTON_MENURIGHT KEY_RIGHT, //no default key // PARA_BUTTON_MENURIGHT
SDLK_UP, // PARA_BUTTON_MENUUP KEY_UP, // PARA_BUTTON_MENUUP
SDLK_DOWN, // PARA_BUTTON_MENUDOWN KEY_DOWN, // PARA_BUTTON_MENUDOWN
SDLK_F1, // PARA_BUTTON_COIN KEY_F1, // PARA_BUTTON_COIN
SDLK_SCROLLOCK // PARA_BUTTON_OPERATOR KEY_SCRLLOCK // PARA_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
NO_DEFAULT_KEY, // PARA_BUTTON_LEFT, NO_DEFAULT_KEY, // PARA_BUTTON_LEFT,
@@ -537,22 +537,22 @@ Game g_Games[NUM_GAMES] =
}, },
{ // m_iDefaultKeyboardKey { // m_iDefaultKeyboardKey
{ // PLAYER_1 { // PLAYER_1
SDLK_a, // DS3DDX_BUTTON_HANDLEFT, KEY_Ca, // DS3DDX_BUTTON_HANDLEFT,
SDLK_z, // DS3DDX_BUTTON_FOOTDOWNLEFT, KEY_Cz, // DS3DDX_BUTTON_FOOTDOWNLEFT,
SDLK_q, // DS3DDX_BUTTON_FOOTUPLEFT, KEY_Cq, // DS3DDX_BUTTON_FOOTUPLEFT,
SDLK_w, // DS3DDX_BUTTON_HANDUP, KEY_Cw, // DS3DDX_BUTTON_HANDUP,
SDLK_x, // DS3DDX_BUTTON_HANDDOWN, KEY_Cx, // DS3DDX_BUTTON_HANDDOWN,
SDLK_e, // DS3DDX_BUTTON_FOOTUPRIGHT, KEY_Ce, // DS3DDX_BUTTON_FOOTUPRIGHT,
SDLK_c, // DS3DDX_BUTTON_FOOTDOWNRIGHT, KEY_Cc, // DS3DDX_BUTTON_FOOTDOWNRIGHT,
SDLK_d, // DS3DDX_BUTTON_HANDRIGHT, KEY_Cd, // DS3DDX_BUTTON_HANDRIGHT,
SDLK_RETURN, // DS3DDX_BUTTON_START, KEY_ENTER, // DS3DDX_BUTTON_START,
SDLK_ESCAPE, // DS3DDX_BUTTON_BACK KEY_ESC, // DS3DDX_BUTTON_BACK
SDLK_LEFT, //no default key // DS3DDX_BUTTON_MENULEFT KEY_LEFT, //no default key // DS3DDX_BUTTON_MENULEFT
SDLK_RIGHT, //no default key // DS3DDX_BUTTON_MENURIGHT KEY_RIGHT, //no default key // DS3DDX_BUTTON_MENURIGHT
SDLK_UP, // DS3DDX_BUTTON_MENUUP KEY_UP, // DS3DDX_BUTTON_MENUUP
SDLK_DOWN, // DS3DDX_BUTTON_MENUDOWN KEY_DOWN, // DS3DDX_BUTTON_MENUDOWN
SDLK_F1, // DS3DDX_BUTTON_COIN KEY_F1, // DS3DDX_BUTTON_COIN
SDLK_SCROLLOCK // DS3DDX_BUTTON_OPERATOR KEY_SCRLLOCK // DS3DDX_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
NO_DEFAULT_KEY, // DS3DDX_BUTTON_HANDLEFT, NO_DEFAULT_KEY, // DS3DDX_BUTTON_HANDLEFT,
@@ -641,21 +641,21 @@ Game g_Games[NUM_GAMES] =
}, },
{ // m_iDefaultKeyboardKey { // m_iDefaultKeyboardKey
{ // PLAYER_1 { // PLAYER_1
SDLK_m, // BM_BUTTON_KEY1, KEY_Cm, // BM_BUTTON_KEY1,
SDLK_k, // BM_BUTTON_KEY2, KEY_Ck, // BM_BUTTON_KEY2,
SDLK_COMMA, // BM_BUTTON_KEY3, KEY_COMMA, // BM_BUTTON_KEY3,
SDLK_l, // BM_BUTTON_KEY4, KEY_Cl, // BM_BUTTON_KEY4,
SDLK_PERIOD, // BM_BUTTON_KEY5, KEY_PERIOD, // BM_BUTTON_KEY5,
SDLK_LSHIFT, // BM_BUTTON_SCRATCHUP, KEY_LSHIFT, // BM_BUTTON_SCRATCHUP,
NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHDOWN, NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHDOWN,
SDLK_RETURN, // BM_BUTTON_START, KEY_ENTER, // BM_BUTTON_START,
NO_DEFAULT_KEY, // BM_BUTTON_SELECT, NO_DEFAULT_KEY, // BM_BUTTON_SELECT,
SDLK_LEFT, // BM_BUTTON_MENULEFT KEY_LEFT, // BM_BUTTON_MENULEFT
SDLK_RIGHT, // BM_BUTTON_MENURIGHT KEY_RIGHT, // BM_BUTTON_MENURIGHT
SDLK_UP, // BM_BUTTON_MENUUP KEY_UP, // BM_BUTTON_MENUUP
SDLK_DOWN, // BM_BUTTON_MENUDOWN KEY_DOWN, // BM_BUTTON_MENUDOWN
SDLK_F1, // BM_BUTTON_COIN KEY_F1, // BM_BUTTON_COIN
SDLK_SCROLLOCK // BM_BUTTON_OPERATOR KEY_SCRLLOCK // BM_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
NO_DEFAULT_KEY, // BM_BUTTON_KEY1, NO_DEFAULT_KEY, // BM_BUTTON_KEY1,
@@ -747,23 +747,23 @@ Game g_Games[NUM_GAMES] =
}, },
{ // m_iDefaultKeyboardKey { // m_iDefaultKeyboardKey
{ // PLAYER_1 { // PLAYER_1
SDLK_m, // IIDX_BUTTON_KEY1, KEY_Cm, // IIDX_BUTTON_KEY1,
SDLK_k, // IIDX_BUTTON_KEY2, KEY_Ck, // IIDX_BUTTON_KEY2,
SDLK_COMMA, // IIDX_BUTTON_KEY3, KEY_COMMA, // IIDX_BUTTON_KEY3,
SDLK_l, // IIDX_BUTTON_KEY4, KEY_Cl, // IIDX_BUTTON_KEY4,
SDLK_PERIOD, // IIDX_BUTTON_KEY5, KEY_PERIOD, // IIDX_BUTTON_KEY5,
SDLK_SEMICOLON, // IIDX_BUTTON_KEY6, KEY_SEMICOLON, // IIDX_BUTTON_KEY6,
SDLK_SLASH, // IIDX_BUTTON_KEY7, KEY_SLASH, // IIDX_BUTTON_KEY7,
SDLK_LSHIFT, // IIDX_BUTTON_SCRATCHUP, KEY_LSHIFT, // IIDX_BUTTON_SCRATCHUP,
NO_DEFAULT_KEY, // IIDX_BUTTON_SCRATCHDOWN, NO_DEFAULT_KEY, // IIDX_BUTTON_SCRATCHDOWN,
SDLK_RETURN, // IIDX_BUTTON_START, KEY_ENTER, // IIDX_BUTTON_START,
NO_DEFAULT_KEY, // IIDX_BUTTON_SELECT, NO_DEFAULT_KEY, // IIDX_BUTTON_SELECT,
SDLK_LEFT, // IIDX_BUTTON_MENULEFT KEY_LEFT, // IIDX_BUTTON_MENULEFT
SDLK_RIGHT, // IIDX_BUTTON_MENURIGHT KEY_RIGHT, // IIDX_BUTTON_MENURIGHT
SDLK_UP, // IIDX_BUTTON_MENUUP KEY_UP, // IIDX_BUTTON_MENUUP
SDLK_DOWN, // IIDX_BUTTON_MENUDOWN KEY_DOWN, // IIDX_BUTTON_MENUDOWN
SDLK_F1, // IIDX_BUTTON_COIN KEY_F1, // IIDX_BUTTON_COIN
SDLK_SCROLLOCK // IIDX_BUTTON_OPERATOR KEY_SCRLLOCK // IIDX_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
NO_DEFAULT_KEY, // IIDX_BUTTON_KEY1, NO_DEFAULT_KEY, // IIDX_BUTTON_KEY1,
@@ -846,30 +846,30 @@ Game g_Games[NUM_GAMES] =
}, },
{ // m_iDefaultKeyboardKey { // m_iDefaultKeyboardKey
{ // PLAYER_1 { // PLAYER_1
SDLK_a, // MANIAX_BUTTON_HANDUPLEFT, KEY_Ca, // MANIAX_BUTTON_HANDUPLEFT,
SDLK_s, // MANIAX_BUTTON_HANDUPRIGHT, KEY_Cs, // MANIAX_BUTTON_HANDUPRIGHT,
SDLK_z, // MANIAX_BUTTON_HANDLRLEFT, KEY_Cz, // MANIAX_BUTTON_HANDLRLEFT,
SDLK_x, // MANIAX_BUTTON_HANDLRRIGHT, KEY_Cx, // MANIAX_BUTTON_HANDLRRIGHT,
SDLK_RETURN, // MANIAX_BUTTON_START, KEY_ENTER, // MANIAX_BUTTON_START,
SDLK_ESCAPE, // MANIAX_BUTTON_BACK KEY_ESC, // MANIAX_BUTTON_BACK
SDLK_LEFT, // MANIAX_BUTTON_MENULEFT KEY_LEFT, // MANIAX_BUTTON_MENULEFT
SDLK_RIGHT, // MANIAX_BUTTON_MENURIGHT KEY_RIGHT, // MANIAX_BUTTON_MENURIGHT
SDLK_UP, // MANIAX_BUTTON_MENUUP KEY_UP, // MANIAX_BUTTON_MENUUP
SDLK_DOWN, // MANIAX_BUTTON_MENUDOWN KEY_DOWN, // MANIAX_BUTTON_MENUDOWN
SDLK_F1, // MANIAX_BUTTON_COIN KEY_F1, // MANIAX_BUTTON_COIN
SDLK_SCROLLOCK // MANIAX_BUTTON_OPERATOR KEY_SCRLLOCK // MANIAX_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
SDLK_KP4, // MANIAX_BUTTON_HANDUPLEFT, KEY_KP_C4, // MANIAX_BUTTON_HANDUPLEFT,
SDLK_KP5, // MANIAX_BUTTON_HANDUPRIGHT, KEY_KP_C5, // MANIAX_BUTTON_HANDUPRIGHT,
SDLK_KP1, // MANIAX_BUTTON_HANDLRLEFT, KEY_KP_C1, // MANIAX_BUTTON_HANDLRLEFT,
SDLK_KP2, // MANIAX_BUTTON_HANDLRRIGHT, KEY_KP_C2, // MANIAX_BUTTON_HANDLRRIGHT,
SDLK_KP_ENTER, // MANIAX_BUTTON_START, KEY_KP_ENTER, // MANIAX_BUTTON_START,
SDLK_NUMLOCK, // MANIAX_BUTTON_BACK KEY_NUMLOCK, // MANIAX_BUTTON_BACK
SDLK_KP_DIVIDE, // MANIAX_BUTTON_MENULEFT KEY_KP_SLASH, // MANIAX_BUTTON_MENULEFT
SDLK_KP_MULTIPLY, // MANIAX_BUTTON_MENURIGHT KEY_KP_ASTERISK, // MANIAX_BUTTON_MENURIGHT
SDLK_KP_MINUS, // MANIAX_BUTTON_MENUUP KEY_KP_HYPHEN, // MANIAX_BUTTON_MENUUP
SDLK_KP_PLUS, // MANIAX_BUTTON_MENUDOWN KEY_KP_PLUS, // MANIAX_BUTTON_MENUDOWN
NO_DEFAULT_KEY, // MANIAX_BUTTON_COIN NO_DEFAULT_KEY, // MANIAX_BUTTON_COIN
NO_DEFAULT_KEY // MANIAX_BUTTON_OPERATOR NO_DEFAULT_KEY // MANIAX_BUTTON_OPERATOR
}, },
@@ -943,40 +943,40 @@ Game g_Games[NUM_GAMES] =
}, },
{ // m_iDefaultKeyboardKey { // m_iDefaultKeyboardKey
{ // PLAYER_1 { // PLAYER_1
SDLK_a, // TECHNO_BUTTON_LEFT, KEY_Ca, // TECHNO_BUTTON_LEFT,
SDLK_d, // TECHNO_BUTTON_RIGHT, KEY_Cd, // TECHNO_BUTTON_RIGHT,
SDLK_w, // TECHNO_BUTTON_UP, KEY_Cw, // TECHNO_BUTTON_UP,
SDLK_x, // TECHNO_BUTTON_DOWN, KEY_Cx, // TECHNO_BUTTON_DOWN,
SDLK_q, // TECHNO_BUTTON_UPLEFT, KEY_Cq, // TECHNO_BUTTON_UPLEFT,
SDLK_e, // TECHNO_BUTTON_UPRIGHT, KEY_Ce, // TECHNO_BUTTON_UPRIGHT,
SDLK_s, // TECHNO_BUTTON_CENTER, KEY_Cs, // TECHNO_BUTTON_CENTER,
SDLK_z, // TECHNO_BUTTON_DOWNLEFT, KEY_Cz, // TECHNO_BUTTON_DOWNLEFT,
SDLK_c, // TECHNO_BUTTON_DOWNRIGHT, KEY_Cc, // TECHNO_BUTTON_DOWNRIGHT,
SDLK_RETURN, // TECHNO_BUTTON_START, KEY_ENTER, // TECHNO_BUTTON_START,
SDLK_ESCAPE, // TECHNO_BUTTON_BACK KEY_ESC, // TECHNO_BUTTON_BACK
SDLK_LEFT, // TECHNO_BUTTON_MENULEFT KEY_LEFT, // TECHNO_BUTTON_MENULEFT
SDLK_RIGHT, // TECHNO_BUTTON_MENURIGHT KEY_RIGHT, // TECHNO_BUTTON_MENURIGHT
SDLK_UP, // TECHNO_BUTTON_MENUUP KEY_UP, // TECHNO_BUTTON_MENUUP
SDLK_DOWN, // TECHNO_BUTTON_MENUDOWN KEY_DOWN, // TECHNO_BUTTON_MENUDOWN
SDLK_F1, // TECHNO_BUTTON_COIN KEY_F1, // TECHNO_BUTTON_COIN
SDLK_SCROLLOCK // TECHNO_BUTTON_OPERATOR KEY_SCRLLOCK // TECHNO_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
SDLK_KP4, // TECHNO_BUTTON_LEFT, KEY_KP_C4, // TECHNO_BUTTON_LEFT,
SDLK_KP6, // TECHNO_BUTTON_RIGHT, KEY_KP_C6, // TECHNO_BUTTON_RIGHT,
SDLK_KP8, // TECHNO_BUTTON_UP, KEY_KP_C8, // TECHNO_BUTTON_UP,
SDLK_KP2, // TECHNO_BUTTON_DOWN, KEY_KP_C2, // TECHNO_BUTTON_DOWN,
SDLK_KP7, // TECHNO_BUTTON_UPLEFT, KEY_KP_C7, // TECHNO_BUTTON_UPLEFT,
SDLK_KP9, // TECHNO_BUTTON_UPRIGHT, KEY_KP_C9, // TECHNO_BUTTON_UPRIGHT,
SDLK_KP5, // TECHNO_BUTTON_CENTER, KEY_KP_C5, // TECHNO_BUTTON_CENTER,
SDLK_KP1, // TECHNO_BUTTON_DOWNLEFT, KEY_KP_C1, // TECHNO_BUTTON_DOWNLEFT,
SDLK_KP3, // TECHNO_BUTTON_DOWNRIGHT, KEY_KP_C3, // TECHNO_BUTTON_DOWNRIGHT,
SDLK_KP_ENTER, // TECHNO_BUTTON_START, KEY_KP_ENTER, // TECHNO_BUTTON_START,
SDLK_NUMLOCK, // TECHNO_BUTTON_BACK KEY_NUMLOCK, // TECHNO_BUTTON_BACK
SDLK_KP_DIVIDE, // TECHNO_BUTTON_MENULEFT KEY_KP_SLASH, // TECHNO_BUTTON_MENULEFT
SDLK_KP_MULTIPLY, // TECHNO_BUTTON_MENURIGHT KEY_KP_ASTERISK, // TECHNO_BUTTON_MENURIGHT
SDLK_KP_MINUS, // TECHNO_BUTTON_MENUUP KEY_KP_HYPHEN, // TECHNO_BUTTON_MENUUP
SDLK_KP_PLUS, // TECHNO_BUTTON_MENUDOWN KEY_KP_PLUS, // TECHNO_BUTTON_MENUDOWN
NO_DEFAULT_KEY, // TECHNO_BUTTON_COIN NO_DEFAULT_KEY, // TECHNO_BUTTON_COIN
NO_DEFAULT_KEY // TECHNO_BUTTON_OPERATOR NO_DEFAULT_KEY // TECHNO_BUTTON_OPERATOR
}, },
@@ -1053,23 +1053,23 @@ Game g_Games[NUM_GAMES] =
}, },
{ // m_iDefaultKeyboardKey { // m_iDefaultKeyboardKey
{ // PLAYER_1 { // PLAYER_1
SDLK_z, // PNM_BUTTON_LEFT_WHITE, KEY_Cz, // PNM_BUTTON_LEFT_WHITE,
SDLK_s, // PNM_BUTTON_LEFT_YELLOW, KEY_Cs, // PNM_BUTTON_LEFT_YELLOW,
SDLK_x, // PNM_BUTTON_LEFT_GREEN, KEY_Cx, // PNM_BUTTON_LEFT_GREEN,
SDLK_d, // PNM_BUTTON_LEFT_BLUE, KEY_Cd, // PNM_BUTTON_LEFT_BLUE,
SDLK_c, // PNM_BUTTON_RED, KEY_Cc, // PNM_BUTTON_RED,
SDLK_f, // PNM_BUTTON_RIGHT_BLUE, KEY_Cf, // PNM_BUTTON_RIGHT_BLUE,
SDLK_v, // PNM_BUTTON_RIGHT_GREEN, KEY_Cv, // PNM_BUTTON_RIGHT_GREEN,
SDLK_g, // PNM_BUTTON_RIGHT_YELLOW, KEY_Cg, // PNM_BUTTON_RIGHT_YELLOW,
SDLK_b, // PNM_BUTTON_RIGHT_WHITE, KEY_Cb, // PNM_BUTTON_RIGHT_WHITE,
SDLK_RETURN, // PNM_BUTTON_MENUSTART KEY_ENTER, // PNM_BUTTON_MENUSTART
SDLK_ESCAPE, // PNM_BUTTON_MENUBACK KEY_ESC, // PNM_BUTTON_MENUBACK
SDLK_LEFT, // PNM_BUTTON_MENULEFT, KEY_LEFT, // PNM_BUTTON_MENULEFT,
SDLK_RIGHT, // PNM_BUTTON_MENURIGHT, KEY_RIGHT, // PNM_BUTTON_MENURIGHT,
SDLK_UP, // PNM_BUTTON_MENUUP KEY_UP, // PNM_BUTTON_MENUUP
SDLK_DOWN, // PNM_BUTTON_MENUDOWN KEY_DOWN, // PNM_BUTTON_MENUDOWN
SDLK_F1, // PNM_BUTTON_COIN KEY_F1, // PNM_BUTTON_COIN
SDLK_SCROLLOCK // PNM_BUTTON_OPERATOR KEY_SCRLLOCK // PNM_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
NO_DEFAULT_KEY, // BM_BUTTON_KEY1, NO_DEFAULT_KEY, // BM_BUTTON_KEY1,
@@ -1160,22 +1160,22 @@ Game g_Games[NUM_GAMES] =
}, },
{ // m_iDefaultKeyboardKey { // m_iDefaultKeyboardKey
{ // PLAYER_1 { // PLAYER_1
SDLK_q, // LIGHTS_BUTTON_MARQUEE_UP_LEFT, KEY_Cq, // LIGHTS_BUTTON_MARQUEE_UP_LEFT,
SDLK_w, // LIGHTS_BUTTON_MARQUEE_UP_RIGHT, KEY_Cw, // LIGHTS_BUTTON_MARQUEE_UP_RIGHT,
SDLK_e, // LIGHTS_BUTTON_MARQUEE_LR_LEFT, KEY_Ce, // LIGHTS_BUTTON_MARQUEE_LR_LEFT,
SDLK_r, // LIGHTS_BUTTON_MARQUEE_LR_RIGHT, KEY_Cr, // LIGHTS_BUTTON_MARQUEE_LR_RIGHT,
SDLK_t, // LIGHTS_BUTTON_BUTTONS_LEFT, KEY_Ct, // LIGHTS_BUTTON_BUTTONS_LEFT,
SDLK_y, // LIGHTS_BUTTON_BUTTONS_RIGHT, KEY_Cy, // LIGHTS_BUTTON_BUTTONS_RIGHT,
SDLK_u, // LIGHTS_BUTTON_BASS_LEFT, KEY_Cu, // LIGHTS_BUTTON_BASS_LEFT,
SDLK_i, // LIGHTS_BUTTON_BASS_RIGHT, KEY_Ci, // LIGHTS_BUTTON_BASS_RIGHT,
SDLK_RETURN, // LIGHTS_BUTTON_START, KEY_ENTER, // LIGHTS_BUTTON_START,
SDLK_ESCAPE, // LIGHTS_BUTTON_BACK KEY_ESC, // LIGHTS_BUTTON_BACK
SDLK_DELETE, // LIGHTS_BUTTON_MENULEFT KEY_DEL, // LIGHTS_BUTTON_MENULEFT
SDLK_PAGEDOWN, // LIGHTS_BUTTON_MENURIGHT KEY_PGDN, // LIGHTS_BUTTON_MENURIGHT
SDLK_HOME, // LIGHTS_BUTTON_MENUUP KEY_HOME, // LIGHTS_BUTTON_MENUUP
SDLK_END, // LIGHTS_BUTTON_MENUDOWN KEY_END, // LIGHTS_BUTTON_MENUDOWN
SDLK_F1, // LIGHTS_BUTTON_COIN KEY_F1, // LIGHTS_BUTTON_COIN
SDLK_SCROLLOCK // LIGHTS_BUTTON_OPERATOR KEY_SCRLLOCK // LIGHTS_BUTTON_OPERATOR
}, },
{ // PLAYER_2 { // PLAYER_2
NO_DEFAULT_KEY // LIGHTS_BUTTON_MARQUEE_UP_LEFT, NO_DEFAULT_KEY // LIGHTS_BUTTON_MARQUEE_UP_LEFT,
stepmania/src/Screen.cpp
+2 -2
View File
@@ -112,7 +112,7 @@ void Screen::Input( const DeviceInput& DeviceI, const InputEventType type, const
if(type == IET_RELEASE) return; // don't care if(type == IET_RELEASE) return; // don't care
/* Don't make the user hold the back button if they're pressing escape and escape is the back button. */ /* Don't make the user hold the back button if they're pressing escape and escape is the back button. */
if( MenuI.button == MENU_BUTTON_BACK && DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == SDLK_ESCAPE ) if( MenuI.button == MENU_BUTTON_BACK && DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == KEY_ESC )
{ {
this->MenuBack( MenuI.player ); this->MenuBack( MenuI.player );
return; return;
@@ -158,7 +158,7 @@ bool Screen::ChangeCoinModeInput( const DeviceInput& DeviceI, const InputEventTy
{ {
if( type != IET_FIRST_PRESS ) if( type != IET_FIRST_PRESS )
return false; return false;
if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == SDLK_F3 ) if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == KEY_F3 )
{ {
PREFSMAN->m_iCoinMode++; PREFSMAN->m_iCoinMode++;
wrap( PREFSMAN->m_iCoinMode, NUM_COIN_MODES ); wrap( PREFSMAN->m_iCoinMode, NUM_COIN_MODES );
stepmania/src/ScreenCenterImage.cpp
+15 -15
View File
@@ -60,8 +60,8 @@ void ScreenCenterImage::Input( const DeviceInput& DeviceI, const InputEventType
return; return;
bool bHoldingShift = bool bHoldingShift =
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, SDLK_RSHIFT)) || INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RSHIFT)) ||
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, SDLK_LSHIFT)); INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT));
int iScale; int iScale;
switch( type ) switch( type )
@@ -94,31 +94,31 @@ void ScreenCenterImage::Input( const DeviceInput& DeviceI, const InputEventType
switch( DeviceI.button ) switch( DeviceI.button )
{ {
case SDLK_SPACE: case KEY_SPACE:
PREFSMAN->m_iCenterImageTranslateX = 0; PREFSMAN->m_iCenterImageTranslateX = 0;
PREFSMAN->m_iCenterImageTranslateY = 0; PREFSMAN->m_iCenterImageTranslateY = 0;
PREFSMAN->m_fCenterImageScaleX = 1; PREFSMAN->m_fCenterImageScaleX = 1;
PREFSMAN->m_fCenterImageScaleY = 1; PREFSMAN->m_fCenterImageScaleY = 1;
break; break;
case SDLK_LEFT: case KEY_LEFT:
if( bHoldingShift ) if( bHoldingShift )
PREFSMAN->m_fCenterImageScaleX -= 0.001f * iScale; PREFSMAN->m_fCenterImageScaleX -= 0.001f * iScale;
else else
PREFSMAN->m_iCenterImageTranslateX -= 1 * iScale; PREFSMAN->m_iCenterImageTranslateX -= 1 * iScale;
break; break;
case SDLK_RIGHT: case KEY_RIGHT:
if( bHoldingShift ) if( bHoldingShift )
PREFSMAN->m_fCenterImageScaleX += 0.001f * iScale; PREFSMAN->m_fCenterImageScaleX += 0.001f * iScale;
else else
PREFSMAN->m_iCenterImageTranslateX += 1 * iScale; PREFSMAN->m_iCenterImageTranslateX += 1 * iScale;
break; break;
case SDLK_UP: case KEY_UP:
if( bHoldingShift ) if( bHoldingShift )
PREFSMAN->m_fCenterImageScaleY -= 0.001f * iScale; PREFSMAN->m_fCenterImageScaleY -= 0.001f * iScale;
else else
PREFSMAN->m_iCenterImageTranslateY -= 1 * iScale; PREFSMAN->m_iCenterImageTranslateY -= 1 * iScale;
break; break;
case SDLK_DOWN: case KEY_DOWN:
if( bHoldingShift ) if( bHoldingShift )
PREFSMAN->m_fCenterImageScaleY += 0.001f * iScale; PREFSMAN->m_fCenterImageScaleY += 0.001f * iScale;
else else
@@ -128,11 +128,11 @@ void ScreenCenterImage::Input( const DeviceInput& DeviceI, const InputEventType
switch( DeviceI.button ) switch( DeviceI.button )
{ {
case SDLK_SPACE: case KEY_SPACE:
case SDLK_LEFT: case KEY_LEFT:
case SDLK_RIGHT: case KEY_RIGHT:
case SDLK_UP: case KEY_UP:
case SDLK_DOWN: case KEY_DOWN:
DISPLAY->ChangeCentering( DISPLAY->ChangeCentering(
PREFSMAN->m_iCenterImageTranslateX, PREFSMAN->m_iCenterImageTranslateX,
PREFSMAN->m_iCenterImageTranslateY, PREFSMAN->m_iCenterImageTranslateY,
@@ -143,14 +143,14 @@ void ScreenCenterImage::Input( const DeviceInput& DeviceI, const InputEventType
switch( DeviceI.button ) switch( DeviceI.button )
{ {
case SDLK_ESCAPE: case KEY_ESC:
if(!IsTransitioning()) if(!IsTransitioning())
{ {
SCREENMAN->PlayBackSound(); SCREENMAN->PlayBackSound();
StartTransitioning( SM_GoToPrevScreen ); StartTransitioning( SM_GoToPrevScreen );
} }
case SDLK_RETURN: case KEY_ENTER:
case SDLK_KP_ENTER: case KEY_KP_ENTER:
if(!IsTransitioning()) if(!IsTransitioning())
{ {
SCREENMAN->PlayStartSound(); SCREENMAN->PlayStartSound();
stepmania/src/ScreenEdit.cpp
+103 -103
View File
@@ -667,8 +667,8 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
if(type == IET_RELEASE) if(type == IET_RELEASE)
{ {
switch( DeviceI.button ) { switch( DeviceI.button ) {
case SDLK_LSHIFT: case KEY_LSHIFT:
case SDLK_RSHIFT: case KEY_RSHIFT:
shiftAnchor = -1; shiftAnchor = -1;
break; break;
} }
@@ -677,29 +677,29 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
switch( DeviceI.button ) switch( DeviceI.button )
{ {
case SDLK_1: case KEY_C1:
case SDLK_2: case KEY_C2:
case SDLK_3: case KEY_C3:
case SDLK_4: case KEY_C4:
case SDLK_5: case KEY_C5:
case SDLK_6: case KEY_C6:
case SDLK_7: case KEY_C7:
case SDLK_8: case KEY_C8:
case SDLK_9: case KEY_C9:
case SDLK_0: case KEY_C0:
{ {
if( type != IET_FIRST_PRESS ) if( type != IET_FIRST_PRESS )
break; // We only care about first presses break; // We only care about first presses
/* Why was this changed back to just "DeviceI.button - SDLK_1"? That causes /* Why was this changed back to just "DeviceI.button - KEY_1"? That causes
* crashes when 0 is pressed (0 - 1 = -1). -glenn */ * crashes when 0 is pressed (0 - 1 = -1). -glenn */
// int iCol = DeviceI.button - SDLK_1; // int iCol = DeviceI.button - KEY_1;
int iCol = DeviceI.button == SDLK_0? 9: DeviceI.button - SDLK_1; int iCol = DeviceI.button == KEY_C0? 9: DeviceI.button - KEY_C1;
// Alt + number = input to right half // Alt + number = input to right half
if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, SDLK_LALT)) || if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LALT)) ||
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, SDLK_RALT))) INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RALT)))
iCol += m_NoteFieldEdit.GetNumTracks()/2; iCol += m_NoteFieldEdit.GetNumTracks()/2;
@@ -730,11 +730,11 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
} }
// Hold LShift to lay mine, hold RShift to lay an attack // Hold LShift to lay mine, hold RShift to lay an attack
if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, SDLK_LSHIFT)) ) if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT)) )
{ {
m_NoteFieldEdit.SetTapNote(iCol, iSongIndex, TAP_MINE ); m_NoteFieldEdit.SetTapNote(iCol, iSongIndex, TAP_MINE );
} }
else if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, SDLK_RSHIFT)) ) else if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RSHIFT)) )
{ {
g_iLastInsertAttackTrack = iCol; g_iLastInsertAttackTrack = iCol;
SCREENMAN->MiniMenu( &g_InsertAttack, SM_BackFromInsertAttack ); SCREENMAN->MiniMenu( &g_InsertAttack, SM_BackFromInsertAttack );
@@ -745,25 +745,25 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
} }
} }
break; break;
case SDLK_UP: case KEY_UP:
case SDLK_DOWN: case KEY_DOWN:
case SDLK_PAGEUP: case KEY_PGUP:
case SDLK_PAGEDOWN: case KEY_PGDN:
{ {
if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,SDLK_LCTRL)) || if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,KEY_LCTRL)) ||
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,SDLK_RCTRL)) ) INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,KEY_RCTRL)) )
{ {
float& fScrollSpeed = GAMESTATE->m_PlayerOptions[PLAYER_1].m_fScrollSpeed; float& fScrollSpeed = GAMESTATE->m_PlayerOptions[PLAYER_1].m_fScrollSpeed;
float fNewScrollSpeed = fScrollSpeed; float fNewScrollSpeed = fScrollSpeed;
if( DeviceI.button == SDLK_UP ) if( DeviceI.button == KEY_UP )
{ {
if( fScrollSpeed == 4 ) if( fScrollSpeed == 4 )
fNewScrollSpeed = 2; fNewScrollSpeed = 2;
else if( fScrollSpeed == 2 ) else if( fScrollSpeed == 2 )
fNewScrollSpeed = 1; fNewScrollSpeed = 1;
} }
else if( DeviceI.button == SDLK_DOWN ) else if( DeviceI.button == KEY_DOWN )
{ {
if( fScrollSpeed == 2 ) if( fScrollSpeed == 2 )
fNewScrollSpeed = 4; fNewScrollSpeed = 4;
@@ -783,16 +783,16 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
float fBeatsToMove=0.f; float fBeatsToMove=0.f;
switch( DeviceI.button ) switch( DeviceI.button )
{ {
case SDLK_UP: case KEY_UP:
case SDLK_DOWN: case KEY_DOWN:
fBeatsToMove = NoteTypeToBeat( m_SnapDisplay.GetNoteType() ); fBeatsToMove = NoteTypeToBeat( m_SnapDisplay.GetNoteType() );
if( DeviceI.button == SDLK_UP ) if( DeviceI.button == KEY_UP )
fBeatsToMove *= -1; fBeatsToMove *= -1;
break; break;
case SDLK_PAGEUP: case KEY_PGUP:
case SDLK_PAGEDOWN: case KEY_PGDN:
fBeatsToMove = BEATS_PER_MEASURE; fBeatsToMove = BEATS_PER_MEASURE;
if( DeviceI.button == SDLK_PAGEUP ) if( DeviceI.button == KEY_PGUP )
fBeatsToMove *= -1; fBeatsToMove *= -1;
} }
@@ -805,14 +805,14 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
int iCol = n; int iCol = n;
// Ctrl + number = input to right half // Ctrl + number = input to right half
if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, SDLK_LALT)) || if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LALT)) ||
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, SDLK_RALT))) INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RALT)))
iCol += m_NoteFieldEdit.GetNumTracks()/2; iCol += m_NoteFieldEdit.GetNumTracks()/2;
if( iCol >= m_NoteFieldEdit.GetNumTracks() ) if( iCol >= m_NoteFieldEdit.GetNumTracks() )
continue; // skip continue; // skip
const DeviceInput di(DEVICE_KEYBOARD, SDLK_1+n); const DeviceInput di(DEVICE_KEYBOARD, KEY_C1+n);
if( !INPUTFILTER->IsBeingPressed(di) ) if( !INPUTFILTER->IsBeingPressed(di) )
@@ -827,8 +827,8 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
m_NoteFieldEdit.AddHoldNote( newHN ); m_NoteFieldEdit.AddHoldNote( newHN );
} }
if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, SDLK_LSHIFT)) || if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT)) ||
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, SDLK_RSHIFT))) INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RSHIFT)))
{ {
/* Shift is being held. /* Shift is being held.
* *
@@ -858,23 +858,23 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
m_soundChangeLine.Play(); m_soundChangeLine.Play();
} }
break; break;
case SDLK_HOME: case KEY_HOME:
GAMESTATE->m_fSongBeat = 0; GAMESTATE->m_fSongBeat = 0;
m_soundChangeLine.Play(); m_soundChangeLine.Play();
break; break;
case SDLK_END: case KEY_END:
GAMESTATE->m_fSongBeat = m_NoteFieldEdit.GetLastBeat(); GAMESTATE->m_fSongBeat = m_NoteFieldEdit.GetLastBeat();
m_soundChangeLine.Play(); m_soundChangeLine.Play();
break; break;
case SDLK_LEFT: case KEY_LEFT:
if( m_SnapDisplay.PrevSnapMode() ) if( m_SnapDisplay.PrevSnapMode() )
OnSnapModeChange(); OnSnapModeChange();
break; break;
case SDLK_RIGHT: case KEY_RIGHT:
if( m_SnapDisplay.NextSnapMode() ) if( m_SnapDisplay.NextSnapMode() )
OnSnapModeChange(); OnSnapModeChange();
break; break;
case SDLK_SPACE: case KEY_SPACE:
if( m_NoteFieldEdit.m_fBeginMarker==-1 && m_NoteFieldEdit.m_fEndMarker==-1 ) if( m_NoteFieldEdit.m_fBeginMarker==-1 && m_NoteFieldEdit.m_fEndMarker==-1 )
{ {
// lay begin marker // lay begin marker
@@ -899,8 +899,8 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
} }
m_soundMarker.Play(); m_soundMarker.Play();
break; break;
case SDLK_RETURN: case KEY_ENTER:
case SDLK_KP_ENTER: case KEY_KP_ENTER:
{ {
// update enabled/disabled in g_AreaMenu // update enabled/disabled in g_AreaMenu
bool bAreaSelected = m_NoteFieldEdit.m_fBeginMarker!=-1 && m_NoteFieldEdit.m_fEndMarker!=-1; bool bAreaSelected = m_NoteFieldEdit.m_fBeginMarker!=-1 && m_NoteFieldEdit.m_fEndMarker!=-1;
@@ -920,18 +920,18 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
SCREENMAN->MiniMenu( &g_AreaMenu, SM_BackFromAreaMenu ); SCREENMAN->MiniMenu( &g_AreaMenu, SM_BackFromAreaMenu );
} }
break; break;
case SDLK_ESCAPE: case KEY_ESC:
SCREENMAN->MiniMenu( &g_MainMenu, SM_BackFromMainMenu ); SCREENMAN->MiniMenu( &g_MainMenu, SM_BackFromMainMenu );
break; break;
case SDLK_F1: case KEY_F1:
SCREENMAN->MiniMenu( &g_KeyboardShortcuts, SM_None ); SCREENMAN->MiniMenu( &g_KeyboardShortcuts, SM_None );
break; break;
case SDLK_F4: case KEY_F4:
GAMESTATE->m_SongOptions.m_bAssistTick ^= 1; GAMESTATE->m_SongOptions.m_bAssistTick ^= 1;
break; break;
case SDLK_F5: case KEY_F5:
case SDLK_F6: case KEY_F6:
{ {
// save current steps // save current steps
Steps* pSteps = GAMESTATE->m_pCurSteps[PLAYER_1]; Steps* pSteps = GAMESTATE->m_pCurSteps[PLAYER_1];
@@ -952,7 +952,7 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
switch( DeviceI.button ) switch( DeviceI.button )
{ {
case SDLK_F5: case KEY_F5:
if( it==vSteps.begin() ) if( it==vSteps.begin() )
{ {
SCREENMAN->PlayInvalidSound(); SCREENMAN->PlayInvalidSound();
@@ -960,7 +960,7 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
} }
it--; it--;
break; break;
case SDLK_F6: case KEY_F6:
it++; it++;
if( it==vSteps.end() ) if( it==vSteps.end() )
{ {
@@ -982,8 +982,8 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
SOUND->PlayOnce( THEME->GetPathToS("ScreenEdit switch") ); SOUND->PlayOnce( THEME->GetPathToS("ScreenEdit switch") );
} }
break; break;
case SDLK_F7: case KEY_F7:
case SDLK_F8: case KEY_F8:
{ {
// MD 11/02/03 - start referring to Editor.ini entries // MD 11/02/03 - start referring to Editor.ini entries
// entries here: BPMDelta, BPMDeltaFine // entries here: BPMDelta, BPMDeltaFine
@@ -991,12 +991,12 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
float fDeltaBPM; float fDeltaBPM;
switch( DeviceI.button ) switch( DeviceI.button )
{ {
case SDLK_F7: fDeltaBPM = - 0.020f; break; case KEY_F7: fDeltaBPM = - 0.020f; break;
case SDLK_F8: fDeltaBPM = + 0.020f; break; case KEY_F8: fDeltaBPM = + 0.020f; break;
default: ASSERT(0); return; default: ASSERT(0); return;
} }
if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, SDLK_RALT)) || if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RALT)) ||
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, SDLK_LALT)) ) INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LALT)) )
fDeltaBPM /= 2; /* .010 */ fDeltaBPM /= 2; /* .010 */
else switch( type ) else switch( type )
{ {
@@ -1008,21 +1008,21 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
m_pSong->SetBPMAtBeat( GAMESTATE->m_fSongBeat, fNewBPM ); m_pSong->SetBPMAtBeat( GAMESTATE->m_fSongBeat, fNewBPM );
} }
break; break;
case SDLK_F9: case KEY_F9:
case SDLK_F10: case KEY_F10:
{ {
// MD 11/02/03 - start referring to Editor.ini entries // MD 11/02/03 - start referring to Editor.ini entries
// entries here: StopDelta, StopDeltaFine // entries here: StopDelta, StopDeltaFine
float fStopDelta; float fStopDelta;
switch( DeviceI.button ) switch( DeviceI.button )
{ {
case SDLK_F9: fStopDelta = -0.02f; break; case KEY_F9: fStopDelta = -0.02f; break;
case SDLK_F10: fStopDelta = +0.02f; break; case KEY_F10: fStopDelta = +0.02f; break;
default: ASSERT(0); return; default: ASSERT(0); return;
} }
// MD 11/02/03 - requested: fine adjust for stops as well // MD 11/02/03 - requested: fine adjust for stops as well
if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, SDLK_RALT)) || if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RALT)) ||
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, SDLK_LALT)) ) INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LALT)) )
fStopDelta /= 4; /* .005 */ fStopDelta /= 4; /* .005 */
else switch( type ) else switch( type )
{ {
@@ -1052,20 +1052,20 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
} }
} }
break; break;
case SDLK_F11: case KEY_F11:
case SDLK_F12: case KEY_F12:
{ {
// MD 11/02/03 - start referring to Editor.ini entries // MD 11/02/03 - start referring to Editor.ini entries
// entries here: OffsetDelta, OffsetDeltaFine // entries here: OffsetDelta, OffsetDeltaFine
float fOffsetDelta; float fOffsetDelta;
switch( DeviceI.button ) switch( DeviceI.button )
{ {
case SDLK_F11: fOffsetDelta = -0.02f; break; case KEY_F11: fOffsetDelta = -0.02f; break;
case SDLK_F12: fOffsetDelta = +0.02f; break; case KEY_F12: fOffsetDelta = +0.02f; break;
default: ASSERT(0); return; default: ASSERT(0); return;
} }
if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, SDLK_RALT)) || if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RALT)) ||
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, SDLK_LALT)) ) INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LALT)) )
fOffsetDelta /= 20; /* 1ms */ fOffsetDelta /= 20; /* 1ms */
else switch( type ) else switch( type )
{ {
@@ -1076,8 +1076,8 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
m_pSong->m_Timing.m_fBeat0OffsetInSeconds += fOffsetDelta; m_pSong->m_Timing.m_fBeat0OffsetInSeconds += fOffsetDelta;
} }
break; break;
case SDLK_LEFTBRACKET: case KEY_LBRACKET:
case SDLK_RIGHTBRACKET: case KEY_RBRACKET:
{ {
// MD 11/02/03 - start referring to Editor.ini entries // MD 11/02/03 - start referring to Editor.ini entries
// entries here: SampleLengthDelta, SampleLengthDeltaFine // entries here: SampleLengthDelta, SampleLengthDeltaFine
@@ -1085,8 +1085,8 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
float fDelta; float fDelta;
switch( DeviceI.button ) switch( DeviceI.button )
{ {
case SDLK_LEFTBRACKET: fDelta = -0.02f; break; case KEY_LBRACKET: fDelta = -0.02f; break;
case SDLK_RIGHTBRACKET: fDelta = +0.02f; break; case KEY_RBRACKET: fDelta = +0.02f; break;
default: ASSERT(0); return; default: ASSERT(0); return;
} }
switch( type ) switch( type )
@@ -1095,8 +1095,8 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
case IET_FAST_REPEAT: fDelta *= 40; break; case IET_FAST_REPEAT: fDelta *= 40; break;
} }
if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, SDLK_LSHIFT)) || if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT)) ||
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, SDLK_RSHIFT))) INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RSHIFT)))
{ {
m_pSong->m_fMusicSampleLengthSeconds += fDelta; m_pSong->m_fMusicSampleLengthSeconds += fDelta;
m_pSong->m_fMusicSampleLengthSeconds = max(m_pSong->m_fMusicSampleLengthSeconds,0); m_pSong->m_fMusicSampleLengthSeconds = max(m_pSong->m_fMusicSampleLengthSeconds,0);
@@ -1106,13 +1106,13 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
} }
} }
break; break;
case SDLK_m: case KEY_Cm:
PlayPreviewMusic(); PlayPreviewMusic();
break; break;
case SDLK_b: case KEY_Cb:
HandleMainMenuChoice( edit_bg_change, NULL ); HandleMainMenuChoice( edit_bg_change, NULL );
break; break;
case SDLK_c: case KEY_Cc:
{ {
g_CourseMode.rows[0].choices.clear(); g_CourseMode.rows[0].choices.clear();
g_CourseMode.rows[0].choices.push_back( "OFF" ); g_CourseMode.rows[0].choices.push_back( "OFF" );
@@ -1145,38 +1145,38 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
SCREENMAN->MiniMenu( &g_CourseMode, SM_BackFromCourseModeMenu ); SCREENMAN->MiniMenu( &g_CourseMode, SM_BackFromCourseModeMenu );
break; break;
} }
case SDLK_p: case KEY_Cp:
{ {
if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,SDLK_LCTRL)) || if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,KEY_LCTRL)) ||
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,SDLK_RCTRL)) ) INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,KEY_RCTRL)) )
HandleMainMenuChoice( play_whole_song, NULL ); HandleMainMenuChoice( play_whole_song, NULL );
else if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,SDLK_LSHIFT)) || else if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,KEY_LSHIFT)) ||
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,SDLK_RSHIFT)) ) INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,KEY_RSHIFT)) )
HandleMainMenuChoice( play_current_beat_to_end, NULL ); HandleMainMenuChoice( play_current_beat_to_end, NULL );
else else
if( m_NoteFieldEdit.m_fBeginMarker!=-1 && m_NoteFieldEdit.m_fEndMarker!=-1 ) if( m_NoteFieldEdit.m_fBeginMarker!=-1 && m_NoteFieldEdit.m_fEndMarker!=-1 )
HandleAreaMenuChoice( play, NULL ); HandleAreaMenuChoice( play, NULL );
} }
break; break;
case SDLK_r: case KEY_Cr:
{ {
if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,SDLK_LCTRL)) || if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,KEY_LCTRL)) ||
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,SDLK_RCTRL)) ) INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,KEY_RCTRL)) )
if( m_NoteFieldEdit.m_fBeginMarker!=-1 && m_NoteFieldEdit.m_fEndMarker!=-1 ) if( m_NoteFieldEdit.m_fBeginMarker!=-1 && m_NoteFieldEdit.m_fEndMarker!=-1 )
HandleAreaMenuChoice( record, NULL ); HandleAreaMenuChoice( record, NULL );
} }
break; break;
case SDLK_INSERT: case KEY_INSERT:
if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,SDLK_LCTRL)) || if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,KEY_LCTRL)) ||
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,SDLK_RCTRL)) ) INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,KEY_RCTRL)) )
HandleAreaMenuChoice( shift_pauses_forward, NULL ); HandleAreaMenuChoice( shift_pauses_forward, NULL );
else else
HandleAreaMenuChoice( insert_and_shift, NULL ); HandleAreaMenuChoice( insert_and_shift, NULL );
SCREENMAN->PlayInvalidSound(); SCREENMAN->PlayInvalidSound();
break; break;
case SDLK_DELETE: case KEY_DEL:
if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,SDLK_LCTRL)) || if( INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,KEY_LCTRL)) ||
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,SDLK_RCTRL)) ) INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD,KEY_RCTRL)) )
HandleAreaMenuChoice( shift_pauses_backward, NULL ); HandleAreaMenuChoice( shift_pauses_backward, NULL );
else else
HandleAreaMenuChoice( delete_and_shift, NULL ); HandleAreaMenuChoice( delete_and_shift, NULL );
@@ -1187,7 +1187,7 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
void ScreenEdit::InputRecord( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ) void ScreenEdit::InputRecord( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
{ {
if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == SDLK_ESCAPE ) if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == KEY_ESC )
{ {
TransitionFromRecordToEdit(); TransitionFromRecordToEdit();
return; return;
@@ -1232,13 +1232,13 @@ void ScreenEdit::InputPlay( const DeviceInput& DeviceI, const InputEventType typ
{ {
switch( DeviceI.button ) switch( DeviceI.button )
{ {
case SDLK_ESCAPE: case KEY_ESC:
TransitionToEdit(); TransitionToEdit();
break; break;
case SDLK_F4: case KEY_F4:
GAMESTATE->m_SongOptions.m_bAssistTick ^= 1; GAMESTATE->m_SongOptions.m_bAssistTick ^= 1;
break; break;
case SDLK_F8: case KEY_F8:
{ {
PREFSMAN->m_bAutoPlay = !PREFSMAN->m_bAutoPlay; PREFSMAN->m_bAutoPlay = !PREFSMAN->m_bAutoPlay;
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
@@ -1246,19 +1246,19 @@ void ScreenEdit::InputPlay( const DeviceInput& DeviceI, const InputEventType typ
GAMESTATE->m_PlayerController[p] = PREFSMAN->m_bAutoPlay?PC_AUTOPLAY:PC_HUMAN; GAMESTATE->m_PlayerController[p] = PREFSMAN->m_bAutoPlay?PC_AUTOPLAY:PC_HUMAN;
} }
break; break;
case SDLK_F11: case KEY_F11:
case SDLK_F12: case KEY_F12:
{ {
float fOffsetDelta; float fOffsetDelta;
switch( DeviceI.button ) switch( DeviceI.button )
{ {
case SDLK_F11: fOffsetDelta = -0.020f; break; case KEY_F11: fOffsetDelta = -0.020f; break;
case SDLK_F12: fOffsetDelta = +0.020f; break; case KEY_F12: fOffsetDelta = +0.020f; break;
default: ASSERT(0); return; default: ASSERT(0); return;
} }
if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, SDLK_RALT)) || if( INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_RALT)) ||
INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, SDLK_LALT)) ) INPUTFILTER->IsBeingPressed( DeviceInput(DEVICE_KEYBOARD, KEY_LALT)) )
fOffsetDelta /= 20; /* 1ms */ fOffsetDelta /= 20; /* 1ms */
else switch( type ) else switch( type )
{ {
stepmania/src/ScreenNetSelectMusic.cpp
+7 -7
View File
@@ -247,18 +247,18 @@ void ScreenNetSelectMusic::Input( const DeviceInput& DeviceI, const InputEventTy
bool bHoldingShift = bool bHoldingShift =
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, SDLK_LSHIFT)) || INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LSHIFT)) ||
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, SDLK_RSHIFT)); INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RSHIFT));
bool bHoldingCtrl = bool bHoldingCtrl =
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, SDLK_LCTRL)) || INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LCTRL)) ||
INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, SDLK_RCTRL)) || INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RCTRL)) ||
(!NSMAN->useSMserver); //If we are disconnected, assume no chatting (!NSMAN->useSMserver); //If we are disconnected, assume no chatting
switch( DeviceI.button ) switch( DeviceI.button )
{ {
case SDLK_RETURN: case KEY_ENTER:
case SDLK_KP_ENTER: case KEY_KP_ENTER:
if (!bHoldingCtrl) if (!bHoldingCtrl)
{ {
NSMAN->SendChat( m_sTextInput ); NSMAN->SendChat( m_sTextInput );
@@ -267,7 +267,7 @@ void ScreenNetSelectMusic::Input( const DeviceInput& DeviceI, const InputEventTy
return; return;
} }
break; break;
case SDLK_BACKSPACE: case KEY_BACK:
if(!m_sTextInput.empty()) if(!m_sTextInput.empty())
m_sTextInput = m_sTextInput.erase( m_sTextInput.size()-1 ); m_sTextInput = m_sTextInput.erase( m_sTextInput.size()-1 );
UpdateTextInput(); UpdateTextInput();
stepmania/src/ScreenPrompt.cpp
+2 -2
View File
@@ -92,10 +92,10 @@ void ScreenPrompt::Input( const DeviceInput& DeviceI, const InputEventType type,
{ {
switch( DeviceI.button ) switch( DeviceI.button )
{ {
case SDLK_LEFT: case KEY_LEFT:
this->MenuLeft( StyleI.player ); this->MenuLeft( StyleI.player );
return; return;
case SDLK_RIGHT: case KEY_RIGHT:
this->MenuRight( StyleI.player ); this->MenuRight( StyleI.player );
return; return;
} }
stepmania/src/ScreenTest.cpp
+3 -3
View File
@@ -43,13 +43,13 @@ void ScreenTest::Input( const DeviceInput& DeviceI, const InputEventType type, c
{ {
if(DeviceI.device == DEVICE_KEYBOARD) if(DeviceI.device == DEVICE_KEYBOARD)
{ {
if(DeviceI.button >= SDLK_F9 && DeviceI.button <= SDLK_F12) if( DeviceI.button >= KEY_F9 && DeviceI.button <= KEY_F12 )
{ {
if( type != IET_FIRST_PRESS ) return; if( type != IET_FIRST_PRESS ) return;
SetScreen(DeviceI.button - SDLK_F9); SetScreen( DeviceI.button - KEY_F9 );
return; return;
} }
if(DeviceI.button == SDLK_ESCAPE) if( DeviceI.button == KEY_ESC )
{ {
if( type != IET_FIRST_PRESS ) return; if( type != IET_FIRST_PRESS ) return;
SCREENMAN->SetNewScreen( "ScreenTitleMenu" ); SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
stepmania/src/ScreenTestSound.cpp
+4 -4
View File
@@ -140,16 +140,16 @@ void ScreenTestSound::Input( const DeviceInput& DeviceI, const InputEventType ty
} }
break; break;
/* case SDLK_LEFT: /* case KEY_LEFT:
obj.SetX(obj.GetX() - 10); obj.SetX(obj.GetX() - 10);
break; break;
case SDLK_RIGHT: case KEY_RIGHT:
obj.SetX(obj.GetX() + 10); obj.SetX(obj.GetX() + 10);
break; break;
case SDLK_UP: case KEY_UP:
obj.SetY(obj.GetY() - 10); obj.SetY(obj.GetY() - 10);
break; break;
case SDLK_DOWN: case KEY_DOWN:
obj.SetY(obj.GetY() + 10); obj.SetY(obj.GetY() + 10);
break; break;
*/ */
stepmania/src/ScreenTextEntry.cpp
+4 -4
View File
@@ -94,15 +94,15 @@ void ScreenTextEntry::Input( const DeviceInput& DeviceI, const InputEventType ty
switch( DeviceI.button ) switch( DeviceI.button )
{ {
case SDLK_ESCAPE: case KEY_ESC:
m_bCancelled = true; m_bCancelled = true;
MenuStart(PLAYER_1); MenuStart(PLAYER_1);
break; break;
case SDLK_RETURN: case KEY_ENTER:
case SDLK_KP_ENTER: case KEY_KP_ENTER:
MenuStart(PLAYER_1); MenuStart(PLAYER_1);
break; break;
case SDLK_BACKSPACE: case KEY_BACK:
if(!m_sAnswer.empty()) if(!m_sAnswer.empty())
m_sAnswer = m_sAnswer.erase( m_sAnswer.size()-1 ); m_sAnswer = m_sAnswer.erase( m_sAnswer.size()-1 );
UpdateText(); UpdateText();