X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=bf495c1586ede1346c618dfd2c205cd6dca0ac6d;hb=2d3d2776f858d5b2132956373abd1ce5505c1501;hp=661c8cdb5cc4eba2081dc9d5e71abcc794fa0514;hpb=672ed29e8d8d5c6994489455539a29c4a0665551;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 661c8cdb..bf495c15 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" @@ -176,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) @@ -326,6 +328,10 @@ 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 int getInfoScreenBackgroundImage_Generic(void); +static int getInfoScreenBackgroundSound_Generic(void); +static int getInfoScreenBackgroundMusic_Generic(void); static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *); @@ -1560,10 +1566,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) @@ -2457,6 +2484,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) @@ -2972,13 +3071,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); @@ -2986,11 +3081,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); @@ -2998,13 +3092,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; @@ -3018,10 +3110,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; @@ -3093,9 +3181,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) @@ -3131,7 +3219,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; @@ -3178,6 +3266,8 @@ static void DrawInfoScreen_Elements(void) { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS); + FadeInfoSoundsAndMusic(); + FadeOut(REDRAW_FIELD); LoadHelpAnimInfo(); @@ -3185,6 +3275,8 @@ static void DrawInfoScreen_Elements(void) HandleInfoScreen_Elements(0, 0, MB_MENU_INITIALIZE); + PlayInfoSoundsAndMusic(); + FadeIn(REDRAW_FIELD); } @@ -3240,7 +3332,7 @@ void HandleInfoScreen_Elements(int dx, int dy, int button) if (page < 0 || page >= num_pages) { - FadeMenuSoundsAndMusic(); + FadeInfoSoundsAndMusic(); info_mode = INFO_MODE_MAIN; DrawInfoScreen(); @@ -3254,6 +3346,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) @@ -3265,7 +3360,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(); } } @@ -3276,7 +3371,8 @@ static void DrawInfoScreen_Music(void) FadeOut(REDRAW_FIELD); ClearField(); - DrawHeadline(); + + DrawInfoScreen_Headline(0, 1, TRUE); LoadMusicInfo(); @@ -3288,19 +3384,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) @@ -3308,7 +3415,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); @@ -3335,7 +3443,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) @@ -3357,7 +3468,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) { @@ -3367,8 +3479,6 @@ void HandleInfoScreen_Music(int dx, int dy, int button) PlaySoundLoop(sound); else PlaySound(sound); - - DrawTextSCentered(ystart, font_title, "The Game Background Sounds:"); } else { @@ -3378,19 +3488,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; @@ -3447,20 +3554,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; @@ -3473,13 +3577,13 @@ static void DrawInfoScreen_Version(void) SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION); + FadeInfoSoundsAndMusic(); + 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()); @@ -3612,6 +3716,8 @@ static void DrawInfoScreen_Version(void) DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_MENU); + PlayInfoSoundsAndMusic(); + FadeIn(REDRAW_FIELD); } @@ -3641,14 +3747,50 @@ void HandleInfoScreen_Version(int button) } } -static int getInfoScreenBackground_Generic(void) +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 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) : @@ -3658,29 +3800,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; @@ -3689,7 +3825,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); } @@ -3703,7 +3839,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) @@ -3738,20 +3874,21 @@ 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); } 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; @@ -3778,25 +3915,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."; } @@ -3804,11 +3942,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); @@ -3816,8 +3955,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) { @@ -3834,7 +3972,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(); @@ -3845,15 +3983,14 @@ 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); } } else { - PlayMenuSoundIfLoop(); + PlayInfoSoundIfLoop(); } } @@ -3875,11 +4012,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) @@ -4551,35 +4683,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; @@ -4621,9 +4724,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) { @@ -4636,31 +4736,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); } } @@ -5260,8 +5339,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) @@ -5399,15 +5476,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]; @@ -5434,19 +5508,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, @@ -9792,6 +9856,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; + } } }