X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=451ef014e103daaac8476837e92bb5412d49bb56;hp=5adfc32580e8e5a1526bead2df82da0fa7dc05f0;hb=4fd53190c7842905930f953211bb68885b828b7e;hpb=bf88ae3e5f7cc53fec7a06298f6632368c6c8e0c

diff --git a/src/tools.c b/src/tools.c
index 5adfc325..451ef014 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -1042,8 +1042,9 @@ void FadeIn(int fade_mask)
   FADE_SXSIZE = FULL_SXSIZE;
   FADE_SYSIZE = FULL_SYSIZE;
 
-  if (game_status == GAME_MODE_PLAYING &&
-      strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS))
+  // activate virtual buttons depending on upcoming game status
+  if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS) &&
+      game_status == GAME_MODE_PLAYING && !tape.playing)
     SetOverlayActive(TRUE);
 
   SetScreenStates_AfterFadingIn();
@@ -4205,9 +4206,7 @@ void WaitForEventToContinue(void)
       {
 	case EVENT_BUTTONRELEASE:
 	case EVENT_KEYPRESS:
-#if defined(TARGET_SDL2)
         case SDL_CONTROLLERBUTTONDOWN:
-#endif
         case SDL_JOYBUTTONDOWN:
 	  still_wait = FALSE;
 	  break;
@@ -4344,7 +4343,6 @@ static int RequestHandleEvents(unsigned int req_state)
 	    break;
 	  }
 
-#if defined(TARGET_SDL2)
 	  case SDL_WINDOWEVENT:
 	    HandleWindowEvent((WindowEvent *) &event);
 	    break;
@@ -4355,7 +4353,6 @@ static int RequestHandleEvents(unsigned int req_state)
 	  case SDL_APP_DIDENTERFOREGROUND:
 	    HandlePauseResumeEvent((PauseResumeEvent *) &event);
 	    break;
-#endif
 
 	  case EVENT_KEYPRESS:
 	  {
@@ -4370,31 +4367,27 @@ static int RequestHandleEvents(unsigned int req_state)
 
 	      case KSYM_Return:
 	      case KSYM_y:
-#if defined(TARGET_SDL2)
 	      case KSYM_Y:
 	      case KSYM_Select:
 	      case KSYM_Menu:
 #if defined(KSYM_Rewind)
 	      case KSYM_Rewind:		// for Amazon Fire TV remote
-#endif
 #endif
 		result = 1;
 		break;
 
 	      case KSYM_Escape:
 	      case KSYM_n:
-#if defined(TARGET_SDL2)
 	      case KSYM_N:
 	      case KSYM_Back:
 #if defined(KSYM_FastForward)
 	      case KSYM_FastForward:	// for Amazon Fire TV remote
-#endif
 #endif
 		result = 0;
 		break;
 
 	      default:
-		HandleKeysDebug(key);
+		HandleKeysDebug(key, KEY_PRESSED);
 		break;
 	    }
 
@@ -4443,7 +4436,6 @@ static int RequestHandleEvents(unsigned int req_state)
 	    ClearPlayerAction();
 	    break;
 
-#if defined(TARGET_SDL2)
 	  case SDL_CONTROLLERBUTTONDOWN:
 	    switch (event.cbutton.button)
 	    {
@@ -4503,7 +4495,6 @@ static int RequestHandleEvents(unsigned int req_state)
 	    HandleJoystickEvent(&event);
 	    ClearPlayerAction();
 	    break;
-#endif
 
 	  default:
 	    HandleOtherEvents(&event);
@@ -9297,7 +9288,6 @@ void ToggleFullscreenOrChangeWindowScalingIfNeeded(void)
   if (!change_window_scaling_percent && !video.fullscreen_available)
     return;
 
-#if defined(TARGET_SDL2)
   if (change_window_scaling_percent)
   {
     SDLSetWindowScaling(setup.window_scaling_percent);
@@ -9313,7 +9303,6 @@ void ToggleFullscreenOrChangeWindowScalingIfNeeded(void)
 
     return;
   }
-#endif
 
   if (change_fullscreen ||
       change_window_scaling_percent)