shithub: m8c

Info  •  Files  •  Log  •  Branches

Merge pull request #84 from smootalicious/main

Check for gamepad axis select on quit and reset

--- a/input.c

+++ b/input.c

@@ -365,13 +365,14 @@

   // Read special case game controller buttons quit and reset

   for (int gc = 0; gc < num_joysticks; gc++) {

-   if (SDL_GameControllerGetButton(game_controllers[gc], conf->gamepad_quit) && 

-       SDL_GameControllerGetButton(game_controllers[gc], conf->gamepad_select)) {

-    key = (input_msg_s){special, msg_quit};

-   } else if (SDL_GameControllerGetButton(game_controllers[gc], conf->gamepad_reset) && 

-       SDL_GameControllerGetButton(game_controllers[gc], conf->gamepad_select)) {

-    key = (input_msg_s){special, msg_reset_display};

-   }

+    if (SDL_GameControllerGetButton(game_controllers[gc], conf->gamepad_quit) && 

+        (SDL_GameControllerGetButton(game_controllers[gc], conf->gamepad_select) || 

+        SDL_GameControllerGetAxis(game_controllers[gc], conf->gamepad_analog_axis_select)))

+      key = (input_msg_s){special, msg_quit};

+    else if (SDL_GameControllerGetButton(game_controllers[gc], conf->gamepad_reset) && 

+            (SDL_GameControllerGetButton(game_controllers[gc], conf->gamepad_select) || 

+              SDL_GameControllerGetAxis(game_controllers[gc], conf->gamepad_analog_axis_select)))

+      key = (input_msg_s){special, msg_reset_display};

   }

   SDL_PollEvent(&event);

-- 

⑨