X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=7a6bfe41b9fff219d2430bec383145f9f6d53a38;hb=d0c5c90b881c5764e2da6ca4ff7e5bc66f9a5913;hp=47777fa23d825d853309e856707f24e64023208a;hpb=456850f38548906c013fb29dd03f2171021ee9ec;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 47777fa2..7a6bfe41 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -63,30 +63,31 @@
 #define SETUP_MODE_CHOOSE_OTHER		16
 
 // sub-screens on the setup screen (specific)
-#define SETUP_MODE_CHOOSE_GAME_SPEED	17
-#define SETUP_MODE_CHOOSE_SCROLL_DELAY	18
-#define SETUP_MODE_CHOOSE_SNAPSHOT_MODE	19
-#define SETUP_MODE_CHOOSE_WINDOW_SIZE	20
-#define SETUP_MODE_CHOOSE_SCALING_TYPE	21
-#define SETUP_MODE_CHOOSE_RENDERING	22
-#define SETUP_MODE_CHOOSE_VSYNC		23
-#define SETUP_MODE_CHOOSE_GRAPHICS	24
-#define SETUP_MODE_CHOOSE_SOUNDS	25
-#define SETUP_MODE_CHOOSE_MUSIC		26
-#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE	27
-#define SETUP_MODE_CHOOSE_VOLUME_LOOPS	28
-#define SETUP_MODE_CHOOSE_VOLUME_MUSIC	29
-#define SETUP_MODE_CHOOSE_TOUCH_CONTROL	30
-#define SETUP_MODE_CHOOSE_MOVE_DISTANCE	31
-#define SETUP_MODE_CHOOSE_DROP_DISTANCE	32
-#define SETUP_MODE_CHOOSE_TRANSPARENCY	33
-#define SETUP_MODE_CHOOSE_GRID_XSIZE_0	34
-#define SETUP_MODE_CHOOSE_GRID_YSIZE_0	35
-#define SETUP_MODE_CHOOSE_GRID_XSIZE_1	36
-#define SETUP_MODE_CHOOSE_GRID_YSIZE_1	37
-#define SETUP_MODE_CONFIG_VIRT_BUTTONS	38
-
-#define MAX_SETUP_MODES			39
+#define SETUP_MODE_CHOOSE_SCORES_TYPE	17
+#define SETUP_MODE_CHOOSE_GAME_SPEED	18
+#define SETUP_MODE_CHOOSE_SCROLL_DELAY	19
+#define SETUP_MODE_CHOOSE_SNAPSHOT_MODE	20
+#define SETUP_MODE_CHOOSE_WINDOW_SIZE	21
+#define SETUP_MODE_CHOOSE_SCALING_TYPE	22
+#define SETUP_MODE_CHOOSE_RENDERING	23
+#define SETUP_MODE_CHOOSE_VSYNC		24
+#define SETUP_MODE_CHOOSE_GRAPHICS	25
+#define SETUP_MODE_CHOOSE_SOUNDS	26
+#define SETUP_MODE_CHOOSE_MUSIC		27
+#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE	28
+#define SETUP_MODE_CHOOSE_VOLUME_LOOPS	29
+#define SETUP_MODE_CHOOSE_VOLUME_MUSIC	30
+#define SETUP_MODE_CHOOSE_TOUCH_CONTROL	31
+#define SETUP_MODE_CHOOSE_MOVE_DISTANCE	32
+#define SETUP_MODE_CHOOSE_DROP_DISTANCE	33
+#define SETUP_MODE_CHOOSE_TRANSPARENCY	34
+#define SETUP_MODE_CHOOSE_GRID_XSIZE_0	35
+#define SETUP_MODE_CHOOSE_GRID_YSIZE_0	36
+#define SETUP_MODE_CHOOSE_GRID_XSIZE_1	37
+#define SETUP_MODE_CHOOSE_GRID_YSIZE_1	38
+#define SETUP_MODE_CONFIG_VIRT_BUTTONS	39
+
+#define MAX_SETUP_MODES			40
 
 #define MAX_MENU_MODES			MAX(MAX_INFO_MODES, MAX_SETUP_MODES)
 
@@ -104,6 +105,7 @@
 #define STR_SETUP_EXIT			"Exit"
 #define STR_SETUP_SAVE_AND_EXIT		"Save and Exit"
 
+#define STR_SETUP_CHOOSE_SCORES_TYPE	"Scores Type"
 #define STR_SETUP_CHOOSE_GAME_SPEED	"Game Speed"
 #define STR_SETUP_CHOOSE_SCROLL_DELAY	"Scroll Delay"
 #define STR_SETUP_CHOOSE_SNAPSHOT_MODE	"Snapshot Mode"
@@ -182,26 +184,32 @@
 // screen gadget identifiers
 #define SCREEN_CTRL_ID_PREV_LEVEL	0
 #define SCREEN_CTRL_ID_NEXT_LEVEL	1
-#define SCREEN_CTRL_ID_FIRST_LEVEL	2
-#define SCREEN_CTRL_ID_LAST_LEVEL	3
-#define SCREEN_CTRL_ID_LEVEL_NUMBER	4
-#define SCREEN_CTRL_ID_PREV_PLAYER	5
-#define SCREEN_CTRL_ID_NEXT_PLAYER	6
-#define SCREEN_CTRL_ID_INSERT_SOLUTION	7
-#define SCREEN_CTRL_ID_PLAY_SOLUTION	8
-#define SCREEN_CTRL_ID_SWITCH_ECS_AGA	9
-#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE	10
-#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE	11
-#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE2	12
-#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2	13
-#define SCREEN_CTRL_ID_SCROLL_UP	14
-#define SCREEN_CTRL_ID_SCROLL_DOWN	15
-#define SCREEN_CTRL_ID_SCROLL_VERTICAL	16
-#define SCREEN_CTRL_ID_NETWORK_SERVER	17
-
-#define NUM_SCREEN_GADGETS		18
-
-#define NUM_SCREEN_MENUBUTTONS		14
+#define SCREEN_CTRL_ID_PREV_LEVEL2	2
+#define SCREEN_CTRL_ID_NEXT_LEVEL2	3
+#define SCREEN_CTRL_ID_PREV_SCORE	4
+#define SCREEN_CTRL_ID_NEXT_SCORE	5
+#define SCREEN_CTRL_ID_FIRST_LEVEL	6
+#define SCREEN_CTRL_ID_LAST_LEVEL	7
+#define SCREEN_CTRL_ID_LEVEL_NUMBER	8
+#define SCREEN_CTRL_ID_PREV_PLAYER	9
+#define SCREEN_CTRL_ID_NEXT_PLAYER	10
+#define SCREEN_CTRL_ID_INSERT_SOLUTION	11
+#define SCREEN_CTRL_ID_PLAY_SOLUTION	12
+#define SCREEN_CTRL_ID_SWITCH_ECS_AGA	13
+#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE	14
+#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE	15
+#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE2	16
+#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2	17
+
+#define NUM_SCREEN_MENUBUTTONS		18
+
+#define SCREEN_CTRL_ID_SCROLL_UP	18
+#define SCREEN_CTRL_ID_SCROLL_DOWN	19
+#define SCREEN_CTRL_ID_SCROLL_VERTICAL	20
+#define SCREEN_CTRL_ID_NETWORK_SERVER	21
+
+#define NUM_SCREEN_GADGETS		22
+
 #define NUM_SCREEN_SCROLLBUTTONS	2
 #define NUM_SCREEN_SCROLLBARS		1
 #define NUM_SCREEN_TEXTINPUT		1
@@ -211,6 +219,8 @@
 #define SCREEN_MASK_INPUT		(1 << 2)
 #define SCREEN_MASK_TOUCH		(1 << 3)
 #define SCREEN_MASK_TOUCH2		(1 << 4)
+#define SCREEN_MASK_SCORES		(1 << 5)
+#define SCREEN_MASK_SCORES_INFO		(1 << 6)
 
 // graphic position and size values for buttons and scrollbars
 #define SC_MENUBUTTON_XSIZE		TILEX
@@ -257,6 +267,8 @@ static void HandleChooseTree(int, int, int, int, int, TreeInfo **);
 static void DrawChoosePlayerName(void);
 static void DrawChooseLevelSet(void);
 static void DrawChooseLevelNr(void);
+static void DrawScoreInfo(int);
+static void DrawScoreInfo_Content(int);
 static void DrawInfoScreen(void);
 static void DrawSetupScreen(void);
 static void DrawTypeName(void);
@@ -265,26 +277,35 @@ static void DrawInfoScreen_NotAvailable(char *, char *);
 static void DrawInfoScreen_HelpAnim(int, int, boolean);
 static void DrawInfoScreen_HelpText(int, int, int, int);
 static void HandleInfoScreen_Main(int, int, int, int, int);
-static void HandleInfoScreen_TitleScreen(int);
-static void HandleInfoScreen_Elements(int);
-static void HandleInfoScreen_Music(int);
-static void HandleInfoScreen_Credits(int);
+static void HandleInfoScreen_TitleScreen(int, int, int);
+static void HandleInfoScreen_Elements(int, int, int);
+static void HandleInfoScreen_Music(int, int, int);
+static void HandleInfoScreen_Credits(int, int, int);
 static void HandleInfoScreen_Program(int);
 static void HandleInfoScreen_Version(int);
 
 static void ModifyGameSpeedIfNeeded(void);
 static void DisableVsyncIfNeeded(void);
 
+static void RedrawScreenMenuGadgets(int);
 static void MapScreenMenuGadgets(int);
 static void UnmapScreenMenuGadgets(int);
 static void MapScreenGadgets(int);
+static void UnmapScreenGadgets(void);
 static void MapScreenTreeGadgets(TreeInfo *);
+static void UnmapScreenTreeGadgets(void);
 
 static void UpdateScreenMenuGadgets(int, boolean);
+static void AdjustScoreInfoButtons(int, int, int);
 
 static boolean OfferUploadTapes(void);
 static void execOfferUploadTapes(void);
 
+static void DrawHallOfFame_setScoreEntries(void);
+static void HandleHallOfFame_SelectLevel(int, int);
+static char *getHallOfFameRankText(int, int);
+static char *getHallOfFameScoreText(int, int);
+
 static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
 
 static int info_mode = INFO_MODE_MAIN;
@@ -308,6 +329,9 @@ static TreeInfo *scroll_delay_current = NULL;
 static TreeInfo *snapshot_modes = NULL;
 static TreeInfo *snapshot_mode_current = NULL;
 
+static TreeInfo *scores_types = NULL;
+static TreeInfo *scores_type_current = NULL;
+
 static TreeInfo *game_speeds_normal = NULL;
 static TreeInfo *game_speeds_extended = NULL;
 static TreeInfo *game_speeds = NULL;
@@ -343,6 +367,9 @@ static TreeInfo *player_name_current = NULL;
 static TreeInfo *level_number = NULL;
 static TreeInfo *level_number_current = NULL;
 
+static TreeInfo *score_entries = NULL;
+static TreeInfo *score_entry_current = NULL;
+
 static struct ValueTextInfo window_sizes_list[] =
 {
   {	50,	"50 %"				},
@@ -392,6 +419,15 @@ static struct StringValueTextInfo vsync_modes_list[] =
   {	NULL,				 NULL		},
 };
 
+static struct StringValueTextInfo scores_types_list[] =
+{
+  {	STR_SCORES_TYPE_LOCAL_ONLY,	    "Local scores only"		},
+  {	STR_SCORES_TYPE_SERVER_ONLY,	    "Server scores only"	},
+  {	STR_SCORES_TYPE_LOCAL_AND_SERVER,   "Local and server scores"	},
+
+  {	NULL,			 	NULL		},
+};
+
 static struct ValueTextInfo game_speeds_list_normal[] =
 {
   {	30,	"Very Slow"			},
@@ -590,6 +626,10 @@ static int align_yoffset = 0;
 				 menu.extra_spacing[GAME_MODE_SETUP] :	\
 				 menu.extra_spacing_setup[DRAW_MODE_SETUP(i)])
 
+#define EXTRA_SPACING_SCORES(i)	(EXTRA_SPACING_INFO(i))
+
+#define EXTRA_SPACING_SCOREINFO(i) (menu.extra_spacing[GAME_MODE_SCOREINFO])
+
 #define DRAW_XOFFSET(s)		((s) == GAME_MODE_INFO ?		\
 				 DRAW_XOFFSET_INFO(info_mode) :		\
 				 (s) == GAME_MODE_SETUP ?		\
