diff --git a/port/src/input.c b/port/src/input.c index a6912ca1b..9091a82d5 100644 --- a/port/src/input.c +++ b/port/src/input.c @@ -38,26 +38,26 @@ void inputSetDefaultKeyBinds(void) { // TODO: make VK constants for all these static const u32 kbbinds[][3] = { - { CK_A, SDL_SCANCODE_Q, 0 }, - { CK_B, SDL_SCANCODE_E, 0 }, - { CK_X, SDL_SCANCODE_R, 0 }, - { CK_Y, SDL_SCANCODE_R, 0 }, - { CK_RTRIG, VK_MOUSE_RIGHT, SDL_SCANCODE_Z }, - { CK_LTRIG, SDL_SCANCODE_F, SDL_SCANCODE_X }, - { CK_ZTRIG, VK_MOUSE_LEFT, SDL_SCANCODE_SPACE }, - { CK_START, SDL_SCANCODE_RETURN, SDL_SCANCODE_TAB }, - { CK_DPAD_D, SDL_SCANCODE_G, 0 }, - { CK_DPAD_U, 0, 0 }, - { CK_DPAD_R, 0, 0 }, - { CK_DPAD_L, 0, 0 }, - { CK_C_D, SDL_SCANCODE_S, 0 }, - { CK_C_U, SDL_SCANCODE_W, 0 }, - { CK_C_R, SDL_SCANCODE_D, 0 }, - { CK_C_L, SDL_SCANCODE_A, 0 }, - { CK_STICK_XNEG, SDL_SCANCODE_LEFT, 0 }, - { CK_STICK_XPOS, SDL_SCANCODE_RIGHT, 0 }, - { CK_STICK_YNEG, SDL_SCANCODE_DOWN, 0 }, - { CK_STICK_YPOS, SDL_SCANCODE_UP, 0 }, + { CK_A, SDL_SCANCODE_Q, 0 }, + { CK_B, SDL_SCANCODE_E, 0 }, + { CK_X, SDL_SCANCODE_R, 0 }, + { CK_Y, SDL_SCANCODE_R, 0 }, + { CK_RTRIG, VK_MOUSE_RIGHT, SDL_SCANCODE_Z }, + { CK_LTRIG, SDL_SCANCODE_F, SDL_SCANCODE_X }, + { CK_ZTRIG, VK_MOUSE_LEFT, SDL_SCANCODE_SPACE }, + { CK_START, SDL_SCANCODE_RETURN, SDL_SCANCODE_TAB }, + { CK_DPAD_D, SDL_SCANCODE_G, VK_MOUSE_MIDDLE }, + { CK_DPAD_U, 0, 0 }, + { CK_DPAD_R, 0, 0 }, + { CK_DPAD_L, 0, 0 }, + { CK_C_D, SDL_SCANCODE_S, 0 }, + { CK_C_U, SDL_SCANCODE_W, 0 }, + { CK_C_R, SDL_SCANCODE_D, 0 }, + { CK_C_L, SDL_SCANCODE_A, 0 }, + { CK_STICK_XNEG, SDL_SCANCODE_LEFT, 0 }, + { CK_STICK_XPOS, SDL_SCANCODE_RIGHT, 0 }, + { CK_STICK_YNEG, SDL_SCANCODE_DOWN, 0 }, + { CK_STICK_YPOS, SDL_SCANCODE_UP, 0 }, }; static const u32 joybinds[][2] = { @@ -65,15 +65,15 @@ void inputSetDefaultKeyBinds(void) { CK_B, SDL_CONTROLLER_BUTTON_B }, { CK_X, SDL_CONTROLLER_BUTTON_X }, { CK_Y, SDL_CONTROLLER_BUTTON_Y }, - { CK_LTRIG, SDL_CONTROLLER_BUTTON_LEFTSHOULDER }, - { CK_RTRIG, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER }, - { CK_ZTRIG, VK_JOY1_LTRIG - VK_JOY1_BEGIN }, + { CK_DPAD_D, SDL_CONTROLLER_BUTTON_LEFTSHOULDER }, + { CK_LTRIG, SDL_CONTROLLER_BUTTON_RIGHTSHOULDER }, + { CK_RTRIG, VK_JOY1_LTRIG - VK_JOY1_BEGIN }, { CK_ZTRIG, VK_JOY1_RTRIG - VK_JOY1_BEGIN }, { CK_START, SDL_CONTROLLER_BUTTON_START }, - { CK_DPAD_D, SDL_CONTROLLER_BUTTON_DPAD_DOWN }, - { CK_DPAD_U, SDL_CONTROLLER_BUTTON_DPAD_UP }, - { CK_DPAD_R, SDL_CONTROLLER_BUTTON_DPAD_RIGHT }, - { CK_DPAD_L, SDL_CONTROLLER_BUTTON_DPAD_LEFT }, + { CK_C_D, SDL_CONTROLLER_BUTTON_DPAD_DOWN }, + { CK_C_U, SDL_CONTROLLER_BUTTON_DPAD_UP }, + { CK_C_R, SDL_CONTROLLER_BUTTON_DPAD_RIGHT }, + { CK_C_L, SDL_CONTROLLER_BUTTON_DPAD_LEFT }, }; for (u32 i = 0; i < sizeof(kbbinds) / sizeof(kbbinds[0]); ++i) {