X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=601c05de45e3ff278c40ea8e637e5d7960caa8ab;hb=483d088f2bd4dd2ee267aff416503b2c667a69d3;hp=d596e2674eaa13c9ce9265d0b6562b4b04cc9b51;hpb=bc84d4e4ec1babe815cb9e5b07168afa232bffb5;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index d596e267..601c05de 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -126,6 +126,7 @@
 // other screen text constants
 #define STR_CHOOSE_TREE_EDIT		"Edit"
 #define MENU_CHOOSE_TREE_FONT(x)	(FONT_TEXT_1 + (x))
+#define MENU_CHOOSE_TREE_COLOR(ti, a)	TREE_COLOR(ti, a)
 
 // for input setup functions
 #define SETUPINPUT_SCREEN_POS_START	0
@@ -1629,12 +1630,15 @@ 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)
+  {
+    UpdateLastPlayedLevels_TreeInfo();
+
     levelset_has_changed = TRUE;
+  }
 
   // store valid level series information
   leveldir_last_valid = leveldir_current;
@@ -1734,6 +1738,16 @@ void DrawMainMenu(void)
   SetMouseCursor(CURSOR_DEFAULT);
 
   OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
+
+#if defined(PLATFORM_EMSCRIPTEN)
+  EM_ASM
+  (
+    FS.syncfs(function(err)
+    {
+      assert(!err);
+    });
+  );
+#endif
 }
 
 static void gotoTopLevelDir(void)
@@ -2169,9 +2183,9 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       {
 	if (leveldir_current->readonly &&
 	    setup.editor.show_read_only_warning)
-	  Request("This level is read-only!", REQ_CONFIRM);
+	  Request("This level is read-only!", REQ_CONFIRM | REQ_STAY_OPEN);
 
-	CloseDoor(DOOR_CLOSE_2);
+	CloseDoor(DOOR_CLOSE_ALL);
 
 	SetGameStatus(GAME_MODE_EDITOR);
 
@@ -2208,7 +2222,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);
       }
     }
@@ -4351,9 +4366,16 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
 
   if (strEqual((*ti_ptr)->subdir, STRING_TOP_DIRECTORY))
   {
-    SetGameStatus(GAME_MODE_MAIN);
+    if (game_status == GAME_MODE_SETUP)
+    {
+      execSetupArtwork();
+    }
+    else	// GAME_MODE_LEVELS
+    {
+      SetGameStatus(GAME_MODE_MAIN);
 
-    DrawMainMenu();
+      DrawMainMenu();
+    }
 
     return;
   }
@@ -4387,13 +4409,38 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
   FadeIn(fade_mask);
 }
 
-static void drawChooseTreeList(int first_entry, int num_page_entries,
-			       TreeInfo *ti)
+static void drawChooseTreeText(int y, boolean active, TreeInfo *ti)
 {
   int num_entries = numTreeInfoInGroup(ti);
   boolean scrollbar_needed = (num_entries > NUM_MENU_ENTRIES_ON_SCREEN);
   int scrollbar_xpos = SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset;
   int screen_width = (scrollbar_needed ? scrollbar_xpos : SXSIZE);
+  int first_entry = ti->cl_first;
+  int entry_pos = first_entry + y;
+  TreeInfo *node_first = getTreeInfoFirstGroupEntry(ti);
+  TreeInfo *node = getTreeInfoFromPos(node_first, entry_pos);
+  int font_color = MENU_CHOOSE_TREE_COLOR(node, active);
+  int font_nr = MENU_CHOOSE_TREE_FONT(font_color);
+  int font_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset;
+  int xpos = MENU_SCREEN_START_XPOS;
+  int ypos = MENU_SCREEN_START_YPOS + y;
+  int startx = amSX + xpos * 32;
+  int starty = amSY + ypos * 32;
+  int startx_text = startx + font_xoffset;
+  int endx_text = amSX + screen_width;
+  int max_text_size = endx_text - startx_text;
+  int max_buffer_len = max_text_size / getFontWidth(font_nr);
+  char buffer[max_buffer_len + 1];
+
+  strncpy(buffer, node->name, max_buffer_len);
+  buffer[max_buffer_len] = '\0';
+
+  DrawText(startx, starty, buffer, font_nr);
+}
+
+static void drawChooseTreeList(int first_entry, int num_page_entries,
+			       TreeInfo *ti)
+{
   int i;
   char *title_string = NULL;
   int yoffset_sets = MENU_TITLE1_YPOS;
@@ -4415,22 +4462,7 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
     node_first = getTreeInfoFirstGroupEntry(ti);
     node = getTreeInfoFromPos(node_first, entry_pos);
 
-    int font_nr = MENU_CHOOSE_TREE_FONT(node->color);
-    int font_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset;
-    int xpos = MENU_SCREEN_START_XPOS;
-    int ypos = MENU_SCREEN_START_YPOS + i;
-    int startx = amSX + xpos * 32;
-    int starty = amSY + ypos * 32;
-    int startx_text = startx + font_xoffset;
-    int endx_text = amSX + screen_width;
-    int max_text_size = endx_text - startx_text;
-    int max_buffer_len = max_text_size / getFontWidth(font_nr);
-    char buffer[max_buffer_len + 1];
-
-    strncpy(buffer, node->name, max_buffer_len);
-    buffer[max_buffer_len] = '\0';
-
-    DrawText(startx, starty, buffer, font_nr);
+    drawChooseTreeText(i, FALSE, ti);
 
     if (node->parent_link)
       initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU);
