X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=977ac133f826daf2044cd402e2617dec5c25b1e7;hb=6194c86e915d57678987f67daba966e477d124bc;hp=021dfcdc3fc046691115548736f33eff5a07d4d8;hpb=de580a24cb58b43281f0b2af3d4d6079d78fcb5d;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 021dfcdc..977ac133 100644 --- a/src/screens.c +++ b/src/screens.c @@ -92,6 +92,17 @@ #define MAX_MENU_MODES MAX(MAX_INFO_MODES, MAX_SETUP_MODES) +// info screen titles +#define STR_INFO_MAIN "Info Screen" +#define STR_INFO_TITLE "Title Screen" +#define STR_INFO_ELEMENTS "Game Elements" +#define STR_INFO_MUSIC "Music Info" +#define STR_INFO_CREDITS "Credits" +#define STR_INFO_PROGRAM "Program Info" +#define STR_INFO_VERSION "Version Info" +#define STR_INFO_LEVELSET "Level Set Info" +#define STR_INFO_EXIT "Exit" + // setup screen titles #define STR_SETUP_MAIN "Setup" #define STR_SETUP_GAME "Game & Menu" @@ -165,25 +176,27 @@ #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) @@ -203,20 +216,21 @@ #define SCREEN_CTRL_ID_NEXT_PLAYER 11 #define SCREEN_CTRL_ID_INSERT_SOLUTION 12 #define SCREEN_CTRL_ID_PLAY_SOLUTION 13 -#define SCREEN_CTRL_ID_SWITCH_ECS_AGA 14 -#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE 15 -#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE 16 -#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE2 17 -#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2 18 +#define SCREEN_CTRL_ID_LEVELSET_INFO 14 +#define SCREEN_CTRL_ID_SWITCH_ECS_AGA 15 +#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE 16 +#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE 17 +#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE2 18 +#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2 19 -#define NUM_SCREEN_MENUBUTTONS 19 +#define NUM_SCREEN_MENUBUTTONS 20 -#define SCREEN_CTRL_ID_SCROLL_UP 19 -#define SCREEN_CTRL_ID_SCROLL_DOWN 20 -#define SCREEN_CTRL_ID_SCROLL_VERTICAL 21 -#define SCREEN_CTRL_ID_NETWORK_SERVER 22 +#define SCREEN_CTRL_ID_SCROLL_UP 20 +#define SCREEN_CTRL_ID_SCROLL_DOWN 21 +#define SCREEN_CTRL_ID_SCROLL_VERTICAL 22 +#define SCREEN_CTRL_ID_NETWORK_SERVER 23 -#define NUM_SCREEN_GADGETS 23 +#define NUM_SCREEN_GADGETS 24 #define NUM_SCREEN_SCROLLBUTTONS 2 #define NUM_SCREEN_SCROLLBARS 1 @@ -224,11 +238,12 @@ #define SCREEN_MASK_MAIN (1 << 0) #define SCREEN_MASK_MAIN_HAS_SOLUTION (1 << 1) -#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) +#define SCREEN_MASK_MAIN_HAS_SET_INFO (1 << 2) +#define SCREEN_MASK_INPUT (1 << 3) +#define SCREEN_MASK_TOUCH (1 << 4) +#define SCREEN_MASK_TOUCH2 (1 << 5) +#define SCREEN_MASK_SCORES (1 << 6) +#define SCREEN_MASK_SCORES_INFO (1 << 7) // graphic position and size values for buttons and scrollbars #define SC_MENUBUTTON_XSIZE TILEX @@ -313,6 +328,7 @@ static void DrawHallOfFame_setScoreEntries(void); static void HandleHallOfFame_SelectLevel(int, int); static char *getHallOfFameRankText(int, int); static char *getHallOfFameScoreText(int, int); +static char *getInfoScreenTitle_Generic(void); static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *); @@ -923,6 +939,11 @@ static struct MainControlInfo main_controls[] = }; +static boolean hasLevelSetInfo(void) +{ + return (getLevelSetInfoFilename(0) != NULL); +} + static int getTitleScreenGraphic(int nr, boolean initial) { return (initial ? IMG_TITLESCREEN_INITIAL_1 : IMG_TITLESCREEN_1) + nr; @@ -1542,10 +1563,31 @@ static void drawChooseTreeEdit(int ypos_raw, boolean active) DrawText(sx, sy, STR_CHOOSE_TREE_EDIT, font_nr); } -static void DrawHeadline(void) +static void DrawInfoScreen_Headline(int screen_nr, int num_screens, + int use_global_screens) { - DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, main_text_title_1); - DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, main_text_title_2); + char *info_text_title_1 = getInfoScreenTitle_Generic(); + char info_text_title_2[MAX_LINE_LEN + 1]; + + if (num_screens > 1) + { + sprintf(info_text_title_2, "Page %d of %d", screen_nr + 1, num_screens); + } + else + { + char *text_format = (use_global_screens ? "for %s" : "for \"%s\""); + int max_text_len = SXSIZE / getFontWidth(FONT_TITLE_2); + int max_name_len = max_text_len - strlen(text_format) - strlen("%s"); + char name_cut[max_name_len]; + char *name_full = (use_global_screens ? getProgramTitleString() : + leveldir_current->name); + + snprintf(name_cut, max_name_len, "%s", name_full); + snprintf(info_text_title_2, max_text_len, text_format, name_cut); + } + + DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, info_text_title_1); + DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, info_text_title_2); } static void DrawTitleScreenImage(int nr, boolean initial) @@ -1809,6 +1851,7 @@ void DrawMainMenu(void) MapTapeButtons(); MapScreenMenuGadgets(SCREEN_MASK_MAIN); UpdateScreenMenuGadgets(SCREEN_MASK_MAIN_HAS_SOLUTION, hasSolutionTape()); + UpdateScreenMenuGadgets(SCREEN_MASK_MAIN_HAS_SET_INFO, hasLevelSetInfo()); // copy actual game door content to door double buffer for OpenDoor() BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0); @@ -2404,15 +2447,15 @@ static void execExitInfo(void) static struct TokenInfo info_info_main[] = { - { TYPE_ENTER_SCREEN, execInfoTitleScreen, "Title Screen" }, - { TYPE_ENTER_SCREEN, execInfoElements, "Elements Info" }, - { TYPE_ENTER_SCREEN, execInfoMusic, "Music Info" }, - { TYPE_ENTER_SCREEN, execInfoCredits, "Credits" }, - { TYPE_ENTER_SCREEN, execInfoProgram, "Program Info" }, - { TYPE_ENTER_SCREEN, execInfoVersion, "Version Info" }, - { TYPE_ENTER_SCREEN, execInfoLevelSet, "Level Set Info" }, + { TYPE_ENTER_SCREEN, execInfoTitleScreen, STR_INFO_TITLE }, + { TYPE_ENTER_SCREEN, execInfoElements, STR_INFO_ELEMENTS }, + { TYPE_ENTER_SCREEN, execInfoMusic, STR_INFO_MUSIC }, + { TYPE_ENTER_SCREEN, execInfoCredits, STR_INFO_CREDITS }, + { TYPE_ENTER_SCREEN, execInfoProgram, STR_INFO_PROGRAM }, + { TYPE_ENTER_SCREEN, execInfoVersion, STR_INFO_VERSION }, + { TYPE_ENTER_SCREEN, execInfoLevelSet, STR_INFO_LEVELSET }, { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execExitInfo, "Exit" }, + { TYPE_LEAVE_MENU, execExitInfo, STR_INFO_EXIT }, { 0, NULL, NULL } }; @@ -2582,7 +2625,7 @@ static void DrawInfoScreen_Main(void) OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); - DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Info Screen"); + DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, STR_INFO_MAIN); info_info = info_info_main; @@ -2953,13 +2996,9 @@ static int getMenuTextStep(int spacing_height, int font_nr) void DrawInfoScreen_NotAvailable(char *text_title, char *text_error) { - int font_title = MENU_INFO_FONT_TITLE; int font_error = FONT_TEXT_2; int font_foot = MENU_INFO_FONT_FOOT; - int spacing_title = menu.headline1_spacing_info[info_mode]; - int ystep_title = getMenuTextStep(spacing_title, font_title); - int ystart1 = mSY - SY + MENU_SCREEN_INFO_YSTART1; - int ystart2 = ystart1 + ystep_title; + int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART; int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO); @@ -2967,11 +3006,10 @@ void DrawInfoScreen_NotAvailable(char *text_title, char *text_error) FadeOut(REDRAW_FIELD); ClearField(); - DrawHeadline(); - DrawTextSCentered(ystart1, font_title, text_title); - DrawTextSCentered(ystart2, font_error, text_error); + DrawInfoScreen_Headline(0, 1, FALSE); + DrawTextSCentered(ystart, font_error, text_error); DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_MENU); FadeIn(REDRAW_FIELD); @@ -2979,13 +3017,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]; - int font_title = MENU_INFO_FONT_TITLE; - int font_foot = MENU_INFO_FONT_FOOT; - int xstart = mSX + MENU_SCREEN_INFO_SPACE_LEFT; - int ystart1 = mSY - SY + MENU_SCREEN_INFO_YSTART1; - int ystart2 = mSY + MENU_SCREEN_INFO_YSTART2; + 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; int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; int ystep = MENU_SCREEN_INFO_YSTEP; int element, action, direction; @@ -2999,10 +3035,6 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) for (i = 0; i < NUM_INFO_ELEMENTS_ON_SCREEN; i++) infoscreen_step[i] = infoscreen_frame[i] = 0; - ClearField(); - DrawHeadline(); - - DrawTextSCentered(ystart1, font_title, "The Game Elements:"); DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_PAGE); FrameCounter = 0; @@ -3074,9 +3106,9 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) j++; - ClearRectangleOnBackground(drawto, xstart, ystart2 + (i - start) * ystep, + ClearRectangleOnBackground(drawto, xstart, ystart + (i - start) * ystep, TILEX, TILEY); - DrawFixedGraphicAnimationExt(drawto, xstart, ystart2 + (i - start) * ystep, + DrawFixedGraphicAnimationExt(drawto, xstart, ystart + (i - start) * ystep, graphic, sync_frame, USE_MASKING); if (init) @@ -3112,7 +3144,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_YSTART2 + 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; @@ -3235,6 +3267,9 @@ void HandleInfoScreen_Elements(int dx, int dy, int button) if (button != MB_MENU_INITIALIZE) FadeOut(REDRAW_FIELD); + ClearField(); + + DrawInfoScreen_Headline(page, num_pages, TRUE); DrawInfoScreen_HelpAnim(page * anims_per_page, num_anims, TRUE); if (button != MB_MENU_INITIALIZE) @@ -3257,7 +3292,8 @@ static void DrawInfoScreen_Music(void) FadeOut(REDRAW_FIELD); ClearField(); - DrawHeadline(); + + DrawInfoScreen_Headline(0, 1, TRUE); LoadMusicInfo(); @@ -3269,19 +3305,30 @@ static void DrawInfoScreen_Music(void) void HandleInfoScreen_Music(int dx, int dy, int button) { static struct MusicFileInfo *list = NULL; + static int num_screens = 0; + static int screen_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_info[info_mode]; - int spacing_head = menu.headline2_spacing_info[info_mode]; - int ystep_title = getMenuTextStep(spacing_title, font_title); - int ystep_head = getMenuTextStep(spacing_head, font_head); - int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART1; + int spacing_head = menu.headline2_spacing_info[info_mode]; + int ystep_head = getMenuTextStep(spacing_head, font_head); + int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART; int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; if (button == MB_MENU_INITIALIZE) { + struct MusicFileInfo *list_ptr = music_file_info; + + num_screens = 0; + screen_nr = 0; + + while (list_ptr != NULL) + { + list_ptr = list_ptr->next; + num_screens++; + } + list = music_file_info; if (list == NULL) @@ -3289,7 +3336,8 @@ void HandleInfoScreen_Music(int dx, int dy, int button) FadeMenuSoundsAndMusic(); ClearField(); - DrawHeadline(); + + DrawInfoScreen_Headline(0, 1, TRUE); DrawTextSCentered(ystart, font_title, "No music info for this level set."); DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_MENU); @@ -3316,7 +3364,10 @@ void HandleInfoScreen_Music(int dx, int dy, int button) PlaySound(SND_MENU_ITEM_SELECTING); if (list != NULL) + { list = (dx < 0 ? list->prev : list->next); + screen_nr += (dx < 0 ? -1 : +1); + } } if (list == NULL) @@ -3338,7 +3389,8 @@ void HandleInfoScreen_Music(int dx, int dy, int button) FadeOut(REDRAW_FIELD); ClearField(); - DrawHeadline(); + + DrawInfoScreen_Headline(screen_nr, num_screens, TRUE); if (list->is_sound) { @@ -3348,8 +3400,6 @@ void HandleInfoScreen_Music(int dx, int dy, int button) PlaySoundLoop(sound); else PlaySound(sound); - - DrawTextSCentered(ystart, font_title, "The Game Background Sounds:"); } else { @@ -3359,19 +3409,16 @@ void HandleInfoScreen_Music(int dx, int dy, int button) PlayMusicLoop(music); else PlayMusic(music); - - DrawTextSCentered(ystart, font_title, "The Game Background Music:"); } - ystart += ystep_title; - if (!strEqual(list->title, UNKNOWN_NAME)) { if (!strEqual(list->title_header, UNKNOWN_NAME)) - { DrawTextSCentered(ystart, font_head, list->title_header); - ystart += ystep_head; - } + else + DrawTextSCentered(ystart, font_head, "Track"); + + ystart += ystep_head; DrawTextFCentered(ystart, font_text, "\"%s\"", list->title); ystart += ystep_head; @@ -3428,20 +3475,17 @@ void HandleInfoScreen_Music(int dx, int dy, int button) static void DrawInfoScreen_Version(void) { - 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 font_head = MENU_INFO_FONT_HEAD; + int font_text = MENU_INFO_FONT_TEXT; + int font_foot = MENU_INFO_FONT_FOOT; + 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 xstep = getFontWidth(font_text); - 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 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_YSTART; int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; int xstart1 = mSX - SX + 2 * xstep; int xstart2 = mSX - SX + 18 * xstep; @@ -3457,10 +3501,8 @@ static void DrawInfoScreen_Version(void) FadeOut(REDRAW_FIELD); ClearField(); - DrawHeadline(); - DrawTextSCentered(ystart, font_title, "Version Information:"); - ystart += ystep_title; + DrawInfoScreen_Headline(0, 1, TRUE); DrawTextF(xstart1, ystart, font_head, "Name"); DrawTextF(xstart2, ystart, font_text, getProgramTitleString()); @@ -3622,6 +3664,19 @@ void HandleInfoScreen_Version(int button) } } +static char *getInfoScreenTitle_Generic(void) +{ + return (info_mode == INFO_MODE_MAIN ? STR_INFO_MAIN : + info_mode == INFO_MODE_TITLE ? STR_INFO_TITLE : + info_mode == INFO_MODE_ELEMENTS ? STR_INFO_ELEMENTS : + info_mode == INFO_MODE_MUSIC ? STR_INFO_MUSIC : + info_mode == INFO_MODE_CREDITS ? STR_INFO_CREDITS : + info_mode == INFO_MODE_PROGRAM ? STR_INFO_PROGRAM : + info_mode == INFO_MODE_VERSION ? STR_INFO_VERSION : + info_mode == INFO_MODE_LEVELSET ? STR_INFO_LEVELSET : + ""); +} + static int getInfoScreenBackground_Generic(void) { return (info_mode == INFO_MODE_CREDITS ? IMG_BACKGROUND_INFO_CREDITS : @@ -3639,29 +3694,23 @@ static char *getInfoScreenFilename_Generic(int nr, boolean global) } static void DrawInfoScreen_GenericScreen(int screen_nr, int num_screens, - int use_global_screens, - char *text_title) + int use_global_screens) { char *filename = getInfoScreenFilename_Generic(screen_nr, use_global_screens); - int font_title = MENU_INFO_FONT_TITLE; - 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_line = menu.line_spacing_info[info_mode]; - int ystep_title = getMenuTextStep(spacing_title, font_title); - int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART1; + int font_text = MENU_INFO_FONT_TEXT; + int font_foot = MENU_INFO_FONT_FOOT; + int spacing_line = menu.line_spacing_info[info_mode]; int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; ClearField(); - DrawHeadline(); - DrawTextSCentered(ystart, font_title, text_title); + DrawInfoScreen_Headline(screen_nr, num_screens, use_global_screens); if (info_mode == INFO_MODE_CREDITS || 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; @@ -3670,7 +3719,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 + ystep_title, + DrawTextFile(mSX + padx, mSY + MENU_SCREEN_INFO_YSTART, filename, font_text, chars, -1, lines, line_spacing, -1, autowrap, centered, parse_comments); } @@ -3684,7 +3733,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 = 150; + tmi->y = MENU_SCREEN_INFO_YSTART; // if width set to "-1", automatically determine by playfield width if (tmi->width == -1) @@ -3732,7 +3781,6 @@ static void DrawInfoScreen_Generic(void) void HandleInfoScreen_Generic(int dx, int dy, int button) { - static char *text_title = ""; static char *text_no_info = ""; static int num_screens = 0; static int screen_nr = 0; @@ -3759,25 +3807,26 @@ void HandleInfoScreen_Generic(int dx, int dy, int button) break; } - text_title = "Credits:"; - text_no_info = "No credits for this level set."; + text_no_info = "No credits available."; } else if (info_mode == INFO_MODE_PROGRAM) { + use_global_screens = TRUE; + // determine number of program info screens while (getProgramInfoFilename(num_screens) != NULL) num_screens++; - text_title = "Program Information:"; text_no_info = "No program info available."; } else if (info_mode == INFO_MODE_LEVELSET) { + use_global_screens = FALSE; + // determine number of levelset info screens while (getLevelSetInfoFilename(num_screens) != NULL) num_screens++; - text_title = "Level Set Information:"; text_no_info = "No level set info available."; } @@ -3785,11 +3834,12 @@ 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(); - DrawHeadline(); + + DrawInfoScreen_Headline(screen_nr, num_screens, use_global_screens); DrawTextSCentered(ystart, font_title, text_no_info); DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_MENU); @@ -3797,8 +3847,7 @@ void HandleInfoScreen_Generic(int dx, int dy, int button) return; } - DrawInfoScreen_GenericScreen(screen_nr, num_screens, use_global_screens, - text_title); + DrawInfoScreen_GenericScreen(screen_nr, num_screens, use_global_screens); } else if (button == MB_MENU_LEAVE) { @@ -3826,8 +3875,7 @@ void HandleInfoScreen_Generic(int dx, int dy, int button) FadeOut(REDRAW_FIELD); - DrawInfoScreen_GenericScreen(screen_nr, num_screens, use_global_screens, - text_title); + DrawInfoScreen_GenericScreen(screen_nr, num_screens, use_global_screens); FadeIn(REDRAW_FIELD); } @@ -4547,7 +4595,7 @@ static void drawChooseTreeScreen_Scores_NotAvailable(void) 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 ystart1 = mSY - SY + MENU_SCREEN_INFO_YSTART; int ystart2 = ystart1 + ystep_title; int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; int ystart0 = MENU_TITLE2_YPOS; @@ -5380,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]; @@ -5425,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, @@ -9562,6 +9604,14 @@ static struct GD_EVENT_RELEASED, FALSE, "play solution tape" }, + { + IMG_MENU_BUTTON_LEVELSET_INFO, IMG_MENU_BUTTON_LEVELSET_INFO_ACTIVE, + &menu.main.button.levelset_info, NULL, + SCREEN_CTRL_ID_LEVELSET_INFO, + SCREEN_MASK_MAIN_HAS_SET_INFO, + GD_EVENT_RELEASED, + FALSE, "show level set info" + }, { IMG_MENU_BUTTON_SWITCH_ECS_AGA, IMG_MENU_BUTTON_SWITCH_ECS_AGA_ACTIVE, &menu.main.button.switch_ecs_aga, &setup.prefer_aga_graphics, @@ -9754,6 +9804,27 @@ static void CreateScreenMenubuttons(void) id == SCREEN_CTRL_ID_NEXT_LEVEL2 ? mSY + MENU_TITLE1_YPOS : 0); } + if (id == SCREEN_CTRL_ID_LEVELSET_INFO) + { + if (pos->x == -1 && pos->y == -1) + { + // use "SX" here to place button (ignore draw offsets) + x = SX + SXSIZE - 2 * TILESIZE; + y = SY + SYSIZE - 2 * TILESIZE; + + // 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; + } + } + } + gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, GDI_IMAGE_ID, gfx_unpressed, @@ -10170,6 +10241,10 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) PlaySolutionTape(); break; + case SCREEN_CTRL_ID_LEVELSET_INFO: + DrawInfoScreen_FromMainMenu(INFO_MODE_LEVELSET); + break; + case SCREEN_CTRL_ID_SWITCH_ECS_AGA: setup.prefer_aga_graphics = !setup.prefer_aga_graphics; DrawMainMenu();