fixed text length calculation bug
[rocksndiamonds.git] / src / screens.c
index 2edcdf52dbcf2493219ac5b2c1f85a6b44efbd6b..d6487970730ec7553b98f57605432f11ce681da4 100644 (file)
@@ -96,7 +96,7 @@
 #define STR_INFO_MAIN                  "Info Screen"
 #define STR_INFO_TITLE                 "Title Screen"
 #define STR_INFO_ELEMENTS              "Game Elements"
-#define STR_INFO_MUSIC                 "Game Music"
+#define STR_INFO_MUSIC                 "Music Info"
 #define STR_INFO_CREDITS               "Credits"
 #define STR_INFO_PROGRAM               "Program Info"
 #define STR_INFO_VERSION               "Version Info"
 #define MENU_SCREEN_INFO_SPACE_RIGHT   (menu.right_spacing_info[info_mode])
 #define MENU_SCREEN_INFO_SPACE_TOP     (menu.top_spacing_info[info_mode])
 #define MENU_SCREEN_INFO_SPACE_BOTTOM  (menu.bottom_spacing_info[info_mode])
-#define MENU_SCREEN_INFO_YSTART1       MENU_SCREEN_INFO_SPACE_TOP
-#define MENU_SCREEN_INFO_YSTART2       (MENU_SCREEN_INFO_YSTART1 +            \
-                                        getMenuTextStep(MENU_INFO_SPACE_HEAD, \
-                                                        MENU_INFO_FONT_TITLE))
+#define MENU_SCREEN_INFO_YSTART                MENU_SCREEN_INFO_SPACE_TOP
 #define MENU_SCREEN_INFO_YSTEP         (TILEY + 4)
 #define MENU_SCREEN_INFO_YBOTTOM       (SYSIZE - MENU_SCREEN_INFO_SPACE_BOTTOM)
 #define MENU_SCREEN_INFO_YSIZE         (MENU_SCREEN_INFO_YBOTTOM -     \
-                                        MENU_SCREEN_INFO_YSTART2 -     \
+                                        MENU_SCREEN_INFO_YSTART -      \
                                         TILEY / 2)
-#define MAX_INFO_ELEMENTS_ON_SCREEN    128
-#define STD_INFO_ELEMENTS_ON_SCREEN    (MENU_SCREEN_INFO_YSIZE /       \
+#define MAX_INFO_ELEMENTS_IN_ARRAY     128
+#define MAX_INFO_ELEMENTS_ON_SCREEN    (SYSIZE / TILEY)
+#define MAX_INFO_ELEMENTS              MIN(MAX_INFO_ELEMENTS_IN_ARRAY, \
+                                           MAX_INFO_ELEMENTS_ON_SCREEN)
+#define STD_INFO_ELEMENTS_ON_SCREEN    10
+#define DYN_INFO_ELEMENTS_ON_SCREEN    (MENU_SCREEN_INFO_YSIZE /       \
                                         MENU_SCREEN_INFO_YSTEP)
-#define NUM_INFO_ELEMENTS_FROM_CONF    \
+#define DEFAULT_INFO_ELEMENTS          MIN(STD_INFO_ELEMENTS_ON_SCREEN,\
+                                           DYN_INFO_ELEMENTS_ON_SCREEN)
+#define NUM_INFO_ELEMENTS_FROM_CONF                                    \
   (menu.list_size_info[GFX_SPECIAL_ARG_INFO_ELEMENTS] > 0 ?            \
    menu.list_size_info[GFX_SPECIAL_ARG_INFO_ELEMENTS] :                        \
-   MAX_MENU_ENTRIES_ON_SCREEN)
-#define NUM_INFO_ELEMENTS_ON_SCREEN    MIN(MIN(STD_INFO_ELEMENTS_ON_SCREEN, \
-                                                MAX_INFO_ELEMENTS_ON_SCREEN), \
-                                           NUM_INFO_ELEMENTS_FROM_CONF)
+   DEFAULT_INFO_ELEMENTS)
+#define NUM_INFO_ELEMENTS_ON_SCREEN    MIN(NUM_INFO_ELEMENTS_FROM_CONF,\
+                                           MAX_INFO_ELEMENTS)
 #define MAX_MENU_ENTRIES_ON_SCREEN     (SCR_FIELDY - MENU_SCREEN_START_YPOS)
 #define MAX_MENU_TEXT_LENGTH_BIG       13
 #define MAX_MENU_TEXT_LENGTH_MEDIUM    (MAX_MENU_TEXT_LENGTH_BIG * 2)
