projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improved customizability of game controller configuration screen
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 626cb8973a892c62612bf68454ebc6f488251ac7..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,7
+3916,11
@@
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:
case KSYM_Menu:
+#if defined(KSYM_Rewind)
+ case KSYM_Rewind: /* for Amazon Fire TV remote */
+#endif
#endif
result = 1;
break;
#endif
result = 1;
break;
@@
-3920,6
+3928,9
@@
static int RequestHandleEvents(unsigned int req_state)
case KSYM_Escape:
#if defined(TARGET_SDL2)
case KSYM_Back:
case KSYM_Escape:
#if defined(TARGET_SDL2)
case KSYM_Back:
+#if defined(KSYM_FastForward)
+ case KSYM_FastForward: /* for Amazon Fire TV remote */
+#endif
#endif
result = 0;
break;
#endif
result = 0;
break;