@@ -604,6 +644,8 @@ static int align_yoffset = 0;
 				 EXTRA_SPACING_INFO(info_mode) :	\
 				 (s) == GAME_MODE_SETUP ?		\
 				 EXTRA_SPACING_SETUP(setup_mode) :	\
+				 (s) == GAME_MODE_SCORES ?		\
+				 EXTRA_SPACING_SCORES(info_mode) :	\
 				 menu.extra_spacing[DRAW_MODE(s)])
 
 #define mSX			(SX + DRAW_XOFFSET(game_status))
@@ -641,6 +683,13 @@ struct TitleControlInfo
 
 struct TitleControlInfo title_controls[MAX_NUM_TITLE_SCREENS];
 
+
+// credits screens definitions
+
+static int num_credits_screens = 0;
+static boolean use_global_credits_screens = FALSE;
+
+
 // main menu display and control definitions
 
 #define MAIN_CONTROL_NAME			0
@@ -1379,10 +1428,10 @@ static void AdjustScrollbar(int id, int items_max, int items_visible,
 	       GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END);
 }
 
-static void AdjustChooseTreeScrollbar(int id, int first_entry, TreeInfo *ti)
+static void AdjustChooseTreeScrollbar(TreeInfo *ti, int id)
 {
   AdjustScrollbar(id, numTreeInfoInGroup(ti), NUM_MENU_ENTRIES_ON_SCREEN,
-		  first_entry);
+		  ti->cl_first);
 }
 
 static void clearMenuListArea(void)
@@ -1646,8 +1695,6 @@ void DrawMainMenu(void)
   // store valid level series information
   leveldir_last_valid = leveldir_current;
 
-  init_last = init;			// switch to new busy animation
-
   // needed if last screen (level choice) changed graphics, sounds or music
   ReloadCustomArtwork(0);
 
@@ -1743,6 +1790,9 @@ void DrawMainMenu(void)
   OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
 
   SyncEmscriptenFilesystem();
+
+  // needed once after program start or after user change
+  CheckApiServerTasks();
 }
 
 static void gotoTopLevelDir(void)
@@ -1875,7 +1925,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
   {
     return_to_main_menu = TRUE;
   }
-  else if (button == MB_MENU_CHOICE)
+  else if (button == MB_MENU_CHOICE || dx)
   {
     if (game_status_last_screen == GAME_MODE_INFO && num_title_screens == 0)
     {
@@ -1888,9 +1938,10 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
       return;
     }
 
-    title_screen_nr++;
+    title_screen_nr +=
+      (game_status_last_screen == GAME_MODE_INFO && dx < 0 ? -1 : +1);
 
-    if (title_screen_nr < num_title_screens)
+    if (title_screen_nr >= 0 && title_screen_nr < num_title_screens)
     {
       tci = &title_controls[title_screen_nr];
 
@@ -3047,9 +3098,9 @@ static void DrawInfoScreen_TitleScreen(void)
   DrawTitleScreen();
 }
 
-void HandleInfoScreen_TitleScreen(int button)
+void HandleInfoScreen_TitleScreen(int dx, int dy, int button)
 {
-  HandleTitleScreen(0, 0, 0, 0, button);
+  HandleTitleScreen(0, 0, dx, dy, button);
 }
 
 static void DrawInfoScreen_Elements(void)
@@ -3061,12 +3112,12 @@ static void DrawInfoScreen_Elements(void)
   LoadHelpAnimInfo();
   LoadHelpTextInfo();
 
-  HandleInfoScreen_Elements(MB_MENU_INITIALIZE);
+  HandleInfoScreen_Elements(0, 0, MB_MENU_INITIALIZE);
 
   FadeIn(REDRAW_FIELD);
 }
 
-void HandleInfoScreen_Elements(int button)
+void HandleInfoScreen_Elements(int dx, int dy, int button)
 {
   static unsigned int info_delay = 0;
   static int num_anims;
@@ -3105,16 +3156,16 @@ void HandleInfoScreen_Elements(int button)
 
     return;
   }
-  else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE)
+  else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE || dx)
   {
     if (button != MB_MENU_INITIALIZE)
     {
       PlaySound(SND_MENU_ITEM_SELECTING);
 
-      page++;
+      page += (dx < 0 ? -1 : +1);
     }
 
-    if (page >= num_pages)
+    if (page < 0 || page >= num_pages)
     {
       FadeMenuSoundsAndMusic();
 
@@ -3124,7 +3175,7 @@ void HandleInfoScreen_Elements(int button)
       return;
     }
 
-    if (page > 0)
+    if (button != MB_MENU_INITIALIZE)
       FadeSetNextScreen();
 
     if (button != MB_MENU_INITIALIZE)
@@ -3156,12 +3207,12 @@ static void DrawInfoScreen_Music(void)
 
   LoadMusicInfo();
 
-  HandleInfoScreen_Music(MB_MENU_INITIALIZE);
+  HandleInfoScreen_Music(0, 0, MB_MENU_INITIALIZE);
 
   FadeIn(REDRAW_FIELD);
 }
 
-void HandleInfoScreen_Music(int button)
+void HandleInfoScreen_Music(int dx, int dy, int button)
 {
   static struct MusicFileInfo *list = NULL;
   int font_title = MENU_INFO_FONT_TITLE;
@@ -3207,14 +3258,14 @@ void HandleInfoScreen_Music(int button)
 
     return;
   }