@@ -327,6 +329,9 @@ static void HandleHallOfFame_SelectLevel(int, int);
 static char *getHallOfFameRankText(int, int);
 static char *getHallOfFameScoreText(int, int);
 static char *getInfoScreenTitle_Generic(void);
+static int getInfoScreenBackgroundImage_Generic(void);
+static int getInfoScreenBackgroundSound_Generic(void);
+static int getInfoScreenBackgroundMusic_Generic(void);
 
 static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *);
 
@@ -1574,8 +1579,9 @@ static void DrawInfoScreen_Headline(int screen_nr, int num_screens,
   else
   {
     char *text_format = (use_global_screens ? "for %s" : "for \"%s\"");
+    int text_format_len = strlen(text_format) - strlen("%s");
     int max_text_len = SXSIZE / getFontWidth(FONT_TITLE_2);
-    int max_name_len = max_text_len - strlen(text_format) - strlen("%s");
+    int max_name_len = max_text_len - text_format_len;
     char name_cut[max_name_len];
     char *name_full = (use_global_screens ? getProgramTitleString() :
                       leveldir_current->name);
@@ -2479,6 +2485,78 @@ static struct TokenInfo setup_info_input[];
 
 static struct TokenInfo *menu_info;
 
+static void PlayInfoSound(void)
+{
+  int info_sound = getInfoScreenBackgroundSound_Generic();
+  char *next_sound = getSoundInfoEntryFilename(info_sound);
+
+  if (next_sound != NULL)
+    PlayMenuSoundExt(info_sound);
+  else
+    PlayMenuSound();
+}
+
+static void PlayInfoSoundIfLoop(void)
+{
+  int info_sound = getInfoScreenBackgroundSound_Generic();
+  char *next_sound = getSoundInfoEntryFilename(info_sound);
+
+  if (next_sound != NULL)
+    PlayMenuSoundIfLoopExt(info_sound);
+  else
+    PlayMenuSoundIfLoop();
+}
+
+static void PlayInfoMusic(void)
+{
+  int info_music = getInfoScreenBackgroundMusic_Generic();
+  char *curr_music = getCurrentlyPlayingMusicFilename();
+  char *next_music = getMusicInfoEntryFilename(info_music);
+
+  if (next_music != NULL)
+  {
+    // play music if info screen music differs from current music
+    if (!strEqual(curr_music, next_music))
+      PlayMenuMusicExt(info_music);
+  }
+  else
+  {
+    // only needed if info screen was directly invoked from main menu
+    PlayMenuMusic();
+  }
+}
+
+static void PlayInfoSoundsAndMusic(void)
+{
+  PlayInfoSound();
+  PlayInfoMusic();
+}
+
+static void FadeInfoSounds(void)
+{
+  FadeSounds();
+}
+
+static void FadeInfoMusic(void)
+{
+  int info_music = getInfoScreenBackgroundMusic_Generic();
+  char *curr_music = getCurrentlyPlayingMusicFilename();
+  char *next_music = getMusicInfoEntryFilename(info_music);
+
+  if (next_music != NULL)
+  {
+    // fade music if info screen music differs from current music
+    if (!strEqual(curr_music, next_music))
+      FadeMusic();
+  }
+}
+
+static void FadeInfoSoundsAndMusic(void)
+{
+  FadeInfoSounds();
+  FadeInfoMusic();
+}
+
 static void DrawCursorAndText_Menu_Ext(struct TokenInfo *token_info,
                                       int screen_pos, int menu_info_pos_raw,
                                       boolean active)
@@ -2996,7 +3074,7 @@ void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
 {
   int font_error = FONT_TEXT_2;
   int font_foot  = MENU_INFO_FONT_FOOT;
-  int ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+  int ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART;
   int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO);
@@ -3015,11 +3093,11 @@ void DrawInfoScreen_NotAvailable(char *text_title, char *text_error)
 
 void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init)
 {
-  static int infoscreen_step[MAX_INFO_ELEMENTS_ON_SCREEN];
-  static int infoscreen_frame[MAX_INFO_ELEMENTS_ON_SCREEN];
+  static int infoscreen_step[MAX_INFO_ELEMENTS_IN_ARRAY];
+  static int infoscreen_frame[MAX_INFO_ELEMENTS_IN_ARRAY];
   int font_foot = MENU_INFO_FONT_FOOT;
   int xstart = mSX + MENU_SCREEN_INFO_SPACE_LEFT;
-  int ystart = mSY + MENU_SCREEN_INFO_YSTART1;
+  int ystart = mSY + MENU_SCREEN_INFO_YSTART;
   int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
   int ystep = MENU_SCREEN_INFO_YSTEP;
   int element, action, direction;
@@ -3142,7 +3220,7 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos)
   int font_height = getFontHeight(font_nr);
   int yoffset = (TILEX - 2 * font_height) / 2;
   int xstart = mSX + MENU_SCREEN_INFO_SPACE_LEFT + TILEX + MINI_TILEX;
-  int ystart = mSY + MENU_SCREEN_INFO_YSTART1 + yoffset;
+  int ystart = mSY + MENU_SCREEN_INFO_YSTART + yoffset;
   int ystep = TILEY + 4;
   int pad_left = xstart - SX;
   int pad_right = MENU_SCREEN_INFO_SPACE_RIGHT;
@@ -3189,6 +3267,8 @@ static void DrawInfoScreen_Elements(void)
 {
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS);
 
+  FadeInfoSoundsAndMusic();
+
   FadeOut(REDRAW_FIELD);
 
   LoadHelpAnimInfo();
@@ -3196,6 +3276,8 @@ static void DrawInfoScreen_Elements(void)
 
   HandleInfoScreen_Elements(0, 0, MB_MENU_INITIALIZE);
 
+  PlayInfoSoundsAndMusic();
+
   FadeIn(REDRAW_FIELD);
 }
 
