X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=c5df369492548058483daf229319530122f8842f;hb=2f8793d6536d93616683069786ce444583d68e20;hp=5254a19fca9b2be1394bce4afd64e0984f18ffcb;hpb=61b373e48107ac90eac8c19aa506b1827120cda9;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 5254a19f..c5df3694 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -1634,7 +1634,11 @@ void DrawMainMenu(void)
     leveldir_current = getFirstValidTreeInfoEntry(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;
@@ -2168,10 +2172,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       else if (pos == MAIN_CONTROL_EDITOR)
       {
 	if (leveldir_current->readonly &&
-	    !strEqual(setup.player_name, "Artsoft"))
-	  Request("This level is read-only!", REQ_CONFIRM);
+	    setup.editor.show_read_only_warning)
+	  Request("This level is read-only!", REQ_CONFIRM | REQ_STAY_OPEN);
 
-	CloseDoor(DOOR_CLOSE_2);
+	CloseDoor(DOOR_CLOSE_ALL);
 
 	SetGameStatus(GAME_MODE_EDITOR);
 
@@ -5080,9 +5084,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;
@@ -6665,7 +6675,8 @@ 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_SWITCH,	&setup.autorecord,	"Auto-Record Tapes:"	},
   { TYPE_ENTER_LIST,	execSetupChooseGameSpeed, "Game Speed:"		},
@@ -6729,6 +6740,8 @@ static struct TokenInfo setup_info_editor[] =
 #endif
   { TYPE_SWITCH, &setup.editor.show_element_token,	"Show element token:" },
   { TYPE_EMPTY,		NULL,			""			},
+  { TYPE_SWITCH, &setup.editor.show_read_only_warning,	"Show read-only warning:" },
+  { TYPE_EMPTY,		NULL,			""			},
   { TYPE_LEAVE_MENU,	execSetupMain, 		"Back"			},
 
   { 0,			NULL,			NULL			}