-  else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE)
+  else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE || dx)
   {
     if (button != MB_MENU_INITIALIZE)
     {
       PlaySound(SND_MENU_ITEM_SELECTING);
 
       if (list != NULL)
-	list = list->next;
+	list = (dx < 0 ? list->prev : list->next);
     }
 
     if (list == NULL)
@@ -3242,7 +3293,7 @@ void HandleInfoScreen_Music(int button)
     {
       int sound = list->music;
 
-      if (sound_info[sound].loop)
+      if (IS_LOOP_SOUND(sound))
 	PlaySoundLoop(sound);
       else
 	PlaySound(sound);
@@ -3253,7 +3304,7 @@ void HandleInfoScreen_Music(int button)
     {
       int music = list->music;
 
-      if (music_info[music].loop)
+      if (IS_LOOP_MUSIC(music))
 	PlayMusicLoop(music);
       else
 	PlayMusic(music);
@@ -3321,24 +3372,18 @@ void HandleInfoScreen_Music(int button)
       FadeIn(REDRAW_FIELD);
   }
 
-  if (list != NULL && list->is_sound && sound_info[list->music].loop)
+  if (list != NULL && list->is_sound && IS_LOOP_SOUND(list->music))
     PlaySoundLoop(list->music);
 }
 
 static void DrawInfoScreen_CreditsScreen(int screen_nr)
 {
   int font_title = MENU_INFO_FONT_TITLE;
-  int font_head  = MENU_INFO_FONT_HEAD;
   int font_text  = MENU_INFO_FONT_TEXT;
   int font_foot  = MENU_INFO_FONT_FOOT;
   int spacing_title = menu.headline1_spacing_info[info_mode];
-  int spacing_head  = menu.headline2_spacing_info[info_mode];
-  int spacing_para  = menu.paragraph_spacing_info[info_mode];
   int spacing_line  = menu.line_spacing_info[info_mode];
   int ystep_title = getMenuTextStep(spacing_title, font_title);
-  int ystep_head  = getMenuTextStep(spacing_head,  font_head);
-  int ystep_para  = getMenuTextStep(spacing_para,  font_text);
-  int ystep_line  = getMenuTextStep(spacing_line,  font_text);
   int ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART1;
   int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
 
@@ -3346,211 +3391,21 @@ static void DrawInfoScreen_CreditsScreen(int screen_nr)
   DrawHeadline();
 
   DrawTextSCentered(ystart, font_title, "Credits:");
-  ystart += ystep_title;
 
-  if (screen_nr == 0)
-  {
-    DrawTextSCentered(ystart, font_head,
-		      "Special thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "Peter Liepa");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "for creating");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "\"Boulder Dash\"");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "in the year");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "1984");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "published by");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "First Star Software");
-  }
-  else if (screen_nr == 1)
-  {
-    DrawTextSCentered(ystart, font_head,
-		      "Special thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "Klaus Heinz & Volker Wertich");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "for creating");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "\"Emerald Mine\"");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "in the year");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "1987");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "published by");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "Kingsoft");
-  }
-  else if (screen_nr == 2)
-  {
-    DrawTextSCentered(ystart, font_head,
-		      "Special thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "Michael Stopp & Philip Jespersen");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "for creating");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "\"Supaplex\"");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "in the year");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "1991");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "published by");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "Digital Integration");
-  }
-  else if (screen_nr == 3)
-  {
-    DrawTextSCentered(ystart, font_head,
-		      "Special thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "Hiroyuki Imabayashi");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "for creating");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "\"Sokoban\"");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "in the year");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "1982");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "published by");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "Thinking Rabbit");
-  }
-  else if (screen_nr == 4)
-  {
-    DrawTextSCentered(ystart, font_head,
-		      "Special thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "Alan Bond");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "and");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "J\xfcrgen Bonhagen");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "for the continuous creation");
-    ystart += ystep_line;
-    DrawTextSCentered(ystart, font_head,
-		      "of outstanding level sets");
-  }
-  else if (screen_nr == 5)
-  {
-    DrawTextSCentered(ystart, font_head,
-		      "Thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "Peter Elzner");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "for ideas and inspiration by");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "Diamond Caves");
-    ystart += ystep_para;
-
-    DrawTextSCentered(ystart, font_head,
-		      "Thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "Steffest");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "for ideas and inspiration by");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "DX-Boulderdash");
-  }
-  else if (screen_nr == 6)
-  {
-    DrawTextSCentered(ystart, font_head,
-		      "Thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "David Tritscher");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "for the code base used for the");
-    ystart += ystep_line;
-    DrawTextSCentered(ystart, font_head,
-		      "native Emerald Mine engine");
-  }
-  else if (screen_nr == 7)
-  {
-    DrawTextSCentered(ystart, font_head,
-		      "Thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "Guido Schulz");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "for the initial DOS port");
-    ystart += ystep_para;
-
-    DrawTextSCentered(ystart, font_head,
-		      "Thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "Karl H\xf6rnell");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "for some additional toons");
-  }
-  else if (screen_nr == 8)
-  {
-    DrawTextSCentered(ystart, font_head,
-		      "And not to forget:");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_head,
-		      "Many thanks to");
-    ystart += ystep_head;
-    DrawTextSCentered(ystart, font_text,
-		      "All those who contributed");
-    ystart += ystep_line;
-    DrawTextSCentered(ystart, font_text,
-		      "levels to this game");
-    ystart += ystep_line;
-    DrawTextSCentered(ystart, font_text,
-		      "since 1995");
-  }
+  char *filename = getCreditsFilename(screen_nr, use_global_credits_screens);
+  int width = SXSIZE;
+  int height = MENU_SCREEN_INFO_YBOTTOM - MENU_SCREEN_INFO_YSTART1;
+  int chars = width / getFontWidth(font_text);
+  int lines = height / getFontHeight(font_text);
+  int padx = (width - chars * getFontWidth(font_text)) / 2;
+  int line_spacing = getMenuTextSpacing(spacing_line, font_text);
+  boolean autowrap = FALSE;
+  boolean centered = TRUE;
+  boolean parse_comments = TRUE;
+
+  DrawTextFile(mSX + padx, mSY + MENU_SCREEN_INFO_YSTART1 + ystep_title,
+	       filename, font_text, chars, -1, lines, line_spacing, -1,
+	       autowrap, centered, parse_comments);
 
   DrawTextSCentered(ybottom, font_foot,
 		    "Press any key or button for next page");
@@ -3564,24 +3419,57 @@ static void DrawInfoScreen_Credits(void)
 
   FadeOut(REDRAW_FIELD);
 
-  HandleInfoScreen_Credits(MB_MENU_INITIALIZE);
+  HandleInfoScreen_Credits(0, 0, MB_MENU_INITIALIZE);
 
   FadeIn(REDRAW_FIELD);
 }
 
-void HandleInfoScreen_Credits(int button)
+void HandleInfoScreen_Credits(int dx, int dy, int button)
 {
   static int screen_nr = 0;
-  int num_screens = 9;
 
   if (button == MB_MENU_INITIALIZE)
   {
+    int i;
+
+    // determine number of (global or level set specific) credits screens
+    for (i = 0; i < 2; i++)
+    {
+      num_credits_screens = 0;
+      use_global_credits_screens = i;
+
+      while (getCreditsFilename(num_credits_screens,
+				use_global_credits_screens) != NULL)
+	num_credits_screens++;
+
+      if (num_credits_screens > 0)
+	break;
+    }
+
+    if (num_credits_screens == 0)
+    {
+      int font_title = MENU_INFO_FONT_TITLE;
+      int font_foot  = MENU_INFO_FONT_FOOT;
+      int ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+      int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
+
+      ClearField();
+      DrawHeadline();
+
+      DrawTextSCentered(ystart, font_title,
+			"No credits for this level set.");
+
+      DrawTextSCentered(ybottom, font_foot,
+			"Press any key or button for info menu");
+
+      return;
+    }
+
     screen_nr = 0;
 
-    // DrawInfoScreen_CreditsScreen(screen_nr);
+    DrawInfoScreen_CreditsScreen(screen_nr);
   }
-
-  if (button == MB_MENU_LEAVE)
+  else if (button == MB_MENU_LEAVE)
   {
     PlaySound(SND_MENU_ITEM_SELECTING);
 
@@ -3590,16 +3478,13 @@ void HandleInfoScreen_Credits(int button)
 
     return;
   }
-  else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE)
+  else if (button == MB_MENU_CHOICE || dx)
   {
-    if (button != MB_MENU_INITIALIZE)
-    {
-      PlaySound(SND_MENU_ITEM_SELECTING);
+    PlaySound(SND_MENU_ITEM_SELECTING);
 
-      screen_nr++;
-    }
+    screen_nr += (dx < 0 ? -1 : +1);
 
-    if (screen_nr >= num_screens)
+    if (screen_nr < 0 || screen_nr >= num_credits_screens)
     {
       FadeMenuSoundsAndMusic();
 
@@ -3609,16 +3494,13 @@ void HandleInfoScreen_Credits(int button)
       return;
     }
 
-    if (screen_nr > 0)
-      FadeSetNextScreen();
+    FadeSetNextScreen();
 
-    if (button != MB_MENU_INITIALIZE)
-      FadeOut(REDRAW_FIELD);
+    FadeOut(REDRAW_FIELD);
 
     DrawInfoScreen_CreditsScreen(screen_nr);
 
-    if (button != MB_MENU_INITIALIZE)
-      FadeIn(REDRAW_FIELD);
+    FadeIn(REDRAW_FIELD);
   }
   else
   {
@@ -4024,13 +3906,13 @@ static void DrawInfoScreen(void)
 void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
 {
   if (info_mode == INFO_MODE_TITLE)
-    HandleInfoScreen_TitleScreen(button);
+    HandleInfoScreen_TitleScreen(dx, dy, button);
   else if (info_mode == INFO_MODE_ELEMENTS)
-    HandleInfoScreen_Elements(button);
+    HandleInfoScreen_Elements(dx, dy, button);
   else if (info_mode == INFO_MODE_MUSIC)
-    HandleInfoScreen_Music(button);
+    HandleInfoScreen_Music(dx, dy, button);
   else if (info_mode == INFO_MODE_CREDITS)
-    HandleInfoScreen_Credits(button);
+    HandleInfoScreen_Credits(dx, dy, button);
   else if (info_mode == INFO_MODE_PROGRAM)
     HandleInfoScreen_Program(button);
   else if (info_mode == INFO_MODE_VERSION)
@@ -4043,7 +3925,7 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
 
 
 // ============================================================================
-// change name functions
+// rename player API functions
 // ============================================================================
 
 struct ApiRenamePlayerThreadData
@@ -4212,12 +4094,16 @@ static int ApiRenamePlayerThread(void *data_raw)
   struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
   struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
 
+  program.api_thread_count++;
+
 #if defined(PLATFORM_EMSCRIPTEN)
   Emscripten_ApiRenamePlayer_HttpRequest(request, data_raw);
 #else
   ApiRenamePlayer_HttpRequest(request, response, data_raw);
 #endif
 
+  program.api_thread_count--;
+
   checked_free(request);
   checked_free(response);
 
@@ -4234,6 +4120,216 @@ static void ApiRenamePlayerAsThread(void)
 }
 
 
+// ============================================================================
+// reset player UUID API functions
+// ============================================================================
+
+struct ApiResetUUIDThreadData
+{
+  char *player_name;
+  char *player_uuid_old;
+  char *player_uuid_new;
+};
+
+static void *CreateThreadData_ApiResetUUID(char *uuid_new)
+{
+  struct ApiResetUUIDThreadData *data =
+    checked_malloc(sizeof(struct ApiResetUUIDThreadData));
+
+  data->player_name     = getStringCopy(setup.player_name);
+  data->player_uuid_old = getStringCopy(setup.player_uuid);
+  data->player_uuid_new = getStringCopy(uuid_new);
+
+  return data;
+}
+
+static void FreeThreadData_ApiResetUUID(void *data_raw)
+{
+  struct ApiResetUUIDThreadData *data = data_raw;
+
+  checked_free(data->player_name);
+  checked_free(data->player_uuid_old);
+  checked_free(data->player_uuid_new);
+  checked_free(data);
+}
+
+static boolean SetRequest_ApiResetUUID(struct HttpRequest *request,
+				       void *data_raw)
+{
+  struct ApiResetUUIDThreadData *data = data_raw;
+  char *player_name_raw = data->player_name;
+  char *player_uuid_old_raw = data->player_uuid_old;
+  char *player_uuid_new_raw = data->player_uuid_new;
+
+  request->hostname = setup.api_server_hostname;
+  request->port     = API_SERVER_PORT;
+  request->method   = API_SERVER_METHOD;
+  request->uri      = API_SERVER_URI_RESETUUID;
+
+  char *player_name = getEscapedJSON(player_name_raw);
+  char *player_uuid_old = getEscapedJSON(player_uuid_old_raw);
+  char *player_uuid_new = getEscapedJSON(player_uuid_new_raw);
+
+  snprintf(request->body, MAX_HTTP_BODY_SIZE,
+	   "{\n"
+	   "%s"
+	   "  \"game_version\":         \"%s\",\n"
+	   "  \"game_platform\":        \"%s\",\n"
+	   "  \"name\":                 \"%s\",\n"
+	   "  \"uuid_old\":             \"%s\",\n"
+	   "  \"uuid_new\":             \"%s\"\n"
+	   "}\n",
+	   getPasswordJSON(setup.api_server_password),
+	   getProgramRealVersionString(),
+	   getProgramPlatformString(),
+	   player_name,
+	   player_uuid_old,
+	   player_uuid_new);
+
+  checked_free(player_name);
+  checked_free(player_uuid_old);
+  checked_free(player_uuid_new);
+
+  ConvertHttpRequestBodyToServerEncoding(request);
+
+  return TRUE;
+}
+
+static void HandleResponse_ApiResetUUID(struct HttpResponse *response,
+					void *data_raw)
+{
+  struct ApiResetUUIDThreadData *data = data_raw;
+
+  // upgrade player UUID in server setup file
+  setup.player_uuid = getStringCopy(data->player_uuid_new);
+  setup.player_version = 2;
+
+  SaveSetup_ServerSetup();
+}
+
+#if defined(PLATFORM_EMSCRIPTEN)
+static void Emscripten_ApiResetUUID_Loaded(unsigned handle, void *data_raw,
+					   void *buffer, unsigned int size)
+{
+  struct HttpResponse *response = GetHttpResponseFromBuffer(buffer, size);
+
+  if (response != NULL)
+  {
+    HandleResponse_ApiResetUUID(response, data_raw);
+
+    checked_free(response);
+  }
+  else
+  {
+    Error("server response too large to handle (%d bytes)", size);
+  }
+
+  FreeThreadData_ApiResetUUID(data_raw);
+}
+
+static void Emscripten_ApiResetUUID_Failed(unsigned handle, void *data_raw,
+					   int code, const char *status)
+{
+  Error("server failed to handle request: %d %s", code, status);
+
+  FreeThreadData_ApiResetUUID(data_raw);
+}
+
+static void Emscripten_ApiResetUUID_Progress(unsigned handle, void *data_raw,
+					     int bytes, int size)
+{
+  // nothing to do here
+}
+
+static void Emscripten_ApiResetUUID_HttpRequest(struct HttpRequest *request,
+						void *data_raw)
+{
+  if (!SetRequest_ApiResetUUID(request, data_raw))
+  {
+    FreeThreadData_ApiResetUUID(data_raw);
+
+    return;
+  }
+
+  emscripten_async_wget2_data(request->uri,
+			      request->method,
+			      request->body,
+			      data_raw,
+			      TRUE,
+			      Emscripten_ApiResetUUID_Loaded,
+			      Emscripten_ApiResetUUID_Failed,
+			      Emscripten_ApiResetUUID_Progress);
+}
+
+#else
+
+static void ApiResetUUID_HttpRequestExt(struct HttpRequest *request,
+					struct HttpResponse *response,
+					void *data_raw)
+{
+  if (!SetRequest_ApiResetUUID(request, data_raw))
+    return;
+
+  if (!DoHttpRequest(request, response))
+  {
+    Error("HTTP request failed: %s", GetHttpError());
+
+    return;
+  }
+
+  if (!HTTP_SUCCESS(response->status_code))
+  {
+    Error("server failed to handle request: %d %s",
+	  response->status_code,
+	  response->status_text);
+
+    return;
+  }
+
+  HandleResponse_ApiResetUUID(response, data_raw);
+}
+
+static void ApiResetUUID_HttpRequest(struct HttpRequest *request,
+				     struct HttpResponse *response,
+				     void *data_raw)
+{
+  ApiResetUUID_HttpRequestExt(request, response, data_raw);
+
+  FreeThreadData_ApiResetUUID(data_raw);
+}
+#endif
+
+static int ApiResetUUIDThread(void *data_raw)
+{
+  struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
+  struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
+
+  program.api_thread_count++;
+
+#if defined(PLATFORM_EMSCRIPTEN)
+  Emscripten_ApiResetUUID_HttpRequest(request, data_raw);
+#else
+  ApiResetUUID_HttpRequest(request, response, data_raw);
+#endif
+
+  program.api_thread_count--;
+
+  checked_free(request);
+  checked_free(response);
+
+  return 0;
+}
+
+static void ApiResetUUIDAsThread(char *uuid_new)
+{
+  struct ApiResetUUIDThreadData *data = CreateThreadData_ApiResetUUID(uuid_new);
+
+  ExecuteAsThread(ApiResetUUIDThread,
+		  "ApiResetUUID", data,
+		  "reset UUID on server");
+}
+
+
 // ============================================================================
 // type name functions
 // ============================================================================
@@ -4576,11 +4672,13 @@ static int getAlignYOffsetFromTreeInfo(TreeInfo *ti)
 static void DrawChooseTree(TreeInfo **ti_ptr)
 {
   int fade_mask = REDRAW_FIELD;
+  boolean restart_music = (game_status != game_status_last_screen &&
+			   game_status_last_screen != GAME_MODE_SCOREINFO);
 
   if (CheckFadeAll())
     fade_mask = REDRAW_ALL;
 
-  if (strEqual((*ti_ptr)->subdir, STRING_TOP_DIRECTORY))
+  if (*ti_ptr != NULL && strEqual((*ti_ptr)->subdir, STRING_TOP_DIRECTORY))
   {
     if (game_status == GAME_MODE_SETUP)
     {
@@ -4601,9 +4699,12 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
   FreeScreenGadgets();
   CreateScreenGadgets();
 
+  if (restart_music)
+    FadeMenuSoundsAndMusic();
+
   FadeOut(fade_mask);
 
-  // needed if different viewport properties defined for choosing level (set)
+  // needed if different viewport properties defined for this screen
   ChangeViewportPropertiesIfNeeded();
 
   if (game_status == GAME_MODE_NAMES)
@@ -4612,20 +4713,38 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
     SetMainBackgroundImage(IMG_BACKGROUND_LEVELNR);
   else if (game_status == GAME_MODE_LEVELS)
     SetMainBackgroundImage(IMG_BACKGROUND_LEVELS);
+  else if (game_status == GAME_MODE_SCORES)
+    SetMainBackgroundImage(IMG_BACKGROUND_SCORES);
 
   ClearField();
 
   OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
 
+  // map gadgets for high score screen
+  if (game_status == GAME_MODE_SCORES)
+    MapScreenMenuGadgets(SCREEN_MASK_SCORES);
+
   MapScreenTreeGadgets(*ti_ptr);
+
   HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr);
 
   DrawMaskedBorder(fade_mask);
 
+  if (restart_music)
+    PlayMenuSoundsAndMusic();
+
   FadeIn(fade_mask);
 }
 
-static void drawChooseTreeText(int y, boolean active, TreeInfo *ti)
+static int getChooseTreeFont(TreeInfo *node, boolean active)
+{
+  if (game_status == GAME_MODE_SCORES)
+    return (active ? FONT_TEXT_1_ACTIVE : FONT_TEXT_1);
+  else
+    return MENU_CHOOSE_TREE_FONT(MENU_CHOOSE_TREE_COLOR(node, active));
+}
+
+static void drawChooseTreeText(TreeInfo *ti, int y, boolean active)
 {
   int num_entries = numTreeInfoInGroup(ti);
   boolean scrollbar_needed = (num_entries > NUM_MENU_ENTRIES_ON_SCREEN);
@@ -4635,38 +4754,84 @@ static void drawChooseTreeText(int y, boolean active, TreeInfo *ti)
   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 font_nr = getChooseTreeFont(node, active);
+  int font_xoffset = getFontDrawOffsetX(font_nr);
   int xpos = MENU_SCREEN_START_XPOS;
   int ypos = MENU_SCREEN_START_YPOS + y;
-  int startx = amSX + xpos * 32;
-  int starty = amSY + ypos * 32;
+  int startdx = xpos * 32;
+  int startdy = ypos * 32;
+  int startx = amSX + startdx;
+  int starty = amSY + startdy;
   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';
+  if (game_status == GAME_MODE_SCORES && !node->parent_link)
+  {
+    int font_nr1 = (active ? FONT_TEXT_1_ACTIVE : FONT_TEXT_1);
+    int font_nr2 = (active ? FONT_TEXT_2_ACTIVE : FONT_TEXT_2);
+    int font_nr3 = (active ? FONT_TEXT_3_ACTIVE : FONT_TEXT_3);
+    int font_nr4 = (active ? FONT_TEXT_4_ACTIVE : FONT_TEXT_4);
+    int font_size_1 = getFontWidth(font_nr1);
+    int font_size_3 = getFontWidth(font_nr3);
+    int font_size_4 = getFontWidth(font_nr4);
+    int text_size_1 = 4 * font_size_1;
+    int text_size_4 = 5 * font_size_4;
+    int border = amSX - SX + getFontDrawOffsetX(font_nr1);
+    int dx1 = 0;
+    int dx3 = text_size_1;
+    int dx4 = SXSIZE - 2 * startdx - 2 * border - text_size_4;
+    int num_dots = (dx4 - dx3) / font_size_3;
+    int startx1 = startx + dx1;
+    int startx3 = startx + dx3;
+    int startx4 = startx + dx4;
+    int pos = node->pos;
+    char *pos_text = getHallOfFameRankText(pos, 3);
+    int i;
+
+    DrawText(startx1, starty, pos_text, font_nr1);
+
+    for (i = 0; i < num_dots; i++)
+      DrawText(startx3 + i * font_size_3, starty, ".", font_nr3);
+
+    if (!strEqual(scores.entry[pos].name, EMPTY_PLAYER_NAME))
+      DrawText(startx3, starty, scores.entry[pos].name, font_nr2);
 
-  DrawText(startx, starty, buffer, font_nr);
+    DrawText(startx4, starty, getHallOfFameScoreText(pos, 5), font_nr4);
+  }
+  else
+  {
+    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)
+static void drawChooseTreeHeadExt(int type, char *title_string)
 {
-  int i;
-  char *title_string = NULL;
   int yoffset_sets = MENU_TITLE1_YPOS;
   int yoffset_setup = 16;
-  int yoffset = (ti->type == TREE_TYPE_LEVEL_DIR ||
-		 ti->type == TREE_TYPE_LEVEL_NR ? yoffset_sets : yoffset_setup);
-
-  title_string = ti->infotext;
+  int yoffset = (type == TREE_TYPE_SCORE_ENTRY ||
+		 type == TREE_TYPE_LEVEL_DIR ||
+		 type == TREE_TYPE_LEVEL_NR ? yoffset_sets : yoffset_setup);
 
   DrawTextSCentered(mSY - SY + yoffset, FONT_TITLE_1, title_string);
+}
+
+static void drawChooseTreeHead(TreeInfo *ti)
+{
+  drawChooseTreeHeadExt(ti->type, ti->infotext);
+}
+
+static void drawChooseTreeList(TreeInfo *ti)
+{
+  int first_entry = ti->cl_first;
+  int num_entries = numTreeInfoInGroup(ti);
+  int num_page_entries = MIN(num_entries, NUM_MENU_ENTRIES_ON_SCREEN);
+  int i;
 
   clearMenuListArea();
 
@@ -4678,7 +4843,7 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
     node_first = getTreeInfoFirstGroupEntry(ti);
     node = getTreeInfoFromPos(node_first, entry_pos);
 
-    drawChooseTreeText(i, FALSE, ti);
+    drawChooseTreeText(ti, i, FALSE);
 
     if (node->parent_link)
       initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU);
@@ -4687,6 +4852,9 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
     else
       initCursor(i, IMG_MENU_BUTTON);
 
+    if (game_status == GAME_MODE_SCORES && node->pos == scores.last_added)
+      initCursor(i, IMG_MENU_BUTTON_ENTER_MENU);
+
     if (game_status == GAME_MODE_NAMES)
       drawChooseTreeEdit(i, FALSE);
   }
@@ -4694,21 +4862,26 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
   redraw_mask |= REDRAW_FIELD;
 }
 
-static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti)
+static void drawChooseTreeInfo(TreeInfo *ti)
 {
-  TreeInfo *node, *node_first;
-  int x, last_redraw_mask = redraw_mask;
+  int entry_pos = ti->cl_first + ti->cl_cursor;
+  int last_redraw_mask = redraw_mask;
   int ypos = MENU_TITLE2_YPOS;
   int font_nr = FONT_TITLE_2;
+  int x;
 
   if (ti->type == TREE_TYPE_LEVEL_NR)
     DrawTextFCentered(ypos, font_nr, leveldir_current->name);
 
+  if (ti->type == TREE_TYPE_SCORE_ENTRY)
+    DrawTextFCentered(ypos, font_nr, "HighScores of Level %d",
+		      scores.last_level_nr);
+
   if (ti->type != TREE_TYPE_LEVEL_DIR)
     return;
 
-  node_first = getTreeInfoFirstGroupEntry(ti);
-  node = getTreeInfoFromPos(node_first, entry_pos);
+  TreeInfo *node_first = getTreeInfoFirstGroupEntry(ti);
+  TreeInfo *node = getTreeInfoFromPos(node_first, entry_pos);
 
   DrawBackgroundForFont(SX, SY + ypos, SXSIZE, getFontHeight(font_nr), font_nr);
 
@@ -4729,10 +4902,79 @@ static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti)
     MarkTileDirty(x, 1);
 }
 
-static void drawChooseTreeCursorAndText(int y, boolean active, TreeInfo *ti)
+static void drawChooseTreeCursorAndText(TreeInfo *ti, boolean active)
 {
-  drawChooseTreeCursor(y, active);
-  drawChooseTreeText(y, active, ti);
+  drawChooseTreeCursor(ti->cl_cursor, active);
+  drawChooseTreeText(ti, ti->cl_cursor, active);
+}
+
+static void drawChooseTreeScreen(TreeInfo *ti)
+{
+  drawChooseTreeHead(ti);
+  drawChooseTreeList(ti);
+  drawChooseTreeInfo(ti);
+  drawChooseTreeCursorAndText(ti, TRUE);
+
+  AdjustChooseTreeScrollbar(ti, SCREEN_CTRL_ID_SCROLL_VERTICAL);
+
+  // scroll bar and buttons may just have been added after reloading scores
+  if (game_status == GAME_MODE_SCORES)
+    MapScreenTreeGadgets(ti);
+}
+
+static void drawChooseTreeScreen_Scores_NotAvailable(void)
+{
+  // dirty workaround to use spacing definitions from info screen
+  info_mode = INFO_MODE_TITLE;
+
+  char *text_info = "HighScores of Level %d";
+  char *text_title = "Score information:";
+  char *text_error = "No scores for this level.";
+  char *text_foot = "Press any key or button for main menu";
+  int font_info = FONT_TITLE_2;
+  int font_title = FONT_INITIAL_3;
+  int font_error = FONT_INITIAL_4;
+  int font_foot  = FONT_INITIAL_2;
+  int spacing_title = menu.headline1_spacing_info[INFO_MODE_TITLE];
+  int ystep_title = getMenuTextStep(spacing_title, font_title);
+  int ystart1 = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+  int ystart2 = ystart1 + ystep_title;
+  int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
+  int ystart0 = MENU_TITLE2_YPOS;
+
+  drawChooseTreeHeadExt(TREE_TYPE_SCORE_ENTRY, INFOTEXT_SCORE_ENTRY);
+  DrawTextFCentered(ystart0, font_info, text_info, scores.last_level_nr);
+
+  DrawTextSCentered(ystart1, font_title, text_title);
+  DrawTextSCentered(ystart2, font_error, text_error);
+
+  DrawTextSCentered(ybottom, font_foot, text_foot);
+}
+
+static TreeInfo *setHallOfFameActiveEntry(TreeInfo **ti_ptr)
+{
+  int score_pos = scores.last_added;
+
+  if (game_status_last_screen == GAME_MODE_SCOREINFO)
+    score_pos = scores.last_entry_nr;
+
+  // set current tree entry to last added score entry
+  *ti_ptr = getTreeInfoFromIdentifier(score_entries, i_to_a(score_pos));
+
+  // if that fails, set current tree entry to first entry (back link)
+  if (*ti_ptr == NULL)
+    *ti_ptr = score_entries->node_group;
+
+  int num_entries = numTreeInfoInGroup(*ti_ptr);
+  int num_page_entries = MIN(num_entries, NUM_MENU_ENTRIES_ON_SCREEN);
+  int pos_score = getPosFromTreeInfo(*ti_ptr);
+  int pos_first_raw = pos_score - (num_page_entries + 1) / 2 + 1;
+  int pos_first = MIN(MAX(0, pos_first_raw), num_entries - num_page_entries);
+
+  (*ti_ptr)->cl_first = pos_first;
+  (*ti_ptr)->cl_cursor = pos_score - pos_first;
+
+  return *ti_ptr;
 }
 
 static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
@@ -4745,11 +4987,53 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
   int sx1_edit_name = getChooseTreeEditXPos(POS_LEFT);
   int sx2_edit_name = getChooseTreeEditXPos(POS_RIGHT);
   int x = 0;
-  int y = ti->cl_cursor;
+  int y = (ti != NULL ? ti->cl_cursor : 0);
   int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
   int num_entries = numTreeInfoInGroup(ti);
   int num_page_entries = MIN(num_entries, NUM_MENU_ENTRIES_ON_SCREEN);
   boolean position_set_by_scrollbar = (dx == 999);
+  boolean button_action = (button == MB_MENU_LEAVE || button == MB_MENU_CHOICE);
+  boolean button_is_valid = (mx >= 0 && my >= 0);
+  boolean button_screen_clicked = (button_action && button_is_valid);
+
+  if (game_status == GAME_MODE_SCORES)
+  {
+    if (server_scores.updated)
+    {
+      // reload scores, using updated server score cache file
+      LoadLocalAndServerScore(scores.last_level_nr, FALSE);
+
+      server_scores.updated = FALSE;
+
+      DrawHallOfFame_setScoreEntries();
+
+      if (score_entries != NULL)
+      {
+	ti = setHallOfFameActiveEntry(ti_ptr);
+
+	if (button != MB_MENU_INITIALIZE)
+	  drawChooseTreeScreen(ti);
+      }
+    }
+
+    if (score_entries == NULL)
+    {
+      if (button == MB_MENU_INITIALIZE)
+      {
+	drawChooseTreeScreen_Scores_NotAvailable();
+      }
+      else if (button_screen_clicked)
+      {
+	PlaySound(SND_MENU_ITEM_SELECTING);
+
+	SetGameStatus(GAME_MODE_MAIN);
+
+	DrawMainMenu();
+      }
+
+      return;
+    }
+  }
 
   if (button == MB_MENU_INITIALIZE)
   {
@@ -4759,11 +5043,16 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     align_xoffset = getAlignXOffsetFromTreeInfo(ti);
     align_yoffset = getAlignYOffsetFromTreeInfo(ti);
 
-    if (ti->cl_first == -1)
+    if (game_status == GAME_MODE_SCORES)
+    {
+      ti = setHallOfFameActiveEntry(ti_ptr);
+    }
+    else if (ti->cl_first == -1)
     {
       // only on initialization
       ti->cl_first = MAX(0, entry_pos - num_page_entries + 1);
       ti->cl_cursor = entry_pos - ti->cl_first;
+
     }
     else if (ti->cl_cursor >= num_page_entries ||
 	     (num_entries > num_page_entries &&
@@ -4776,19 +5065,15 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
     if (position_set_by_scrollbar)
       ti->cl_first = dy;
-    else
-      AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
-				ti->cl_first, ti);
 
-    drawChooseTreeList(ti->cl_first, num_page_entries, ti);
-    drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
-    drawChooseTreeCursorAndText(ti->cl_cursor, TRUE, ti);
+    drawChooseTreeScreen(ti);
 
     return;
   }
   else if (button == MB_MENU_LEAVE)
   {
-    FadeSetLeaveMenu();
+    if (game_status != GAME_MODE_SCORES)
+      FadeSetLeaveMenu();
 
     PlaySound(SND_MENU_ITEM_SELECTING);
 
@@ -4799,7 +5084,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     }
     else if (game_status == GAME_MODE_SETUP)
     {
-      if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED ||
+      if (setup_mode == SETUP_MODE_CHOOSE_SCORES_TYPE ||
+	  setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED ||
 	  setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY ||
 	  setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
 	execSetupGame();
@@ -4889,14 +5175,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
       }
 
       if (redraw)
-      {
-	drawChooseTreeList(ti->cl_first, num_page_entries, ti);
-	drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti);
-	drawChooseTreeCursorAndText(ti->cl_cursor, TRUE, ti);
-
-	AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
-				  ti->cl_first, ti);
-      }
+	drawChooseTreeScreen(ti);
 
       return;
     }
@@ -4905,7 +5184,13 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     y = ti->cl_cursor + dy;
   }
 
-  if (dx == 1)
+  if (game_status == GAME_MODE_SCORES && ABS(dx) == 1)
+  {
+    HandleHallOfFame_SelectLevel(1, dx);
+
+    return;
+  }
+  else if (dx == 1)
   {
     TreeInfo *node_first, *node_cursor;
     int entry_pos = ti->cl_first + y;
@@ -4956,17 +5241,20 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
       {
 	PlaySound(SND_MENU_ITEM_ACTIVATING);
 
-	drawChooseTreeCursorAndText(ti->cl_cursor, FALSE, ti);
-	drawChooseTreeCursorAndText(y, TRUE, ti);
-	drawChooseTreeInfo(ti->cl_first + y, ti);
+	drawChooseTreeCursorAndText(ti, FALSE);
 
 	ti->cl_cursor = y;
+
+	drawChooseTreeCursorAndText(ti, TRUE);
+
+	drawChooseTreeInfo(ti);
       }
       else if (dx < 0)
       {
 	if (game_status == GAME_MODE_SETUP)
 	{
-	  if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED ||
+	  if (setup_mode == SETUP_MODE_CHOOSE_SCORES_TYPE ||
+	      setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED ||
 	      setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY ||
 	      setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
 	    execSetupGame();
@@ -5014,14 +5302,16 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
       }
       else if (node_cursor->parent_link)
       {
-	FadeSetLeaveMenu();
+	if (game_status != GAME_MODE_SCORES)
+	  FadeSetLeaveMenu();
 
 	*ti_ptr = node_cursor->node_parent;
 	DrawChooseTree(ti_ptr);
       }
       else
       {
-	FadeSetEnterMenu();
+	if (game_status != GAME_MODE_SCORES)
+	  FadeSetEnterMenu();
 
 	node_cursor->cl_first = ti->cl_first;
 	node_cursor->cl_cursor = ti->cl_cursor;
@@ -5038,7 +5328,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
 	if (game_status == GAME_MODE_SETUP)
 	{
-	  if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED ||
+	  if (setup_mode == SETUP_MODE_CHOOSE_SCORES_TYPE ||
+	      setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED ||
 	      setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY ||
 	      setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
 	    execSetupGame();
@@ -5112,25 +5403,43 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 	    ChangeCurrentArtworkIfNeeded(ARTWORK_TYPE_SOUNDS);
 	    ChangeCurrentArtworkIfNeeded(ARTWORK_TYPE_MUSIC);
 	  }
+	  else if (game_status == GAME_MODE_SCORES)
+	  {
+	    if (game_status_last_screen == GAME_MODE_PLAYING &&
+		setup.auto_play_next_level && setup.increment_levels &&
+		scores.last_level_nr < leveldir_current->last_level &&
+		!network_playing)
+	    {
+	      StartGameActions(network.enabled, setup.autorecord,
+			       level.random_seed);
+	      return;
+	    }
+	    else
+	    {
+	      SetGameStatus(GAME_MODE_SCOREINFO);
+
+	      DrawScoreInfo(node_cursor->pos);
+
+	      return;
+	    }
+	  }
 
 	  SetGameStatus(GAME_MODE_MAIN);
 
 	  DrawMainMenu();
-
-	  // needed once to offer uploading score tapes after changing user
-	  CheckUploadTapes();
 	}
       }
     }
   }
+
+  if (game_status == GAME_MODE_SCORES)
+    PlayMenuSoundIfLoop();
 }
 
 void DrawChoosePlayerName(void)
 {
   int i;
 
-  FadeMenuSoundsAndMusic();
-
   if (player_name != NULL)
   {
     freeTreeInfo(player_name);
@@ -5170,8 +5479,6 @@ void DrawChoosePlayerName(void)
     player_name_current = player_name;
 
   DrawChooseTree(&player_name_current);
-
-  PlayMenuSoundsAndMusic();
 }
 
 void HandleChoosePlayerName(int mx, int my, int dx, int dy, int button)
@@ -5181,11 +5488,7 @@ void HandleChoosePlayerName(int mx, int my, int dx, int dy, int button)
 
 void DrawChooseLevelSet(void)
 {
-  FadeMenuSoundsAndMusic();
-
   DrawChooseTree(&leveldir_current);
-
-  PlayMenuSoundsAndMusic();
 }
 
 void HandleChooseLevelSet(int mx, int my, int dx, int dy, int button)
@@ -5197,8 +5500,6 @@ void DrawChooseLevelNr(void)
 {
   int i;
 
-  FadeMenuSoundsAndMusic();
-
   if (level_number != NULL)
   {
     freeTreeInfo(level_number);
@@ -5244,8 +5545,6 @@ void DrawChooseLevelNr(void)
     level_number_current = level_number;
 
   DrawChooseTree(&level_number_current);
-
-  PlayMenuSoundsAndMusic();
 }
 
 void HandleChooseLevelNr(int mx, int my, int dx, int dy, int button)
@@ -5253,69 +5552,101 @@ void HandleChooseLevelNr(int mx, int my, int dx, int dy, int button)
   HandleChooseTree(mx, my, dx, dy, button, &level_number_current);
 }
 
-void DrawHallOfFame(int level_nr)
+static void DrawHallOfFame_setScoreEntries(void)
 {
-  int fade_mask = REDRAW_FIELD;
+  int max_empty_entries = 10;	// at least show "top ten" list, if empty
+  int max_visible_entries = NUM_MENU_ENTRIES_ON_SCREEN - 1;   // w/o back link
+  int min_score_entries = MIN(max_empty_entries, max_visible_entries);
+  int score_pos = (scores.last_added >= 0 ? scores.last_added : 0);
+  int i;
 
-  if (CheckFadeAll())
-    fade_mask = REDRAW_ALL;
+  if (score_entries != NULL)
+  {
+    freeTreeInfo(score_entries);
 
-  UnmapAllGadgets();
-  FadeMenuSoundsAndMusic();
+    score_entries = NULL;
+  }
 
-  // (this is needed when called from GameEnd() after winning a game)
-  KeyboardAutoRepeatOn();
+  for (i = 0; i < MAX_SCORE_ENTRIES; i++)
+  {
+    // do not add empty score entries if off-screen
+    if (scores.entry[i].score == 0 &&
+	scores.entry[i].time == 0 &&
+	i >= min_score_entries)
+      break;
 
-  // (this is needed when called from GameEnd() after winning a game)
-  SetDrawDeactivationMask(REDRAW_NONE);
-  SetDrawBackgroundMask(REDRAW_FIELD);
+    TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_SCORE_ENTRY);
+    char identifier[32], name[64];
+    int value = i;
 
-  LoadLocalAndServerScore(level_nr, TRUE);
+    ti->node_top = &score_entries;
+    ti->sort_priority = 10000 + value;
+    ti->color = FC_YELLOW;
+    ti->pos = i;
 
-  if (scores.last_added >= 0)
-    SetAnimStatus(GAME_MODE_PSEUDO_SCORESNEW);
+    snprintf(identifier, sizeof(identifier), "%d", value);
+    snprintf(name, sizeof(name), "%03d.", value + 1);
 
-  FadeSetEnterScreen();
+    setString(&ti->identifier, identifier);
+    setString(&ti->name, name);
+    setString(&ti->name_sorting, name);
 
-  FadeOut(fade_mask);
+    pushTreeInfo(&score_entries, ti);
+  }
 
-  // needed if different viewport properties defined for scores
-  ChangeViewportPropertiesIfNeeded();
+  // sort score entries to start with highest score entry
+  sortTreeInfo(&score_entries);
+
+  // add top tree node to create back link to main menu
+  score_entries = addTopTreeInfoNode(score_entries);
+
+  // set current score entry to last added or highest score entry
+  score_entry_current =
+    getTreeInfoFromIdentifier(score_entries, i_to_a(score_pos));
+
+  // if that fails, set current score entry to first valid score entry
+  if (score_entry_current == NULL)
+    score_entry_current = getFirstValidTreeInfoEntry(score_entries);
+
+  // ("score_entries" and "score_entry_current" may be NULL here)
+}
+
+void DrawHallOfFame(int level_nr)
+{
+  scores.last_level_nr = level_nr;
+
+  // (this is needed when called from GameEnd() after winning a game)
+  KeyboardAutoRepeatOn();
+
+  // (this is needed when called from GameEnd() after winning a game)
+  SetDrawDeactivationMask(REDRAW_NONE);
+  SetDrawBackgroundMask(REDRAW_FIELD);
 
-  PlayMenuSoundsAndMusic();
+  LoadLocalAndServerScore(level_nr, TRUE);
 
-  OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+  DrawHallOfFame_setScoreEntries();
 
-  HandleHallOfFame(level_nr, 0, 0, 0, MB_MENU_INITIALIZE);
+  if (scores.last_added >= 0)
+    SetAnimStatus(GAME_MODE_PSEUDO_SCORESNEW);
 
-  DrawMaskedBorder(fade_mask);
+  FadeSetEnterScreen();
 
-  FadeIn(fade_mask);
+  DrawChooseTree(&score_entry_current);
 }
 
-static int getHallOfFameFirstEntry(int first_entry, int step)
+static char *getHallOfFameRankText(int nr, int size)
 {
-  if (step == 0)
-    first_entry = scores.last_added - (NUM_MENU_ENTRIES_ON_SCREEN + 1) / 2 + 1;
-  else
-    first_entry += step;
+  static char rank_text[10];
+  boolean forced = (scores.force_last_added && nr == scores.last_added);
+  char *rank_text_raw = (forced ? "???" : int2str(nr + 1, size));
 
-  if (first_entry < 0)
-    first_entry = 0;
-  else if (first_entry > MAX_SCORE_ENTRIES - NUM_MENU_ENTRIES_ON_SCREEN)
-    first_entry = MAX(0, MAX_SCORE_ENTRIES - NUM_MENU_ENTRIES_ON_SCREEN);
+  sprintf(rank_text, "%s%s", rank_text_raw, (size > 0 || !forced ? "." : ""));
 
-  return first_entry;
+  return rank_text;
 }
 
-static char *getHallOfFameScoreText(int nr)
+static char *getHallOfFameTimeText(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;
@@ -5326,124 +5657,257 @@ static char *getHallOfFameScoreText(int nr)
   return score_text;
 }
 
-static void drawHallOfFameList(int level_nr, int first_entry)
+static char *getHallOfFameScoreText(int nr, int size)
 {
-  int i, j;
+  if (!level.rate_time_over_score)
+    return int2str(scores.entry[nr].score, size);	// show normal score
+  else if (level.use_step_counter)
+    return int2str(scores.entry[nr].time, size);	// show number of steps
+  else
+    return getHallOfFameTimeText(nr);			// show playing time
+}
 
-  SetMainBackgroundImage(IMG_BACKGROUND_SCORES);
-  ClearField();
+static void HandleHallOfFame_SelectLevel(int step, int direction)
+{
+  int old_level_nr = scores.last_level_nr;
+  int new_level_nr = old_level_nr + step * direction;
+
+  if (new_level_nr < leveldir_current->first_level)
+    new_level_nr = leveldir_current->first_level;
+  if (new_level_nr > leveldir_current->last_level)
+    new_level_nr = leveldir_current->last_level;
 
-  DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, "Hall Of Fame");
-  DrawTextFCentered(MENU_TITLE2_YPOS, FONT_TITLE_2,
-		    "HighScores of Level %d", level_nr);
+  if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
+    new_level_nr = leveldir_current->handicap_level;
 
-  for (i = 0; i < NUM_MENU_ENTRIES_ON_SCREEN; i++)
+  if (new_level_nr != old_level_nr)
   {
-    int entry = first_entry + i;
-    boolean active = (entry == scores.last_added);
-    boolean forced = (scores.force_last_added && active);
-    int font_nr1 = (active ? FONT_TEXT_1_ACTIVE : FONT_TEXT_1);
-    int font_nr2 = (active ? FONT_TEXT_2_ACTIVE : FONT_TEXT_2);
-    int font_nr3 = (active ? FONT_TEXT_3_ACTIVE : FONT_TEXT_3);
-    int font_nr4 = (active ? FONT_TEXT_4_ACTIVE : FONT_TEXT_4);
-    int dxoff = getFontDrawOffsetX(font_nr1);
-    int dx1 = 3 * getFontWidth(font_nr1);
-    int dx2 = dx1 + getFontWidth(font_nr1);
-    int dx3 = SXSIZE - 2 * (mSX - SX + dxoff) - 5 * getFontWidth(font_nr4);
-    int num_dots = (dx3 - dx2) / getFontWidth(font_nr3);
-    int sy = mSY + 64 + i * 32;
-    char *pos_text = (forced ? "???" : int2str(entry + 1, 3));
+    PlaySound(SND_MENU_ITEM_SELECTING);
 
-    DrawText(mSX, sy, pos_text, font_nr1);
-    DrawText(mSX + dx1, sy, ".", font_nr1);
+    scores.last_level_nr = level_nr = new_level_nr;
+    scores.last_entry_nr = 0;
 
-    for (j = 0; j < num_dots; j++)
-      DrawText(mSX + dx2 + j * getFontWidth(font_nr3), sy, ".", font_nr3);
+    LoadLevel(level_nr);
+    LoadLocalAndServerScore(level_nr, TRUE);
 
-    if (!strEqual(scores.entry[entry].name, EMPTY_PLAYER_NAME))
-      DrawText(mSX + dx2, sy, scores.entry[entry].name, font_nr2);
+    DrawHallOfFame_setScoreEntries();
 
-    DrawText(mSX + dx3, sy, getHallOfFameScoreText(entry), font_nr4);
-  }
+    if (game_status == GAME_MODE_SCORES)
+    {
+      // force remapping optional gadgets (especially scroll bar)
+      UnmapScreenTreeGadgets();
 
-  redraw_mask |= REDRAW_FIELD;
+      // redraw complete high score screen, as sub-title has changed
+      ClearField();
+
+      // redraw level selection buttons (which have just been erased)
+      RedrawScreenMenuGadgets(SCREEN_MASK_SCORES);
+
+      HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, &score_entry_current);
+    }
+    else
+    {
+      DrawScoreInfo_Content(scores.last_entry_nr);
+    }
+
+    SaveLevelSetup_SeriesInfo();
+  }
 }
 
 void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 {
-  static int level_nr = 0;
-  static int first_entry = 0;
-  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
-
-  if (button == MB_MENU_INITIALIZE)
-  {
-    level_nr = mx;
+  HandleChooseTree(mx, my, dx, dy, button, &score_entry_current);
+}
 
-    if (server_scores.updated)
-    {
-      // reload scores, using updated server score cache file
-      LoadLocalAndServerScore(level_nr, FALSE);
+static void DrawScoreInfo_Content(int entry_nr)
+{
+  struct ScoreEntry *entry = &scores.entry[entry_nr];
+  char *pos_text = getHallOfFameRankText(entry_nr, 0);
+  int font_title = MENU_INFO_FONT_TITLE;
+  int font_head  = MENU_INFO_FONT_HEAD;
+  int font_text  = MENU_INFO_FONT_TEXT;
+  int font_foot  = MENU_INFO_FONT_FOOT;
+  int spacing_title = menu.headline1_spacing[GAME_MODE_SCOREINFO];
+  int spacing_para  = menu.paragraph_spacing[GAME_MODE_SCOREINFO];
+  int spacing_line  = menu.line_spacing[GAME_MODE_SCOREINFO];
+  int xstep = getFontWidth(font_text);
+  int ystep_title = getMenuTextStep(spacing_title, font_title);
+  int ystep_para  = getMenuTextStep(spacing_para,  font_text);
+  int ystep_line  = getMenuTextStep(spacing_line,  font_text);
+  int ystart  = mSY - SY + menu.top_spacing[GAME_MODE_SCOREINFO];
+  int ybottom = mSY - SY + SYSIZE - menu.bottom_spacing[GAME_MODE_SCOREINFO];
+  int xstart1 = mSX - SX + 2 * xstep;
+  int xstart2 = mSX - SX + 13 * xstep;
+  int button_x = SX + xstart1;
+  int button_y1, button_y2;
+  int font_width = getFontWidth(font_text);
+  int font_height = getFontHeight(font_text);
+  int pad_left = xstart2;
+  int pad_right = MENU_SCREEN_INFO_SPACE_RIGHT;
+  int max_chars_per_line = (SXSIZE - pad_left - pad_right) / font_width;
+  int max_lines_per_text = 5;
+  int lines;
 
-      server_scores.updated = FALSE;
-    }
+  ClearField();
 
-    first_entry = getHallOfFameFirstEntry(0, 0);
+  // redraw score selection buttons (which have just been erased)
+  RedrawScreenMenuGadgets(SCREEN_MASK_SCORES);
 
-    drawHallOfFameList(level_nr, first_entry);
+  if (score_entries == NULL)
+  {
+    drawChooseTreeScreen_Scores_NotAvailable();
 
     return;
   }
 
-  if (ABS(dy) == SCROLL_PAGE)		// handle scrolling one page
-    step = NUM_MENU_ENTRIES_ON_SCREEN - 1;
+  drawChooseTreeHead(score_entries);
+  drawChooseTreeInfo(score_entries);
 
-  if (dy < 0)
-  {
-    first_entry = getHallOfFameFirstEntry(first_entry, -step);
+  DrawTextSCentered(ystart, font_title, "Score Information:");
+  ystart += ystep_title;
+
+  DrawTextF(xstart1, ystart, font_head, "Level Set");
+  lines = DrawTextBufferS(xstart2, ystart, leveldir_current->name, font_text,
+			  max_chars_per_line, -1, max_lines_per_text, 0, -1,
+			  TRUE, FALSE, FALSE);
+  ystart += ystep_line + (lines > 0 ? lines - 1 : 0) * font_height;
+
+  DrawTextF(xstart1, ystart, font_head, "Level");
+  lines = DrawTextBufferS(xstart2, ystart, level.name, font_text,
+			  max_chars_per_line, -1, max_lines_per_text, 0, -1,
+			  TRUE, FALSE, FALSE);
+  ystart += ystep_para + (lines > 0 ? lines - 1 : 0) * font_height;
+
+  button_y1 = SY + ystart;
+  ystart += graphic_info[IMG_MENU_BUTTON_PREV_SCORE].height;
+
+  DrawTextF(xstart1, ystart, font_head, "Rank");
+  DrawTextF(xstart2, ystart, font_text, pos_text);
+  ystart += ystep_line;
+
+  DrawTextF(xstart1, ystart, font_head, "Player");
+  DrawTextF(xstart2, ystart, font_text, entry->name);
+  ystart += ystep_line;
 
-    drawHallOfFameList(level_nr, first_entry);
+  if (level.use_step_counter)
+  {
+    DrawTextF(xstart1, ystart, font_head, "Steps");
+    DrawTextF(xstart2, ystart, font_text, int2str(entry->time, 5));
+    ystart += ystep_line;
   }
-  else if (dy > 0)
+  else
   {
-    first_entry = getHallOfFameFirstEntry(first_entry, step);
-
-    drawHallOfFameList(level_nr, first_entry);
+    DrawTextF(xstart1, ystart, font_head, "Time");
+    DrawTextF(xstart2, ystart, font_text, getHallOfFameTimeText(entry_nr));
+    ystart += ystep_line;
   }
-  else if (button == MB_MENU_LEAVE || button == MB_MENU_CHOICE)
+
+  if (!level.rate_time_over_score || entry->score > 0)
   {
-    PlaySound(SND_MENU_ITEM_SELECTING);
+    DrawTextF(xstart1, ystart, font_head, "Score");
+    DrawTextF(xstart2, ystart, font_text, int2str(entry->score, 5));
+    ystart += ystep_line;
+  }
 
-    FadeSound(SND_BACKGROUND_SCORES);
+  ystart += ystep_line;
 
-    if (button == MB_MENU_CHOICE &&
-	game_status_last_screen == GAME_MODE_PLAYING &&
-	setup.auto_play_next_level && setup.increment_levels &&
-	level_nr < leveldir_current->last_level &&
-	!network_playing)
-    {
-      StartGameActions(network.enabled, setup.autorecord, level.random_seed);
-    }
-    else
-    {
-      SetGameStatus(GAME_MODE_MAIN);
+  DrawTextF(xstart1, ystart, font_head, "Tape Date");
+  DrawTextF(xstart2, ystart, font_text, entry->tape_date);
+  ystart += ystep_line;
 
-      DrawMainMenu();
-    }
+  DrawTextF(xstart1, ystart, font_head, "Platform");
+  DrawTextF(xstart2, ystart, font_text, entry->platform);
+  ystart += ystep_line;
+
+  DrawTextF(xstart1, ystart, font_head, "Version");
+  DrawTextF(xstart2, ystart, font_text, entry->version);
+  ystart += ystep_line;
+
+  DrawTextF(xstart1, ystart, font_head, "Country");
+  lines = DrawTextBufferS(xstart2, ystart, entry->country_name, font_text,
+			  max_chars_per_line, -1, max_lines_per_text, 0, -1,
+			  TRUE, FALSE, FALSE);
+  ystart += ystep_line;
+
+  button_y2 = SY + ystart;
+
+  DrawTextSCentered(ybottom, font_foot, "Press any key or button to go back");
+
+  AdjustScoreInfoButtons(button_x, button_y1, button_y2);
+}
+
+static void DrawScoreInfo(int entry_nr)
+{
+  scores.last_entry_nr = entry_nr;
+
+  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_SCOREINFO);
+
+  UnmapAllGadgets();
+
+  FadeOut(REDRAW_FIELD);
+
+  DrawScoreInfo_Content(entry_nr);
+
+  // map gadgets for score info screen
+  MapScreenMenuGadgets(SCREEN_MASK_SCORES_INFO);
+
+  FadeIn(REDRAW_FIELD);
+}
+
+static void HandleScoreInfo_SelectScore(int step, int direction)
+{
+  int old_entry_nr = scores.last_entry_nr;
+  int new_entry_nr = old_entry_nr + step * direction;
+  int num_nodes = numTreeInfoInGroup(score_entry_current);
+  int num_entries = num_nodes - 1;	// score nodes only, without back link
+
+  if (new_entry_nr < 0)
+    new_entry_nr = 0;
+  if (new_entry_nr > num_entries - 1)
+    new_entry_nr = num_entries - 1;
+
+  if (new_entry_nr != old_entry_nr)
+  {
+    scores.last_entry_nr = new_entry_nr;
+
+    DrawScoreInfo_Content(new_entry_nr);
   }
-  else if (server_scores.updated)
+}
+
+void HandleScoreInfo(int mx, int my, int dx, int dy, int button)
+{
+  boolean button_action = (button == MB_MENU_LEAVE || button == MB_MENU_CHOICE);
+  boolean button_is_valid = (mx >= 0 && my >= 0);
+  boolean button_screen_clicked = (button_action && button_is_valid);
+
+  if (server_scores.updated)
   {
     // reload scores, using updated server score cache file
-    LoadLocalAndServerScore(level_nr, FALSE);
+    LoadLocalAndServerScore(scores.last_level_nr, FALSE);
 
     server_scores.updated = FALSE;
 
-    first_entry = getHallOfFameFirstEntry(0, 0);
+    DrawHallOfFame_setScoreEntries();
 
-    drawHallOfFameList(level_nr, first_entry);
+    DrawScoreInfo_Content(scores.last_entry_nr);
   }
 
-  if (game_status == GAME_MODE_SCORES)
-    PlayMenuSoundIfLoop();
+  if (button_screen_clicked)
+  {
+    PlaySound(SND_MENU_ITEM_SELECTING);
+
+    SetGameStatus(GAME_MODE_SCORES);
+
+    DrawHallOfFame(level_nr);
+  }
+  else if (dx)
+  {
+    HandleHallOfFame_SelectLevel(1, SIGN(dx) * (ABS(dx) > 1 ? 10 : 1));
+  }
+  else if (dy)
+  {
+    HandleScoreInfo_SelectScore(1, SIGN(dy) * (ABS(dy) > 1 ? 10 : 1));
+  }
 }
 
 
@@ -5462,6 +5926,7 @@ static char *vsync_mode_text;
 static char *scroll_delay_text;
 static char *snapshot_mode_text;
 static char *game_speed_text;
+static char *scores_type_text;
 static char *network_server_text;
 static char *graphics_set_name;
 static char *sounds_set_name;
@@ -5482,6 +5947,56 @@ static void execSetupMain(void)
   DrawSetupScreen();
 }
 