@@ -3251,7 +3333,7 @@ void HandleInfoScreen_Elements(int dx, int dy, int button)
 
     if (page < 0 || page >= num_pages)
     {
-      FadeMenuSoundsAndMusic();
+      FadeInfoSoundsAndMusic();
 
       info_mode = INFO_MODE_MAIN;
       DrawInfoScreen();
@@ -3279,7 +3361,7 @@ void HandleInfoScreen_Elements(int dx, int dy, int button)
       if (page < num_pages)
        DrawInfoScreen_HelpAnim(page * anims_per_page, num_anims, FALSE);
 
-    PlayMenuSoundIfLoop();
+    PlayInfoSoundIfLoop();
   }
 }
 
@@ -3311,7 +3393,7 @@ void HandleInfoScreen_Music(int dx, int dy, int button)
   int font_foot  = MENU_INFO_FONT_FOOT;
   int spacing_head = menu.headline2_spacing_info[info_mode];
   int ystep_head = getMenuTextStep(spacing_head,  font_head);
-  int ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+  int ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART;
   int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
 
   if (button == MB_MENU_INITIALIZE)
@@ -3483,7 +3565,7 @@ static void DrawInfoScreen_Version(void)
   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 ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART;
   int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
   int xstart1 = mSX - SX + 2 * xstep;
   int xstart2 = mSX - SX + 18 * xstep;
@@ -3496,6 +3578,8 @@ static void DrawInfoScreen_Version(void)
 
   SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION);
 
+  FadeInfoSoundsAndMusic();
+
   FadeOut(REDRAW_FIELD);
 
   ClearField();
@@ -3633,6 +3717,8 @@ static void DrawInfoScreen_Version(void)
 
   DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_MENU);
 
+  PlayInfoSoundsAndMusic();
+
   FadeIn(REDRAW_FIELD);
 }
 
@@ -3675,14 +3761,37 @@ static char *getInfoScreenTitle_Generic(void)
          "");
 }
 
