X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=846527641a28506f152f75fd380bc3ff52bc4252;hb=098a2e44080c6286cc4252287922fd9abfeee4dc;hp=65b20da1cb634a22e5a6cc1e4c8ce39fdd8a1e9e;hpb=c9308ba3e7ddea2d7e44b4d98f0dfbb19e18f04f;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index 65b20da1..84652764 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1824,7 +1824,7 @@ void HandleKey(Key key, int key_status)
       else
 	stored_player[pnr].action &= ~key_action;
 
-      if (tape.single_step && tape.recording && tape.pausing)
+      if (tape.single_step && tape.recording && tape.pausing && !tape.use_mouse)
       {
 	if (key_status == KEY_PRESSED && key_action & KEY_MOTION)
 	{
@@ -2315,8 +2315,11 @@ void HandleJoystick()
     }
 
     case GAME_MODE_PLAYING:
+#if 0
+      // !!! causes immediate GameEnd() when solving MM level with keyboard !!!
       if (tape.playing || keyboard)
 	newbutton = ((joy & JOY_BUTTON) != 0);
+#endif
 
       if (newbutton && AllPlayersGone)
       {
@@ -2325,7 +2328,7 @@ void HandleJoystick()
 	return;
       }
 
-      if (tape.recording && tape.pausing)
+      if (tape.recording && tape.pausing && !tape.use_mouse)
       {
 	if (joystick & JOY_ACTION)
 	  TapeTogglePause(TAPE_TOGGLE_MANUAL);