X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=31ae317a3104eb985dbc59e773b0a819acdbda25;hb=c138430b14041bf340d371fd3cd27e727c4c50c1;hp=596aa5d0d68ef665c149a66e4d344dfac3daf74c;hpb=0110b892ce36a587e9eb62f23cfbd613dd5b10db;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 596aa5d0..31ae317a 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -3759,6 +3759,10 @@ void WaitForEventToContinue()
       {
 	case EVENT_BUTTONPRESS:
 	case EVENT_KEYPRESS:
+#if defined(TARGET_SDL2)
+        case SDL_CONTROLLERBUTTONDOWN:
+#endif
+        case SDL_JOYBUTTONDOWN:
 	  still_wait = FALSE;
 	  break;
 
@@ -3912,7 +3916,11 @@ static int RequestHandleEvents(unsigned int req_state)
 
 	      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 */
+#endif
 #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:
+#if defined(KSYM_FastForward)
+	      case KSYM_FastForward:	/* for Amazon Fire TV remote */
+#endif
 #endif
 		result = 0;
 		break;
@@ -3963,6 +3974,7 @@ static int RequestHandleEvents(unsigned int req_state)
 	    break;
 
 	  case SDL_CONTROLLERBUTTONUP:
+	    HandleJoystickEvent(&event);
 	    ClearPlayerAction();
 	    break;
 #endif