projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replaced obsolete joystick calibration with game controller configuration
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index a766c2d668f459149e2d87726a007fbe4b7708e0..31ae317a3104eb985dbc59e773b0a819acdbda25 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-3759,6
+3759,10
@@
void WaitForEventToContinue()
{
case EVENT_BUTTONPRESS:
case EVENT_KEYPRESS:
{
case EVENT_BUTTONPRESS:
case EVENT_KEYPRESS:
+#if defined(TARGET_SDL2)
+ case SDL_CONTROLLERBUTTONDOWN:
+#endif
+ case SDL_JOYBUTTONDOWN:
still_wait = FALSE;
break;
still_wait = FALSE;
break;
@@
-3912,6
+3916,7
@@
static int RequestHandleEvents(unsigned int req_state)
case KSYM_Return:
#if defined(TARGET_SDL2)
case KSYM_Return:
#if defined(TARGET_SDL2)
+ case KSYM_Select:
case KSYM_Menu:
#if defined(KSYM_Rewind)
case KSYM_Rewind: /* for Amazon Fire TV remote */
case KSYM_Menu:
#if defined(KSYM_Rewind)
case KSYM_Rewind: /* for Amazon Fire TV remote */