X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=65b06803a9e62f2f7693939f74a6df4ae9f605e6;hp=d42acf56eff9f1d436eef48395d162c97b1eaa9e;hb=ac86d841daa4ecafff3128110a1db109e03fb355;hpb=a8613c2d9809cf90870f7c33b6fda80957241827

diff --git a/src/events.c b/src/events.c
index d42acf56..65b06803 100644
--- a/src/events.c
+++ b/src/events.c
@@ -245,7 +245,11 @@ void ClearEventQueue()
 	break;
 
       case EVENT_KEYRELEASE:
+#if 1
+	ClearPlayerAction();
+#else
 	key_joystick_mapping = 0;
+#endif
 	break;
 
       default:
@@ -700,8 +704,14 @@ void HandleKey(Key key, int key_status)
     return;
   }
 
+#if 1
+  if (game_status == GAME_MODE_PLAYING &&
+      local_player->LevelSolved_GameEnd &&
+      (key == KSYM_Return || key == setup.shortcut.toggle_pause))
+#else
   if (game_status == GAME_MODE_PLAYING && AllPlayersGone &&
       (key == KSYM_Return || key == setup.shortcut.toggle_pause))
+#endif
   {
     GameEnd();
 
@@ -1045,7 +1055,11 @@ void HandleJoystick()
       if (tape.playing || keyboard)
 	newbutton = ((joy & JOY_BUTTON) != 0);
 
+#if 1
+      if (local_player->LevelSolved_GameEnd && newbutton)
+#else
       if (AllPlayersGone && newbutton)
+#endif
       {
 	GameEnd();