X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=c60881afae76b2c85850c6196788f7238780847b;hb=03e447c3496a66bbe4c9052a8583789b51ac42de;hp=0ce46341598a59e72cd1e3ee354286111bc9836d;hpb=ba6af23b5637bcd5fa4e247dc336b45ba1e6fd1a;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 0ce46341..c60881af 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)
   {
@@ -1740,15 +1739,7 @@ void DrawMainMenu(void)
 
   OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
 
-#if defined(PLATFORM_EMSCRIPTEN)
-  EM_ASM
-  (
-    FS.syncfs(function(err)
-    {
-      assert(!err);
-    });
-  );
-#endif
+  SyncEmscriptenFilesystem();
 }
 
 static void gotoTopLevelDir(void)
@@ -2166,6 +2157,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 +2217,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 +4850,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)
@@ -4879,6 +4879,9 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 	    LoadLevelSetup_LastSeries();
 	    LoadLevelSetup_SeriesInfo();
 
+	    // update list of last played level sets
+	    UpdateLastPlayedLevels_TreeInfo();
+
 	    TapeErase();
 
 	    ToggleFullscreenIfNeeded();
@@ -5066,6 +5069,24 @@ void DrawHallOfFame(int level_nr, int highlight_position)
   FadeIn(fade_mask);
 }
 
+static char *getHallOfFameScoreText(int nr)
+{
+  if (!level.rate_time_over_score)
+    return int2str(scores.entry[nr].score, 5);	// show normal score
+
+  if (level.use_step_counter)
+    return int2str(scores.entry[nr].time, 5);	// show number of steps
+
+  static char score_text[10];
+  int time_seconds = scores.entry[nr].time / FRAMES_PER_SECOND;
+  int mm = (time_seconds / 60) % 60;
+  int ss = (time_seconds % 60);
+
+  sprintf(score_text, "%02d:%02d", mm, ss);	// show playing time
+
+  return score_text;
+}
+
 static void drawHallOfFameList(int level_nr, int first_entry,
 			       int highlight_position)
 {
@@ -5099,10 +5120,10 @@ static void drawHallOfFameList(int level_nr, int first_entry,
     for (j = 0; j < num_dots; j++)
       DrawText(mSX + dx2 + j * getFontWidth(font_nr3), sy, ".", font_nr3);
 
-    if (!strEqual(highscore[entry].Name, EMPTY_PLAYER_NAME))
-      DrawText(mSX + dx2, sy, highscore[entry].Name, font_nr2);
+    if (!strEqual(scores.entry[entry].name, EMPTY_PLAYER_NAME))
+      DrawText(mSX + dx2, sy, scores.entry[entry].name, font_nr2);
 
-    DrawText(mSX + dx3, sy, int2str(highscore[entry].Score, 5), font_nr4);
+    DrawText(mSX + dx3, sy, getHallOfFameScoreText(entry), font_nr4);
   }
 
   redraw_mask |= REDRAW_FIELD;
@@ -6729,6 +6750,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,	""			},