-static int getInfoScreenBackground_Generic(void)
+static int getInfoScreenBackgroundImage_Generic(void)
 {
-  return (info_mode == INFO_MODE_CREDITS  ? IMG_BACKGROUND_INFO_CREDITS  :
+  return (info_mode == INFO_MODE_ELEMENTS ? IMG_BACKGROUND_INFO_ELEMENTS :
+         info_mode == INFO_MODE_MUSIC    ? IMG_BACKGROUND_INFO_MUSIC    :
+         info_mode == INFO_MODE_CREDITS  ? IMG_BACKGROUND_INFO_CREDITS  :
          info_mode == INFO_MODE_PROGRAM  ? IMG_BACKGROUND_INFO_PROGRAM  :
+         info_mode == INFO_MODE_VERSION  ? IMG_BACKGROUND_INFO_VERSION  :
          info_mode == INFO_MODE_LEVELSET ? IMG_BACKGROUND_INFO_LEVELSET :
          IMG_BACKGROUND_INFO);
 }
 
+static int getInfoScreenBackgroundSound_Generic(void)
+{
+  return (info_mode == INFO_MODE_ELEMENTS ? SND_BACKGROUND_INFO_ELEMENTS :
+         info_mode == INFO_MODE_CREDITS  ? SND_BACKGROUND_INFO_CREDITS  :
+         info_mode == INFO_MODE_PROGRAM  ? SND_BACKGROUND_INFO_PROGRAM  :
+         info_mode == INFO_MODE_VERSION  ? SND_BACKGROUND_INFO_VERSION  :
+         info_mode == INFO_MODE_LEVELSET ? SND_BACKGROUND_INFO_LEVELSET :
+         SND_BACKGROUND_INFO);
+}
+
+static int getInfoScreenBackgroundMusic_Generic(void)
+{
+  return (info_mode == INFO_MODE_ELEMENTS ? MUS_BACKGROUND_INFO_ELEMENTS :
+         info_mode == INFO_MODE_CREDITS  ? MUS_BACKGROUND_INFO_CREDITS  :
+         info_mode == INFO_MODE_PROGRAM  ? MUS_BACKGROUND_INFO_PROGRAM  :
+         info_mode == INFO_MODE_VERSION  ? MUS_BACKGROUND_INFO_VERSION  :
+         info_mode == INFO_MODE_LEVELSET ? MUS_BACKGROUND_INFO_LEVELSET :
+         MUS_BACKGROUND_INFO);
+}
+
 static char *getInfoScreenFilename_Generic(int nr, boolean global)
 {
   return (info_mode == INFO_MODE_CREDITS  ? getCreditsFilename(nr, global) :
@@ -3708,7 +3817,7 @@ static void DrawInfoScreen_GenericScreen(int screen_nr, int num_screens,
       info_mode == INFO_MODE_PROGRAM)
   {
     int width = SXSIZE;
-    int height = MENU_SCREEN_INFO_YBOTTOM - MENU_SCREEN_INFO_YSTART1;
+    int height = MENU_SCREEN_INFO_YBOTTOM - MENU_SCREEN_INFO_YSTART;
     int chars = width / getFontWidth(font_text);
     int lines = height / getFontHeight(font_text);
     int padx = (width - chars * getFontWidth(font_text)) / 2;
@@ -3717,7 +3826,7 @@ static void DrawInfoScreen_GenericScreen(int screen_nr, int num_screens,
     boolean centered = TRUE;
     boolean parse_comments = TRUE;
 
-    DrawTextFile(mSX + padx, mSY + MENU_SCREEN_INFO_YSTART1,
+    DrawTextFile(mSX + padx, mSY + MENU_SCREEN_INFO_YSTART,
                 filename, font_text, chars, -1, lines, line_spacing, -1,
                 autowrap, centered, parse_comments);
   }
@@ -3731,7 +3840,7 @@ static void DrawInfoScreen_GenericScreen(int screen_nr, int num_screens,
 
     // if y position set to "-1", use static default value
     if (tmi->y == -1)
-      tmi->y = MENU_SCREEN_INFO_YSTART1;
+      tmi->y = MENU_SCREEN_INFO_YSTART;
 
     // if width set to "-1", automatically determine by playfield width
     if (tmi->width == -1)
@@ -3766,14 +3875,16 @@ static void DrawInfoScreen_GenericScreen(int screen_nr, int num_screens,
 
 static void DrawInfoScreen_Generic(void)
 {
-  SetMainBackgroundImageIfDefined(getInfoScreenBackground_Generic());
+  SetMainBackgroundImageIfDefined(getInfoScreenBackgroundImage_Generic());
 
-  FadeMenuSoundsAndMusic();
+  FadeInfoSoundsAndMusic();
 
   FadeOut(REDRAW_FIELD);
 
   HandleInfoScreen_Generic(0, 0, MB_MENU_INITIALIZE);
 
+  PlayInfoSoundsAndMusic();
+
   FadeIn(REDRAW_FIELD);
 }
 
@@ -3832,7 +3943,7 @@ void HandleInfoScreen_Generic(int dx, int dy, int button)
     {
       int font_title = MENU_INFO_FONT_TITLE;
       int font_foot  = MENU_INFO_FONT_FOOT;
-      int ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART1;
+      int ystart  = mSY - SY + MENU_SCREEN_INFO_YSTART;
       int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM;
 
       ClearField();
@@ -3862,7 +3973,7 @@ void HandleInfoScreen_Generic(int dx, int dy, int button)
 
     if (screen_nr < 0 || screen_nr >= num_screens)
     {
-      FadeMenuSoundsAndMusic();
+      FadeInfoSoundsAndMusic();
 
       info_mode = INFO_MODE_MAIN;
       DrawInfoScreen();
@@ -3880,7 +3991,7 @@ void HandleInfoScreen_Generic(int dx, int dy, int button)
   }
   else
   {
-    PlayMenuSoundIfLoop();
+    PlayInfoSoundIfLoop();
   }
 }
 
@@ -3902,11 +4013,6 @@ static void DrawInfoScreen(void)
     DrawInfoScreen_Generic();
   else
     DrawInfoScreen_Main();
-
-  if (info_mode != INFO_MODE_MAIN &&
-      info_mode != INFO_MODE_TITLE &&
-      info_mode != INFO_MODE_MUSIC)
-    PlayMenuSoundsAndMusic();
 }
 
 void DrawInfoScreen_FromMainMenu(int nr)
@@ -4578,35 +4684,6 @@ static void drawChooseTreeScreen(TreeInfo *ti)
     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 = TEXT_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;
@@ -4648,9 +4725,6 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
   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)
   {
@@ -4663,31 +4737,10 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
       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();
-      }
+      ti = setHallOfFameActiveEntry(ti_ptr);
 
-      return;
+      if (button != MB_MENU_INITIALIZE)
+       drawChooseTreeScreen(ti);
     }
   }
 
@@ -5287,8 +5340,6 @@ static void DrawHallOfFame_setScoreEntries(void)
 
   if (score_entries != NULL && scores.continue_playing)
     setString(&score_entries->node_group->name, BACKLINK_TEXT_NEXT);
-
-  // ("score_entries" and "score_entry_current" may be NULL here)
 }
 
 void DrawHallOfFame(int nr)
@@ -5426,15 +5477,12 @@ static void DrawScoreInfo_Content(int entry_nr)
   struct ScoreEntry *entry = &scores.entry[entry_nr];
   char *pos_text = getHallOfFameRankText(entry_nr, 0);
   char *tape_date = getHallOfFameTapeDateText(entry);
-  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 xstart  = mSX - SX + menu.left_spacing[GAME_MODE_SCOREINFO];
@@ -5461,19 +5509,9 @@ static void DrawScoreInfo_Content(int entry_nr)
   // redraw level selection buttons (which have just been erased)
   RedrawScreenMenuGadgets(SCREEN_MASK_SCORES);
 
-  if (score_entries == NULL)
-  {
-    drawChooseTreeScreen_Scores_NotAvailable();
-
-    return;
-  }
-
   drawChooseTreeHead(score_entries);
   drawChooseTreeInfo(score_entries);
 
-  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,
@@ -9819,6 +9857,13 @@ static void CreateScreenMenubuttons(void)
        // special compatibility handling for "BD2K3" graphics set
        if (strPrefix(leveldir_current->identifier, "BD2K3"))
          x = SX + TILESIZE + MINI_TILESIZE;
+
+       // special compatibility handling for "jue0" graphics set
+       if (strPrefix(artwork.gfx_current_identifier, "jue0"))
+       {
+         x = SX + SXSIZE - 4 * TILESIZE;
+         y = SY + SYSIZE - 3 * TILESIZE;
+       }
       }
     }