@@ -4481,6 +4513,12 @@ static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti)
     MarkTileDirty(x, 1);
 }
 
+static void drawChooseTreeCursorAndText(int y, boolean active, TreeInfo *ti)
+{
+  drawChooseTreeCursor(y, active);
+  drawChooseTreeText(y, active, ti);
+}
+
 static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 			     TreeInfo **ti_ptr)
 {
@@ -4528,7 +4566,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
     drawChooseTreeList(ti->cl_first, num_page_entries, ti);
     drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
-    drawChooseTreeCursor(ti->cl_cursor, TRUE);
+    drawChooseTreeCursorAndText(ti->cl_cursor, TRUE, ti);
 
     return;
   }
@@ -4638,7 +4676,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
       {
 	drawChooseTreeList(ti->cl_first, num_page_entries, ti);
 	drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
-	drawChooseTreeCursor(ti->cl_cursor, TRUE);
+	drawChooseTreeCursorAndText(ti->cl_cursor, TRUE, ti);
 
 	AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
 				  ti->cl_first, ti);
@@ -4702,8 +4740,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
       {
 	PlaySound(SND_MENU_ITEM_ACTIVATING);
 
-	drawChooseTreeCursor(ti->cl_cursor, FALSE);
-	drawChooseTreeCursor(y, TRUE);
+	drawChooseTreeCursorAndText(ti->cl_cursor, FALSE, ti);
+	drawChooseTreeCursorAndText(y, TRUE, ti);
 	drawChooseTreeInfo(ti->cl_first + y, ti);
 
 	ti->cl_cursor = y;
@@ -4841,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();
@@ -5080,9 +5121,15 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
   if (button == MB_MENU_INITIALIZE)
   {
     level_nr = mx;
-    first_entry = 0;
     highlight_position = my;
 
+    first_entry = highlight_position - (NUM_MENU_ENTRIES_ON_SCREEN + 1) / 2 + 1;
+
+    if (first_entry < 0)
+      first_entry = 0;
+    else if (first_entry + NUM_MENU_ENTRIES_ON_SCREEN > MAX_SCORE_ENTRIES)
+      first_entry = MAX(0, MAX_SCORE_ENTRIES - NUM_MENU_ENTRIES_ON_SCREEN);
+
     drawHallOfFameList(level_nr, first_entry, highlight_position);
 
     return;
@@ -6319,6 +6366,23 @@ static void execSetupTouch(void)
 
 static void execSetupArtwork(void)
 {
+  static ArtworkDirTree *gfx_last_valid = NULL;
+  static ArtworkDirTree *snd_last_valid = NULL;
+  static ArtworkDirTree *mus_last_valid = NULL;
+
+  // current artwork directory may be invalid (level group, parent link)
+  if (!validLevelSeries(artwork.gfx_current))
+    artwork.gfx_current = getFirstValidTreeInfoEntry(gfx_last_valid);
+  if (!validLevelSeries(artwork.snd_current))
+    artwork.snd_current = getFirstValidTreeInfoEntry(snd_last_valid);
+  if (!validLevelSeries(artwork.mus_current))
+    artwork.mus_current = getFirstValidTreeInfoEntry(mus_last_valid);
+
+  // store valid artwork directory information
+  gfx_last_valid = artwork.gfx_current;
+  snd_last_valid = artwork.snd_current;
+  mus_last_valid = artwork.mus_current;
+
 #if 0
   Debug("screens:execSetupArtwork", "'%s', '%s', '%s'",
 	artwork.gfx_current->subdir,
@@ -6665,8 +6729,11 @@ static struct TokenInfo setup_info_game[] =
   { TYPE_SWITCH,	&setup.skip_levels,	"Skip Unsolved Levels:"	},
   { TYPE_SWITCH,	&setup.increment_levels,"Increment Solved Levels:" },
   { TYPE_SWITCH,	&setup.auto_play_next_level,"Auto-play Next Level:" },
-  { TYPE_SWITCH,	&setup.skip_scores_after_game,"Skip Scores After 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,	""			},