X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=811d8f9ae87e01fdfc9b03eddfa96f93823a7160;hb=85d006b46303672112431f6a333c3e1de6acbabb;hp=7ea4356bc8920f6afaa51f0c7bdc397ad4a64b93;hpb=ca40038f7fbffd28bd6a106715a573d2029b5a04;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index 7ea4356b..811d8f9a 100644
--- a/src/events.c
+++ b/src/events.c
@@ -717,9 +717,8 @@ void HandleKey(Key key, int key_status)
     return;
   }
 
-#if 1
-  if (game_status == GAME_MODE_PLAYING &&
-      local_player->LevelSolved_GameEnd &&
+#if 0
+  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 &&
@@ -812,6 +811,9 @@ void HandleKey(Key key, int key_status)
 	  break;
 
 	case KSYM_Escape:
+	  if (game_status != GAME_MODE_MAIN)
+	    FadeSkipNextFadeIn();
+
 	  if (game_status == GAME_MODE_TITLE)
 	    HandleTitleScreen(0, 0, 0, 0, MB_MENU_LEAVE);
           else if (game_status == GAME_MODE_LEVELS)
@@ -1068,7 +1070,7 @@ void HandleJoystick()
       if (tape.playing || keyboard)
 	newbutton = ((joy & JOY_BUTTON) != 0);
 
-#if 1
+#if 0
       if (local_player->LevelSolved_GameEnd && newbutton)
 #else
       if (AllPlayersGone && newbutton)