X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=d15f800e638e3534adc600d1db7b08694efcc5a7;hp=1ea116bab181f892eb1280285b3203743873a9c7;hb=47da774c66f9325f9d27cddb5a697514154e2de9;hpb=d870b82d2c53def1ed6da9fdc46ce6bf3dd1bfae

diff --git a/src/tools.c b/src/tools.c
index 1ea116ba..d15f800e 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;
 
@@ -8366,8 +8370,15 @@ void CheckSingleStepMode_EM(byte action[MAX_PLAYERS], int frame,
 void CheckSingleStepMode_SP(boolean murphy_is_waiting,
 			    boolean murphy_is_dropping)
 {
+  boolean murphy_starts_dropping = FALSE;
+  int i;
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+    if (stored_player[i].force_dropping)
+      murphy_starts_dropping = TRUE;
+
   if (tape.single_step && tape.recording && !tape.pausing)
-    if (murphy_is_waiting)
+    if (murphy_is_waiting && !murphy_starts_dropping)
       TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
 
   CheckSaveEngineSnapshot_SP(murphy_is_waiting, murphy_is_dropping);