X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=eecb688b937aa681e9f1d78ab93e24de931a1ba0;hb=cc87512c58b885ea16697b0017201c900fce8428;hp=0df80eb6e2f25e1c3288fc26f09db523c6e7eb2a;hpb=5185b85b7cd3f0b957900a2fd7ee757838895e96;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 0df80eb6..eecb688b 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -3268,6 +3268,8 @@ static void DrawInfoScreen_TitleScreen(void)
 {
   SetGameStatus(GAME_MODE_TITLE);
 
+  UnmapAllGadgets();
+
   DrawTitleScreen();
 }
 
@@ -3280,6 +3282,7 @@ static void DrawInfoScreen_Elements(void)
 {
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS);
 
+  UnmapAllGadgets();
   FadeInfoSoundsAndMusic();
 
   FadeOut(REDRAW_FIELD);
@@ -3382,6 +3385,8 @@ static void DrawInfoScreen_Music(void)
 {
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC);
 
+  UnmapAllGadgets();
+
   FadeOut(REDRAW_FIELD);
 
   ClearField();
@@ -3591,6 +3596,7 @@ static void DrawInfoScreen_Version(void)
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION);
 
+  UnmapAllGadgets();
   FadeInfoSoundsAndMusic();
 
   FadeOut(REDRAW_FIELD);
@@ -3892,6 +3898,7 @@ static void DrawInfoScreen_Generic(void)
 {
   SetMainBackgroundImageIfDefined(getInfoScreenBackgroundImage_Generic());
 
+  UnmapAllGadgets();
   FadeInfoSoundsAndMusic();
 
   FadeOut(REDRAW_FIELD);
@@ -5111,6 +5118,9 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 	  {
 	    // store level set if chosen from "last played level set" menu
 	    StoreLastPlayedLevels(leveldir_current);
+
+	    // store if level set chosen from "last played level set" menu
+	    SaveLevelSetup_LastSeries();
 	  }
 	  else if (game_status == GAME_MODE_NAMES)
 	  {
@@ -9517,8 +9527,7 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 
 void HandleGameActions(void)
 {
-  if (setup.ask_on_game_over)
-    CheckGameOver();
+  CheckGameOver();
 
   if (game.restart_game_message != NULL)
   {
@@ -9664,7 +9673,8 @@ static struct
     FALSE, "play solution tape"
   },
   {
-    IMG_MENU_BUTTON_LEVELSET_INFO, IMG_MENU_BUTTON_LEVELSET_INFO_ACTIVE, -1,
+    IMG_MENU_BUTTON_LEVELSET_INFO, IMG_MENU_BUTTON_LEVELSET_INFO_PRESSED,
+    IMG_MENU_BUTTON_LEVELSET_INFO_ACTIVE,
     &menu.main.button.levelset_info, NULL,
     SCREEN_CTRL_ID_LEVELSET_INFO,
     SCREEN_MASK_MAIN_HAS_SET_INFO,