From 08e7acbcd7fc3e2146cb66360c92efb6effabc2b Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Fri, 9 Jan 2015 01:34:46 -0800 Subject: [PATCH] actually run buttons through key handler --- arch/sdl/joy.c | 2 +- arch/sdl/mouse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sdl/joy.c b/arch/sdl/joy.c index adbd4bc5..f6b5b70c 100644 --- a/arch/sdl/joy.c +++ b/arch/sdl/joy.c @@ -81,7 +81,7 @@ void joy_button_handler(SDL_JoyButtonEvent *jbe) button = SDL_Joysticks[jbe->which].button_map[jbe->button]; - key_handle_binding(KEY_JB1 + button, jbe->state == SDL_JOYBUTTONDOWN); + vkey_handler(KEY_JB1 + button, jbe->state == SDL_JOYBUTTONDOWN); Joystick.buttons[button].state = jbe->state; diff --git a/arch/sdl/mouse.c b/arch/sdl/mouse.c index 33eed435..5c8cdd36 100644 --- a/arch/sdl/mouse.c +++ b/arch/sdl/mouse.c @@ -64,7 +64,7 @@ void mouse_button_handler(SDL_MouseButtonEvent *mbe) int button = button_remap[mbe->button - 1]; // -1 since SDL seems to start counting at 1 - key_handle_binding(KEY_MB1 + button, mbe->state == SDL_PRESSED); + vkey_handler(KEY_MB1 + button, mbe->state == SDL_PRESSED); if (mbe->state == SDL_PRESSED) { Mouse.buttons[button].pressed = 1; -- 2.39.2