rnd-20060828-1-src

[rocksndiamonds.git] / src / events.c

diff --git a/src/events.c b/src/events.c
index d42acf56eff9f1d436eef48395d162c97b1eaa9e..65b06803a9e62f2f7693939f74a6df4ae9f605e6 100644 (file)
--- 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();