From: Holger Schemel Date: Tue, 12 Jun 2018 18:23:32 +0000 (+0200) Subject: improved code to handle special game controller buttons X-Git-Tag: 4.1.1.0~150 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=61b7f6a8c2289ed8f3e6230a2553e08f1aa53380;p=rocksndiamonds.git improved code to handle special game controller buttons --- diff --git a/src/events.c b/src/events.c index c1a5cbc1..000744c9 100644 --- a/src/events.c +++ b/src/events.c @@ -2423,24 +2423,38 @@ void HandleJoystick() void HandleSpecialGameControllerButtons(Event *event) { #if defined(TARGET_SDL2) + int key_status; + Key key; + switch (event->type) { case SDL_CONTROLLERBUTTONDOWN: - if (event->cbutton.button == SDL_CONTROLLER_BUTTON_START) - HandleKey(KSYM_space, KEY_PRESSED); - else if (event->cbutton.button == SDL_CONTROLLER_BUTTON_BACK) - HandleKey(KSYM_Escape, KEY_PRESSED); - + key_status = KEY_PRESSED; break; case SDL_CONTROLLERBUTTONUP: - if (event->cbutton.button == SDL_CONTROLLER_BUTTON_START) - HandleKey(KSYM_space, KEY_RELEASED); - else if (event->cbutton.button == SDL_CONTROLLER_BUTTON_BACK) - HandleKey(KSYM_Escape, KEY_RELEASED); + key_status = KEY_RELEASED; + break; + + default: + return; + } + switch (event->cbutton.button) + { + case SDL_CONTROLLER_BUTTON_START: + key = KSYM_space; + break; + + case SDL_CONTROLLER_BUTTON_BACK: + key = KSYM_Escape; break; + + default: + return; } + + HandleKey(key, key_status); #endif }