+static void execSetupGame_setScoresType(void)
+{
+  if (scores_types == NULL)
+  {
+    int i;
+
+    for (i = 0; scores_types_list[i].value != NULL; i++)
+    {
+      TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+      char identifier[32], name[32];
+      char *value = scores_types_list[i].value;
+      char *text = scores_types_list[i].text;
+
+      ti->node_top = &scores_types;
+      ti->sort_priority = i;
+
+      sprintf(identifier, "%s", value);
+      sprintf(name, "%s", text);
+
+      setString(&ti->identifier, identifier);
+      setString(&ti->name, name);
+      setString(&ti->name_sorting, name);
+      setString(&ti->infotext, STR_SETUP_CHOOSE_SCORES_TYPE);
+
+      pushTreeInfo(&scores_types, ti);
+    }
+
+    // sort scores type values to start with lowest scores type value
+    sortTreeInfo(&scores_types);
+
+    // set current scores type value to configured scores type value
+    scores_type_current =
+      getTreeInfoFromIdentifier(scores_types, setup.scores_in_highscore_list);
+
+    // if that fails, set current scores type to reliable default value
+    if (scores_type_current == NULL)
+      scores_type_current =
+	getTreeInfoFromIdentifier(scores_types, STR_SCORES_TYPE_DEFAULT);
+
+    // if that also fails, set current scores type to first available value
+    if (scores_type_current == NULL)
+      scores_type_current = scores_types;
+  }
+
+  setup.scores_in_highscore_list = scores_type_current->identifier;
+
+  // needed for displaying scores type text instead of identifier
+  scores_type_text = scores_type_current->name;
+}
+
 static void execSetupGame_setGameSpeeds(boolean update_value)
 {
   if (setup.game_speed_extended)
@@ -5675,6 +6190,7 @@ static void execSetupGame(void)
   boolean check_vsync_mode = (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED);
 
   execSetupGame_setGameSpeeds(FALSE);
+  execSetupGame_setScoresType();
   execSetupGame_setScrollDelays();
   execSetupGame_setSnapshotModes();
 
@@ -5692,6 +6208,13 @@ static void execSetupGame(void)
     DisableVsyncIfNeeded();
 }
 
