X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=977ac133f826daf2044cd402e2617dec5c25b1e7;hb=6194c86e915d57678987f67daba966e477d124bc;hp=1e2bb5aec8a1274e93e8df93624d3e318e66f94f;hpb=30ecff429100d7b56f682de27b135480cd31ce0f;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 1e2bb5ae..977ac133 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -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"
@@ -182,16 +182,21 @@
 #define MENU_SCREEN_INFO_YSIZE		(MENU_SCREEN_INFO_YBOTTOM -	\
 					 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)
@@ -3012,8 +3017,8 @@ 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_YSTART;
@@ -5423,15 +5428,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];
@@ -5468,9 +5470,6 @@ static void DrawScoreInfo_Content(int entry_nr)
   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,
@@ -9816,6 +9815,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;
+	}
       }
     }