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

DirectInput replaced with SDL's input routines. Keyboard works, but joystick and pump are untested.

Browse Source
This commit is contained in:
Chris Danford
2002-11-29 20:37:12 +00:00
parent 529057a85e
commit 4a588230e1
14 changed files with 504 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameManager.cpp
+59 -58
View File
@@ -18,6 +18,7 @@
#include "IniFile.h"
#include "RageLog.h"
#include "RageUtil.h"
#include "SDL_keysym.h" // for SDLKeys
GameManager* GAMEMAN = NULL; // global and accessable from anywhere in our program
@@ -106,28 +107,28 @@ GameDef g_GameDefs[NUM_GAMES] =
},
{ // m_iDefaultKeyboardKey
{ // PLAYER_1
DIK_LEFT, // DANCE_BUTTON_LEFT,
DIK_RIGHT, // DANCE_BUTTON_RIGHT,
DIK_UP, // DANCE_BUTTON_UP,
DIK_DOWN, // DANCE_BUTTON_DOWN,
SDLK_LEFT, // DANCE_BUTTON_LEFT,
SDLK_RIGHT, // DANCE_BUTTON_RIGHT,
SDLK_UP, // DANCE_BUTTON_UP,
SDLK_DOWN, // DANCE_BUTTON_DOWN,
-1, //no default key // DANCE_BUTTON_UPLEFT,
-1, //no default key // DANCE_BUTTON_UPRIGHT,
DIK_RETURN, // DANCE_BUTTON_START,
DIK_ESCAPE, // DANCE_BUTTON_BACK
SDLK_RETURN, // DANCE_BUTTON_START,
SDLK_ESCAPE, // DANCE_BUTTON_BACK
-1, //no default key // DANCE_BUTTON_MENULEFT
-1, //no default key // DANCE_BUTTON_MENURIGHT
DIK_UP, // DANCE_BUTTON_MENUUP
DIK_DOWN, // DANCE_BUTTON_MENUDOWN
SDLK_UP, // DANCE_BUTTON_MENUUP
SDLK_DOWN, // DANCE_BUTTON_MENUDOWN
},
{ // PLAYER_2
DIK_NUMPAD4, // DANCE_BUTTON_LEFT,
DIK_NUMPAD6, // DANCE_BUTTON_RIGHT,
DIK_NUMPAD8, // DANCE_BUTTON_UP,
DIK_NUMPAD2, // DANCE_BUTTON_DOWN,
DIK_NUMPAD7, // DANCE_BUTTON_UPLEFT,
DIK_NUMPAD9, // DANCE_BUTTON_UPRIGHT,
DIK_NUMPADENTER, // DANCE_BUTTON_START,
DIK_NUMPAD0, // DANCE_BUTTON_BACK
SDLK_KP4, // DANCE_BUTTON_LEFT,
SDLK_KP6, // DANCE_BUTTON_RIGHT,
SDLK_KP8, // DANCE_BUTTON_UP,
SDLK_KP2, // DANCE_BUTTON_DOWN,
SDLK_KP7, // DANCE_BUTTON_UPLEFT,
SDLK_KP9, // DANCE_BUTTON_UPRIGHT,
SDLK_KP_ENTER, // DANCE_BUTTON_START,
SDLK_KP0, // DANCE_BUTTON_BACK
-1, //no default key // DANCE_BUTTON_MENULEFT
-1, //no default key // DANCE_BUTTON_MENURIGHT
-1, //no default key // DANCE_BUTTON_MENUUP
@@ -184,26 +185,26 @@ GameDef g_GameDefs[NUM_GAMES] =
},
{ // m_iDefaultKeyboardKey
{ // PLAYER_1
DIK_Q, // PUMP_BUTTON_UPLEFT,
DIK_E, // PUMP_BUTTON_UPRIGHT,
DIK_S, // PUMP_BUTTON_CENTER,
DIK_Z, // PUMP_BUTTON_DOWNLEFT,
DIK_C, // PUMP_BUTTON_DOWNRIGHT,
DIK_RETURN, // PUMP_BUTTON_START,
DIK_ESCAPE, // PUMP_BUTTON_BACK,
DIK_LEFT, // PUMP_BUTTON_MENULEFT
DIK_RIGHT, // PUMP_BUTTON_MENURIGHT
DIK_UP, // PUMP_BUTTON_MENUUP
DIK_DOWN, // PUMP_BUTTON_MENUDOWN
SDLK_q, // PUMP_BUTTON_UPLEFT,
SDLK_e, // PUMP_BUTTON_UPRIGHT,
SDLK_s, // PUMP_BUTTON_CENTER,
SDLK_z, // PUMP_BUTTON_DOWNLEFT,
SDLK_c, // PUMP_BUTTON_DOWNRIGHT,
SDLK_RETURN, // PUMP_BUTTON_START,
SDLK_ESCAPE, // PUMP_BUTTON_BACK,
SDLK_LEFT, // PUMP_BUTTON_MENULEFT
SDLK_RIGHT, // PUMP_BUTTON_MENURIGHT
SDLK_UP, // PUMP_BUTTON_MENUUP
SDLK_DOWN, // PUMP_BUTTON_MENUDOWN
},
{ // PLAYER_2
DIK_NUMPAD7, // PUMP_BUTTON_UPLEFT,
DIK_NUMPAD9, // PUMP_BUTTON_UPRIGHT,
DIK_NUMPAD5, // PUMP_BUTTON_CENTER,
DIK_NUMPAD1, // PUMP_BUTTON_DOWNLEFT,
DIK_NUMPAD3, // PUMP_BUTTON_DOWNRIGHT,
DIK_NUMPADENTER, // PUMP_BUTTON_START,
DIK_NUMPAD0, // PUMP_BUTTON_BACK,
SDLK_KP7, // PUMP_BUTTON_UPLEFT,
SDLK_KP9, // PUMP_BUTTON_UPRIGHT,
SDLK_KP5, // PUMP_BUTTON_CENTER,
SDLK_KP1, // PUMP_BUTTON_DOWNLEFT,
SDLK_KP3, // PUMP_BUTTON_DOWNRIGHT,
SDLK_KP_ENTER, // PUMP_BUTTON_START,
SDLK_KP0, // PUMP_BUTTON_BACK,
-1, //no default key // PUMP_BUTTON_MENULEFT
-1, //no default key // PUMP_BUTTON_MENURIGHT
-1, //no default key // PUMP_BUTTON_MENUUP
@@ -264,19 +265,19 @@ GameDef g_GameDefs[NUM_GAMES] =
},
{ // m_iDefaultKeyboardKey
{ // PLAYER_1
DIK_Z, // EZ2_BUTTON_FOOTUPLEFT,
DIK_B, // EZ2_BUTTON_FOOTUPRIGHT,
DIK_C, // EZ2_BUTTON_FOOTDOWN,
DIK_X, // EZ2_BUTTON_HANDUPLEFT,
DIK_V, // EZ2_BUTTON_HANDUPRIGHT,
DIK_S, // EZ2_BUTTON_HANDLRLEFT,
DIK_F, // EZ2_BUTTON_HANDLRRIGHT,
DIK_RETURN, // EZ2_BUTTON_START,
DIK_ESCAPE, // EZ2_BUTTON_BACK,
DIK_LEFT, // EZ2_BUTTON_MENULEFT
DIK_RIGHT, // EZ2_BUTTON_MENURIGHT
DIK_UP, // EZ2_BUTTON_MENUUP
DIK_DOWN, // EZ2_BUTTON_MENUDOWN
SDLK_z, // EZ2_BUTTON_FOOTUPLEFT,
SDLK_b, // EZ2_BUTTON_FOOTUPRIGHT,
SDLK_c, // EZ2_BUTTON_FOOTDOWN,
SDLK_x, // EZ2_BUTTON_HANDUPLEFT,
SDLK_v, // EZ2_BUTTON_HANDUPRIGHT,
SDLK_s, // EZ2_BUTTON_HANDLRLEFT,
SDLK_f, // EZ2_BUTTON_HANDLRRIGHT,
SDLK_RETURN, // EZ2_BUTTON_START,
SDLK_ESCAPE, // EZ2_BUTTON_BACK,
SDLK_LEFT, // EZ2_BUTTON_MENULEFT
SDLK_RIGHT, // EZ2_BUTTON_MENURIGHT
SDLK_UP, // EZ2_BUTTON_MENUUP
SDLK_DOWN, // EZ2_BUTTON_MENUDOWN
},
{ // PLAYER_2
-1, // EZ2_BUTTON_FOOTUPLEFT,
@@ -344,17 +345,17 @@ GameDef g_GameDefs[NUM_GAMES] =
},
{ // m_iDefaultKeyboardKey
{ // PLAYER_1
DIK_Z, // PARA_BUTTON_LEFT,
DIK_X, // PARA_BUTTON_UPLEFT,
DIK_C, // PARA_BUTTON_UP,
DIK_V, // PARA_BUTTON_UPRIGHT,
DIK_B, // PARA_BUTTON_RIGHT,
DIK_RETURN, // PARA_BUTTON_START,
DIK_ESCAPE, // PARA_BUTTON_BACK
DIK_LEFT, //no default key // PARA_BUTTON_MENULEFT
DIK_RIGHT, //no default key // PARA_BUTTON_MENURIGHT
DIK_UP, // PARA_BUTTON_MENUUP
DIK_DOWN, // PARA_BUTTON_MENUDOWN
SDLK_z, // PARA_BUTTON_LEFT,
SDLK_x, // PARA_BUTTON_UPLEFT,
SDLK_c, // PARA_BUTTON_UP,
SDLK_v, // PARA_BUTTON_UPRIGHT,
SDLK_b, // PARA_BUTTON_RIGHT,
SDLK_RETURN, // PARA_BUTTON_START,
SDLK_ESCAPE, // PARA_BUTTON_BACK
SDLK_LEFT, //no default key // PARA_BUTTON_MENULEFT
SDLK_RIGHT, //no default key // PARA_BUTTON_MENURIGHT
SDLK_UP, // PARA_BUTTON_MENUUP
SDLK_DOWN, // PARA_BUTTON_MENUDOWN
},
{ // PLAYER_2
-1, // PARA_BUTTON_LEFT,