+static void execSetupChooseScoresType(void)
+{
+  setup_mode = SETUP_MODE_CHOOSE_SCORES_TYPE;
+
+  DrawSetupScreen();
+}
+
 static void execSetupChooseGameSpeed(void)
 {
   setup_mode = SETUP_MODE_CHOOSE_GAME_SPEED;
@@ -6831,6 +7354,17 @@ static void ToggleGameSpeedsListIfNeeded(void)
   DrawSetupScreen();
 }
 
+static void ToggleUseApiServerIfNeeded(void)
+{
+  if (runtime.use_api_server == setup.use_api_server)
+    return;
+
+  runtime.use_api_server = setup.use_api_server;
+
+  if (runtime.use_api_server)
+    CheckApiServerTasks();
+}
+
 static void ModifyGameSpeedIfNeeded(void)
 {
   if (strEqual(setup.vsync_mode, STR_VSYNC_MODE_OFF) ||
@@ -6878,6 +7412,9 @@ static struct
   void *related_value;
 } hide_related_entry_list[] =
 {
+  { &setup.scores_in_highscore_list,	execSetupChooseScoresType	},
+  { &setup.scores_in_highscore_list,	&scores_type_text		},
+
   { &setup.game_frame_delay,		execSetupChooseGameSpeed	},
   { &setup.game_frame_delay,		&game_speed_text		},
 
@@ -6991,8 +7528,9 @@ static struct TokenInfo setup_info_game[] =
   { TYPE_TEXT_INPUT,	execGadgetNetworkServer, "Network Server Hostname:" },
   { TYPE_STRING,	&network_server_text,	""			},
   { TYPE_SWITCH,	&setup.use_api_server,	"Use Highscore Server:"	},
-  { TYPE_SWITCH,	&setup.only_show_local_scores, "Only Show Local Scores:" },
-  { TYPE_ENTER_LIST,	execOfferUploadTapes,	"Upload All Tapes to Server" },
+  { TYPE_ENTER_LIST,	execSetupChooseScoresType,"Scores in Highscore List:" },
+  { TYPE_STRING,	&scores_type_text,	""			},
+  { TYPE_ENTER_LIST,	execOfferUploadTapes,	"Upload Tapes to Server" },
   { TYPE_SWITCH,	&setup.multiple_users,	"Multiple Users/Teams:"	},
   { TYPE_YES_NO,	&setup.input_on_focus,	"Only Move Focussed Player:" },
   { TYPE_SWITCH,	&setup.time_limit,	"Time Limit:"		},
@@ -7006,6 +7544,7 @@ static struct TokenInfo setup_info_game[] =
   { 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_SWITCH,	&setup.auto_pause_on_start, "Start Game in Pause Mode:" },
   { TYPE_ENTER_LIST,	execSetupChooseGameSpeed, "Game Speed:"		},
   { TYPE_STRING,	&game_speed_text,	""			},
   { TYPE_SWITCH,	&setup.game_speed_extended, "Game Speed Extended List:" },
@@ -7253,6 +7792,10 @@ static struct TokenInfo setup_info_shortcuts_1[] =
   { TYPE_KEY,		&setup.shortcut.save_game, ""			},
   { TYPE_KEYTEXT,	NULL,		"Quick Load Game from Tape:",	},
   { TYPE_KEY,		&setup.shortcut.load_game, ""			},
+  { TYPE_KEYTEXT,	NULL,		"Restart Game:",		},
+  { TYPE_KEY,		&setup.shortcut.restart_game, ""		},
+  { TYPE_KEYTEXT,	NULL,		"Replay & Pause Before End:",	},
+  { TYPE_KEY,		&setup.shortcut.pause_before_end, ""		},
   { TYPE_KEYTEXT,	NULL,		"Start Game & Toggle Pause:",	},
   { TYPE_KEY,		&setup.shortcut.toggle_pause, ""		},
   { TYPE_EMPTY,		NULL,			""			},
@@ -7461,10 +8004,10 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
   if (scrollbar_needed && xpos > MENU_SCREEN_START_XPOS)
   {
     int max_menu_text_length = 26;	// maximum text length for classic menu
-    int font_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset;
+    int font_xoffset = getFontDrawOffsetX(font_nr);
     int text_startx = mSX + MENU_SCREEN_START_XPOS * 32;
     int text_font_nr = getMenuTextFont(FONT_MENU_2);
-    int text_font_xoffset = getFontBitmapInfo(text_font_nr)->draw_xoffset;
+    int text_font_xoffset = getFontDrawOffsetX(text_font_nr);
     int text_width = max_menu_text_length * getFontWidth(text_font_nr);
 
     if (startx + font_xoffset < text_startx + text_width + text_font_xoffset)
@@ -7487,11 +8030,11 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
 				    MENU_SCREEN_START_XPOS);
     int max_menu_text_length_medium = max_menu_text_length_big * 2;
     int check_font_nr = FONT_OPTION_ON; // known font that needs correction
-    int font1_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset;
-    int font2_xoffset = getFontBitmapInfo(check_font_nr)->draw_xoffset;
+    int font1_xoffset = getFontDrawOffsetX(font_nr);
+    int font2_xoffset = getFontDrawOffsetX(check_font_nr);
     int text_startx = mSX + MENU_SCREEN_START_XPOS * 32;
     int text_font_nr = getMenuTextFont(FONT_MENU_2);
-    int text_font_xoffset = getFontBitmapInfo(text_font_nr)->draw_xoffset;
+    int text_font_xoffset = getFontDrawOffsetX(text_font_nr);
     int text_width = max_menu_text_length_medium * getFontWidth(text_font_nr);
     boolean correct_font_draw_xoffset = FALSE;
 
@@ -7507,7 +8050,7 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw)
     // (this can happen for extreme/wrong values for font draw offset)
     if (correct_font_draw_xoffset)
     {
-      font_draw_xoffset_old = getFontBitmapInfo(font_nr)->draw_xoffset;
+      font_draw_xoffset_old = getFontDrawOffsetX(font_nr);
       font_draw_xoffset_modified = TRUE;
 
       if (type & TYPE_KEY)
@@ -7597,7 +8140,7 @@ static void changeSetupValue(int screen_pos, int setup_info_pos_raw, int dx)
 
   // API server mode may have changed at this point
   if (si->value == &setup.use_api_server)
-    runtime.use_api_server = setup.use_api_server;
+    ToggleUseApiServerIfNeeded();
 
   // game speed list may have changed at this point
   if (si->value == &setup.game_speed_extended)
@@ -9014,6 +9557,8 @@ void DrawSetupScreen(void)
 
   if (setup_mode == SETUP_MODE_INPUT)
     DrawSetupScreen_Input();
+  else if (setup_mode == SETUP_MODE_CHOOSE_SCORES_TYPE)
+    DrawChooseTree(&scores_type_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
     DrawChooseTree(&game_speed_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
@@ -9096,6 +9641,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button)
 {
   if (setup_mode == SETUP_MODE_INPUT)
     HandleSetupScreen_Input(mx, my, dx, dy, button);
+  else if (setup_mode == SETUP_MODE_CHOOSE_SCORES_TYPE)
+    HandleChooseTree(mx, my, dx, dy, button, &scores_type_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED)
     HandleChooseTree(mx, my, dx, dy, button, &game_speed_current);
   else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY)
@@ -9194,6 +9741,38 @@ static struct
     GD_EVENT_PRESSED | GD_EVENT_REPEATED,
     FALSE, "next level"
   },
+  {
+    IMG_MENU_BUTTON_PREV_LEVEL2, IMG_MENU_BUTTON_PREV_LEVEL2_ACTIVE,
+    &menu.scores.button.prev_level, NULL,
+    SCREEN_CTRL_ID_PREV_LEVEL2,
+    SCREEN_MASK_SCORES | SCREEN_MASK_SCORES_INFO,
+    GD_EVENT_PRESSED | GD_EVENT_REPEATED,
+    FALSE, "previous level"
+  },
+  {
+    IMG_MENU_BUTTON_NEXT_LEVEL2, IMG_MENU_BUTTON_NEXT_LEVEL2_ACTIVE,
+    &menu.scores.button.next_level, NULL,
+    SCREEN_CTRL_ID_NEXT_LEVEL2,
+    SCREEN_MASK_SCORES | SCREEN_MASK_SCORES_INFO,
+    GD_EVENT_PRESSED | GD_EVENT_REPEATED,
+    FALSE, "next level"
+  },
+  {
+    IMG_MENU_BUTTON_PREV_SCORE, IMG_MENU_BUTTON_PREV_SCORE_ACTIVE,
+    &menu.scores.button.prev_score, NULL,
+    SCREEN_CTRL_ID_PREV_SCORE,
+    SCREEN_MASK_SCORES_INFO,
+    GD_EVENT_PRESSED | GD_EVENT_REPEATED,
+    FALSE, "previous score"
+  },
+  {
+    IMG_MENU_BUTTON_NEXT_SCORE, IMG_MENU_BUTTON_NEXT_SCORE_ACTIVE,
+    &menu.scores.button.next_score, NULL,
+    SCREEN_CTRL_ID_NEXT_SCORE,
+    SCREEN_MASK_SCORES_INFO,
+    GD_EVENT_PRESSED | GD_EVENT_REPEATED,
+    FALSE, "next score"
+  },
   {
     IMG_MENU_BUTTON_FIRST_LEVEL, IMG_MENU_BUTTON_FIRST_LEVEL_ACTIVE,
     &menu.main.button.first_level, NULL,
@@ -9363,8 +9942,10 @@ static void CreateScreenMenubuttons(void)
   for (i = 0; i < NUM_SCREEN_MENUBUTTONS; i++)
   {
     struct MenuPosInfo *pos = menubutton_info[i].pos;
+    int screen_mask = menubutton_info[i].screen_mask;
     boolean is_touch_button = menubutton_info[i].is_touch_button;
     boolean is_check_button = menubutton_info[i].check_value != NULL;
+    boolean is_score_button = (screen_mask & SCREEN_MASK_SCORES_INFO);
     Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed;
     int gfx_unpressed, gfx_pressed;
     int x, y, width, height;
@@ -9412,6 +9993,22 @@ static void CreateScreenMenubuttons(void)
       checked = *menubutton_info[i].check_value;
     }
 
+    if (is_score_button)
+    {
+      // if x/y set to -1, dynamically place buttons next to title text
+      int title_width = getTextWidth(INFOTEXT_SCORE_ENTRY, FONT_TITLE_1);
+
+      if (pos->x == -1)
+	x = (id == SCREEN_CTRL_ID_PREV_LEVEL2 ?
+	     SX + (SXSIZE - title_width) / 2 - width * 3 / 2 :
+	     id == SCREEN_CTRL_ID_NEXT_LEVEL2 ?
+	     SX + (SXSIZE + title_width) / 2 + width / 2 : 0);
+
+      if (pos->y == -1)
+	y = (id == SCREEN_CTRL_ID_PREV_LEVEL2 ||
+	     id == SCREEN_CTRL_ID_NEXT_LEVEL2 ? mSY + MENU_TITLE1_YPOS : 0);
+    }
+
     gi = CreateGadget(GDI_CUSTOM_ID, id,
 		      GDI_CUSTOM_TYPE_ID, i,
 		      GDI_IMAGE_ID, gfx_unpressed,
@@ -9653,6 +10250,15 @@ void FreeScreenGadgets(void)
     FreeGadget(screen_gadget[i]);
 }
 
+static void RedrawScreenMenuGadgets(int screen_mask)
+{
+  int i;
+
+  for (i = 0; i < NUM_SCREEN_MENUBUTTONS; i++)
+    if (screen_mask & menubutton_info[i].screen_mask)
+      RedrawGadget(screen_gadget[menubutton_info[i].gadget_id]);
+}
+
 static void MapScreenMenuGadgets(int screen_mask)
 {
   int i;
@@ -9703,11 +10309,41 @@ static void MapScreenGadgets(int num_entries)
     MapGadget(screen_gadget[scrollbar_info[i].gadget_id]);
 }
 
+static void UnmapScreenGadgets()
+{
+  int i;
+
+  for (i = 0; i < NUM_SCREEN_SCROLLBUTTONS; i++)
+    UnmapGadget(screen_gadget[scrollbutton_info[i].gadget_id]);
+
+  for (i = 0; i < NUM_SCREEN_SCROLLBARS; i++)
+    UnmapGadget(screen_gadget[scrollbar_info[i].gadget_id]);
+}
+
 static void MapScreenTreeGadgets(TreeInfo *ti)
 {
   MapScreenGadgets(numTreeInfoInGroup(ti));
 }
 
+static void UnmapScreenTreeGadgets(void)
+{
+  UnmapScreenGadgets();
+}
+
+static void AdjustScoreInfoButtons(int x, int y1, int y2)
+{
+  struct GadgetInfo *gi_1 = screen_gadget[SCREEN_CTRL_ID_PREV_SCORE];
+  struct GadgetInfo *gi_2 = screen_gadget[SCREEN_CTRL_ID_NEXT_SCORE];
+  struct MenuPosInfo *pos_1 = menubutton_info[SCREEN_CTRL_ID_PREV_SCORE].pos;
+  struct MenuPosInfo *pos_2 = menubutton_info[SCREEN_CTRL_ID_NEXT_SCORE].pos;
+
+  if (pos_1->x == -1 && pos_1->y == -1)
+    ModifyGadget(gi_1, GDI_X, x, GDI_Y, y1, GDI_END);
+
+  if (pos_2->x == -1 && pos_2->y == -1)
+    ModifyGadget(gi_2, GDI_X, x, GDI_Y, y2, GDI_END);
+}
+
 static void HandleScreenGadgets(struct GadgetInfo *gi)
 {
   int id = gi->custom_id;
@@ -9726,6 +10362,22 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
       HandleMainMenu_SelectLevel(step, +1, NO_DIRECT_LEVEL_SELECT);
       break;
 
+    case SCREEN_CTRL_ID_PREV_LEVEL2:
+      HandleHallOfFame_SelectLevel(step, -1);
+      break;
+
+    case SCREEN_CTRL_ID_NEXT_LEVEL2:
+      HandleHallOfFame_SelectLevel(step, +1);
+      break;
+
+    case SCREEN_CTRL_ID_PREV_SCORE:
+      HandleScoreInfo_SelectScore(step, -1);
+      break;
+
+    case SCREEN_CTRL_ID_NEXT_SCORE:
+      HandleScoreInfo_SelectScore(step, +1);
+      break;
+
     case SCREEN_CTRL_ID_FIRST_LEVEL:
       HandleMainMenu_SelectLevel(MAX_LEVELS, -1, NO_DIRECT_LEVEL_SELECT);
       break;
@@ -9779,6 +10431,8 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
 	HandleSetupScreen(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
       else if (game_status == GAME_MODE_INFO)
 	HandleInfoScreen(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
+      else if (game_status == GAME_MODE_SCORES)
+	HandleHallOfFame(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK);
       break;
 
     case SCREEN_CTRL_ID_SCROLL_DOWN:
@@ -9792,6 +10446,8 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
 	HandleSetupScreen(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
       else if (game_status == GAME_MODE_INFO)
 	HandleInfoScreen(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
+      else if (game_status == GAME_MODE_SCORES)
+	HandleHallOfFame(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK);
       break;
 
     case SCREEN_CTRL_ID_SCROLL_VERTICAL:
@@ -9805,6 +10461,8 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
 	HandleSetupScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
       else if (game_status == GAME_MODE_INFO)
 	HandleInfoScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
+      else if (game_status == GAME_MODE_SCORES)
+	HandleHallOfFame(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
       break;
 
     case SCREEN_CTRL_ID_NETWORK_SERVER:
@@ -9984,7 +10642,9 @@ static int UploadTapes(void)
 
 static boolean OfferUploadTapes(void)
 {
-  if (!Request("Upload all your tapes to the high score server now?", REQ_ASK))
+  if (!Request(setup.has_remaining_tapes ?
+	       "Upload missing tapes to the high score server now?" :
+	       "Upload all your tapes to the high score server now?", REQ_ASK))
     return FALSE;
 
   int num_tapes_uploaded = UploadTapes();
@@ -9992,7 +10652,23 @@ static boolean OfferUploadTapes(void)
 
   if (num_tapes_uploaded < 0)
   {
-    Request("Cannot upload tapes to score server!", REQ_CONFIRM);
+    num_tapes_uploaded = -num_tapes_uploaded - 1;
+
+    if (num_tapes_uploaded == 0)
+      sprintf(message, "Upload failed! No tapes uploaded!");
+    else if (num_tapes_uploaded == 1)
+      sprintf(message, "Upload failed! Only 1 tape uploaded!");
+    else
+      sprintf(message, "Upload failed! Only %d tapes uploaded!",
+	      num_tapes_uploaded);
+
+    Request(message, REQ_CONFIRM);
+
+    // if uploading tapes failed, add tape upload entry to setup menu
+    setup.provide_uploading_tapes = TRUE;
+    setup.has_remaining_tapes = TRUE;
+
+    SaveSetup_ServerSetup();
 
     return FALSE;
   }
@@ -10006,26 +10682,38 @@ static boolean OfferUploadTapes(void)
 
   Request(message, REQ_CONFIRM);
 
+  if (num_tapes_uploaded > 0)
+    Request("New scores will be visible after a few minutes!", REQ_CONFIRM);
+
   // after all tapes have been uploaded, remove entry from setup menu
   setup.provide_uploading_tapes = FALSE;
+  setup.has_remaining_tapes = FALSE;
 
-  SaveSetup();
+  SaveSetup_ServerSetup();
 
   return TRUE;
 }
 
-void CheckUploadTapes(void)
+static void CheckUploadTapes(void)
 {
   if (!setup.ask_for_uploading_tapes)
     return;
 
+  // after asking for uploading tapes, do not ask again
+  setup.ask_for_uploading_tapes = FALSE;
+  setup.ask_for_remaining_tapes = FALSE;
+
   if (directoryExists(getTapeDir(NULL)))
   {
     boolean tapes_uploaded = OfferUploadTapes();
 
     if (!tapes_uploaded)
-      Request("You can upload your tapes from the setup menu later!",
+    {
+      Request(setup.has_remaining_tapes ?
+	      "You can upload missing tapes from the setup menu later!" :
+	      "You can upload your tapes from the setup menu later!",
 	      REQ_CONFIRM);
+    }
   }
   else
   {
@@ -10033,8 +10721,27 @@ void CheckUploadTapes(void)
     setup.provide_uploading_tapes = FALSE;
   }
 
-  // after asking for uploading all tapes once, do not ask again
-  setup.ask_for_uploading_tapes = FALSE;
+  SaveSetup_ServerSetup();
+}
 
-  SaveSetup();
+static void UpgradePlayerUUID(void)
+{
+  ApiResetUUIDAsThread(getUUID());
+}
+
+static void CheckUpgradePlayerUUID(void)
+{
+  if (setup.player_version > 1)
+    return;
+
+  UpgradePlayerUUID();
+}
+
+void CheckApiServerTasks(void)
+{
+  // check if the player's UUID has to be upgraded
+  CheckUpgradePlayerUUID();
+
+  // check if there are any tapes to be uploaded
+  CheckUploadTapes();
 }