X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=879b5396dd22f13549eb52245e15e97d1fa71db5;hp=c497116ed6adb55b420a9718af18abd0be2e9820;hb=066b410c0573fe64a1783116daf9d64883e9f03e;hpb=26d4e05cb040620bcdc1ca995d8a231a40be46ff

diff --git a/src/events.c b/src/events.c
index c497116e..879b5396 100644
--- a/src/events.c
+++ b/src/events.c
@@ -477,6 +477,7 @@ void HandleKey(Key key, int key_status)
   /* allow quick escape to the main menu with the Escape key */
   if (key == KSYM_Escape &&
       game_status != MAINMENU &&
+      game_status != PLAYING &&
       game_status != LEVELED &&
       game_status != CHOOSELEVEL &&
       game_status != SETUP)
@@ -489,9 +490,9 @@ void HandleKey(Key key, int key_status)
   /* special shortcuts for quick game tape saving and loading */
   if (game_status == MAINMENU || game_status == PLAYING)
   {
-    if (key == KSYM_F1)		/* save game */
+    if (key == setup.shortcut.save_game)
       TapeQuickSave();
-    else if (key == KSYM_F2)	/* load game */
+    else if (key == setup.shortcut.load_game)
       TapeQuickLoad();
   }
 
@@ -592,6 +593,9 @@ void HandleKey(Key key, int key_status)
     {
       switch(key)
       {
+        case KSYM_Escape:
+	  RequestQuitGame(setup.ask_on_escape);
+	  break;
 
 #ifdef DEBUG
 	case KSYM_0: