X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=464840b6e078a7575f84d36c1958fcb963b4a55d;hb=3bb225da5092d0741870829d9f8f8642070d29c5;hp=e9eaf40f8f22c8be3e1cd9f9007d656e3d045b65;hpb=c389f75f068f6fe96a8ecf8d4cb3ce12f731921e;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index e9eaf40f..464840b6 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -1630,9 +1630,8 @@ void DrawMainMenu(void)
     return;
   }
 
-  // leveldir_current may be invalid (level group, parent link)
-  if (!validLevelSeries(leveldir_current))
-    leveldir_current = getFirstValidTreeInfoEntry(leveldir_last_valid);
+  // leveldir_current may be invalid (level group, parent link, node copy)
+  leveldir_current = getValidLevelSeries(leveldir_current, leveldir_last_valid);
 
   if (leveldir_current != leveldir_last_valid)
   {
@@ -2166,6 +2165,9 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 	  SaveLevelSetup_LastSeries();
 	  SaveLevelSetup_SeriesInfo();
 
+	  // restore level set if chosen from "last played level set" menu
+	  RestoreLastPlayedLevels(&leveldir_current);
+
 	  if (setup.internal.choose_from_top_leveldir)
 	    gotoTopLevelDir();
 
@@ -2223,7 +2225,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 	SaveLevelSetup_LastSeries();
 	SaveLevelSetup_SeriesInfo();
 
-        if (Request("Do you really want to quit?", REQ_ASK | REQ_STAY_CLOSED))
+	if (!setup.ask_on_quit_program ||
+	    Request("Do you really want to quit?", REQ_ASK | REQ_STAY_CLOSED))
 	  SetGameStatus(GAME_MODE_QUIT);
       }
     }
@@ -4855,6 +4858,11 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
 	    HandleMainMenu_SelectLevel(0, 0, new_level_nr);
 	  }
+	  else if (game_status == GAME_MODE_LEVELS)
+	  {
+	    // store level set if chosen from "last played level set" menu
+	    StoreLastPlayedLevels(leveldir_current);
+	  }
 	  else if (game_status == GAME_MODE_NAMES)
 	  {
 	    if (mx >= sx1_edit_name && mx <= sx2_edit_name)
@@ -6732,6 +6740,8 @@ static struct TokenInfo setup_info_game[] =
   { TYPE_SWITCH,	&setup.count_score_after_game,"Count Score After Game:" },
   { TYPE_SWITCH,	&setup.show_scores_after_game,"Show Scores After Game:" },
   { TYPE_YES_NO,	&setup.ask_on_game_over, "Ask on Game Over:"	},
+  { TYPE_YES_NO,	&setup.ask_on_quit_game, "Ask on Quit Game:"	},
+  { TYPE_YES_NO,	&setup.ask_on_quit_program, "Ask on Quit Program:" },
   { TYPE_SWITCH,	&setup.autorecord,	"Auto-Record Tapes:"	},
   { TYPE_ENTER_LIST,	execSetupChooseGameSpeed, "Game Speed:"		},
   { TYPE_STRING,	&game_speed_text,	""			},