X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=0eb3a87e06c2b3bdf9a429e16e5f6f95e2587406;hb=HEAD;hp=a3f9de148b4dbd348b5ef384ce811dcf759d7b70;hpb=66b7cdb08e8e6ee4051176997f873c491fbc532c;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index a3f9de14..fc344373 100644 --- a/src/screens.c +++ b/src/screens.c @@ -22,6 +22,7 @@ #include "network.h" #include "init.h" #include "config.h" +#include "api.h" #define DEBUG_JOYSTICKS 0 @@ -91,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" @@ -130,6 +142,12 @@ #define MENU_CHOOSE_TREE_FONT(x) (FONT_TEXT_1 + (x)) #define MENU_CHOOSE_TREE_COLOR(ti, a) TREE_COLOR(ti, a) +#define TEXT_MAIN_MENU "Press any key or button for main menu" +#define TEXT_INFO_MENU "Press any key or button for info menu" +#define TEXT_NEXT_PAGE "Press any key or button for next page" +#define TEXT_NEXT_MENU (info_screens_from_main ? \ + TEXT_MAIN_MENU : TEXT_INFO_MENU) + // for input setup functions #define SETUPINPUT_SCREEN_POS_START 0 #define SETUPINPUT_SCREEN_POS_EMPTY1 3 @@ -155,28 +173,40 @@ #define MENU_INFO_FONT_FOOT FONT_TEXT_4 #define MENU_INFO_SPACE_HEAD (menu.headline2_spacing_info[info_mode]) #define MENU_SCREEN_INFO_SPACE_LEFT (menu.left_spacing_info[info_mode]) +#define MENU_SCREEN_INFO_SPACE_MIDDLE (menu.middle_spacing_info[info_mode]) #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_YSTEP (TILEY + 4) +#define MENU_SCREEN_INFO_SPACE_LINE (menu.line_spacing_info[info_mode]) +#define MENU_SCREEN_INFO_SPACE_EXTRA (menu.extra_spacing_info[info_mode]) +#define MENU_SCREEN_INFO_TILE_SIZE_RAW (menu.tile_size_info[info_mode]) +#define MENU_SCREEN_INFO_TILE_SIZE (MENU_SCREEN_INFO_TILE_SIZE_RAW > 0 ? \ + MENU_SCREEN_INFO_TILE_SIZE_RAW : TILEY) +#define MENU_SCREEN_INFO_ENTRY_SIZE_RAW (menu.list_entry_size_info[info_mode]) +#define MENU_SCREEN_INFO_ENTRY_SIZE (MAX(MENU_SCREEN_INFO_ENTRY_SIZE_RAW, \ + MENU_SCREEN_INFO_TILE_SIZE)) +#define MENU_SCREEN_INFO_YSTART MENU_SCREEN_INFO_SPACE_TOP +#define MENU_SCREEN_INFO_YSTEP (MENU_SCREEN_INFO_ENTRY_SIZE + \ + MENU_SCREEN_INFO_SPACE_EXTRA) #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) @@ -186,36 +216,44 @@ #define SCREEN_CTRL_ID_NEXT_LEVEL 1 #define SCREEN_CTRL_ID_PREV_LEVEL2 2 #define SCREEN_CTRL_ID_NEXT_LEVEL2 3 -#define SCREEN_CTRL_ID_FIRST_LEVEL 4 -#define SCREEN_CTRL_ID_LAST_LEVEL 5 -#define SCREEN_CTRL_ID_LEVEL_NUMBER 6 -#define SCREEN_CTRL_ID_PREV_PLAYER 7 -#define SCREEN_CTRL_ID_NEXT_PLAYER 8 -#define SCREEN_CTRL_ID_INSERT_SOLUTION 9 -#define SCREEN_CTRL_ID_PLAY_SOLUTION 10 -#define SCREEN_CTRL_ID_SWITCH_ECS_AGA 11 -#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE 12 -#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE 13 -#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE2 14 -#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2 15 -#define SCREEN_CTRL_ID_SCROLL_UP 16 -#define SCREEN_CTRL_ID_SCROLL_DOWN 17 -#define SCREEN_CTRL_ID_SCROLL_VERTICAL 18 -#define SCREEN_CTRL_ID_NETWORK_SERVER 19 - -#define NUM_SCREEN_GADGETS 20 - -#define NUM_SCREEN_MENUBUTTONS 16 +#define SCREEN_CTRL_ID_PREV_SCORE 4 +#define SCREEN_CTRL_ID_NEXT_SCORE 5 +#define SCREEN_CTRL_ID_PLAY_TAPE 6 +#define SCREEN_CTRL_ID_FIRST_LEVEL 7 +#define SCREEN_CTRL_ID_LAST_LEVEL 8 +#define SCREEN_CTRL_ID_LEVEL_NUMBER 9 +#define SCREEN_CTRL_ID_PREV_PLAYER 10 +#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_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 20 + +#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 24 + #define NUM_SCREEN_SCROLLBUTTONS 2 #define NUM_SCREEN_SCROLLBARS 1 #define NUM_SCREEN_TEXTINPUT 1 #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_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 @@ -263,6 +301,7 @@ 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); @@ -271,12 +310,11 @@ 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_Program(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_Version(int); +static void HandleInfoScreen_Generic(int, int, int); static void ModifyGameSpeedIfNeeded(void); static void DisableVsyncIfNeeded(void); @@ -290,21 +328,30 @@ static void MapScreenTreeGadgets(TreeInfo *); static void UnmapScreenTreeGadgets(void); static void UpdateScreenMenuGadgets(int, boolean); +static void AdjustScoreInfoButtons_SelectScore(int, int, int); +static void AdjustScoreInfoButtons_PlayTape(int, int, boolean); static boolean OfferUploadTapes(void); static void execOfferUploadTapes(void); static void DrawHallOfFame_setScoreEntries(void); static void HandleHallOfFame_SelectLevel(int, int); -static void HandleHallOfFame_SelectLevelOrScore(int, int); -static char *getHallOfFameRankText(int); -static char *getHallOfFameScoreText(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 *); static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS]; static int info_mode = INFO_MODE_MAIN; static int setup_mode = SETUP_MODE_MAIN; +static boolean info_screens_from_main = FALSE; + static TreeInfo *window_sizes = NULL; static TreeInfo *window_size_current = NULL; @@ -677,6 +724,7 @@ struct TitleControlInfo struct TitleControlInfo title_controls[MAX_NUM_TITLE_SCREENS]; + // main menu display and control definitions #define MAIN_CONTROL_NAME 0 @@ -904,6 +952,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; @@ -1432,6 +1485,11 @@ static void clearMenuListArea(void) // clear menu list area, but not title or scrollbar DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32, scrollbar_xpos - mSX, NUM_MENU_ENTRIES_ON_SCREEN * 32); + + // special compatibility handling for "Snake Bite" graphics set + if (strPrefix(leveldir_current->identifier, "snake_bite")) + ClearRectangle(drawto, mSX, mSY + MENU_SCREEN_START_YPOS * 32, + scrollbar_xpos - mSX, NUM_MENU_ENTRIES_ON_SCREEN * 32); } static void drawCursorExt(int xpos, int ypos, boolean active, int graphic) @@ -1500,6 +1558,15 @@ static int getChooseTreeEditYPos(int ypos_raw) return sy; } +static int getChooseTreeEditXPosReal(int pos) +{ + int xpos = getChooseTreeEditXPos(pos); + int font_nr = getChooseTreeEditFont(FALSE); + int font_xoffset = getFontDrawOffsetX(font_nr); + + return xpos + font_xoffset; +} + static void drawChooseTreeEdit(int ypos_raw, boolean active) { int sx = getChooseTreeEditXPos(POS_LEFT); @@ -1509,16 +1576,39 @@ 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 text_format_len = strlen(text_format) - strlen("%s"); + int max_text_len = SXSIZE / getFontWidth(FONT_TITLE_2); + 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); + + 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) { int graphic = getTitleScreenGraphic(nr, initial); Bitmap *bitmap = graphic_info[graphic].bitmap; + int draw_masked = graphic_info[graphic].draw_masked; int width = graphic_info[graphic].width; int height = graphic_info[graphic].height; int src_x = graphic_info[graphic].src_x; @@ -1551,7 +1641,7 @@ static void DrawTitleScreenImage(int nr, boolean initial) ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE); - if (DrawingOnBackground(dst_x, dst_y)) + if (DrawingOnBackground(dst_x, dst_y) && draw_masked) BlitBitmapMasked(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y); else BlitBitmap(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y); @@ -1669,11 +1759,31 @@ void DrawMainMenu(void) return; } + // needed if last screen was the playing screen, invoked from hall of fame + if (score_info_tape_play) + { + CloseDoor(DOOR_CLOSE_ALL); + + SetGameStatus(GAME_MODE_SCOREINFO); + + DrawScoreInfo(scores.last_entry_nr); + + return; + } + + // reset flag to continue playing next level from hall of fame + scores.continue_playing = FALSE; + // leveldir_current may be invalid (level group, parent link, node copy) leveldir_current = getValidLevelSeries(leveldir_current, leveldir_last_valid); if (leveldir_current != leveldir_last_valid) { + // level setup config may have been loaded to "last played" tree node copy, + // but "leveldir_current" now points to the "original" level set tree node, + // in which case "handicap_level" may still default to the first level + LoadLevelSetup_SeriesInfo(); + UpdateLastPlayedLevels_TreeInfo(); levelset_has_changed = TRUE; @@ -1682,7 +1792,8 @@ void DrawMainMenu(void) // store valid level series information leveldir_last_valid = leveldir_current; - init_last = init; // switch to new busy animation + // store first level of this level set for "level_nr" style animations + SetAnimationFirstLevel(leveldir_current->first_level); // needed if last screen (level choice) changed graphics, sounds or music ReloadCustomArtwork(0); @@ -1758,6 +1869,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); @@ -1819,7 +1931,7 @@ static unsigned int getAutoDelayCounter(struct TitleFadingInfo *fi) static boolean TitleAutoDelayReached(unsigned int *counter_var, struct TitleFadingInfo *fi) { - return DelayReachedExt(counter_var, fi->auto_delay, getAutoDelayCounter(fi)); + return DelayReachedExt2(counter_var, fi->auto_delay, getAutoDelayCounter(fi)); } static void ResetTitleAutoDelay(unsigned int *counter_var, @@ -1914,7 +2026,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) { @@ -1927,9 +2039,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]; @@ -2029,7 +2142,7 @@ static void HandleMainMenu_SelectLevel(int step, int direction, { // skipping levels is only allowed when trying to skip single level if (setup.skip_levels && new_level_nr == old_level_nr + 1 && - Request("Level still unsolved! Skip despite handicap?", REQ_ASK)) + Request("Level still unsolved! Skip it anyway?", REQ_ASK)) { leveldir_current->handicap_level++; SaveLevelSetup_SeriesInfo(); @@ -2352,15 +2465,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 } }; @@ -2386,6 +2499,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) @@ -2490,6 +2675,18 @@ static void DrawInfoScreen_Main(void) int fade_mask = REDRAW_FIELD; int i; + // (needed after displaying info sub-screens directly from main menu) + if (info_screens_from_main) + { + info_screens_from_main = FALSE; + + SetGameStatus(GAME_MODE_MAIN); + + DrawMainMenu(); + + return; + } + if (redraw_mask & REDRAW_ALL) fade_mask = REDRAW_ALL; @@ -2518,10 +2715,13 @@ 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; + // use modified info screen info without info screen entries marked as hidden + info_info = getSetupInfoFinal(info_info); + // determine maximal number of info entries that can be displayed on screen num_info_info = 0; for (i = 0; info_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) @@ -2884,15 +3084,23 @@ static int getMenuTextStep(int spacing_height, int font_nr) return getFontHeight(font_nr) + getMenuTextSpacing(spacing_height, font_nr); } +static int getHeadlineSpacing(void) +{ + // special compatibility handling for "R'n'D jue 2022" game editions + int spacing_check = menu.headline1_spacing[GAME_MODE_SCOREINFO]; + int spacing = (game_status == GAME_MODE_SCOREINFO ? + menu.headline1_spacing[GAME_MODE_SCOREINFO] : + menu.headline1_spacing_info[info_mode]); + int font = MENU_INFO_FONT_TITLE; + + return (spacing_check != -2 ? getMenuTextStep(spacing, font) : 0); +} + 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 + getHeadlineSpacing(); int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO); @@ -2900,28 +3108,27 @@ 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(ybottom, font_foot, - "Press any key or button for info menu"); + DrawTextSCentered(ystart, font_error, text_error); + DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_MENU); FadeIn(REDRAW_FIELD); } 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 + getHeadlineSpacing(); int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; int ystep = MENU_SCREEN_INFO_YSTEP; + int row_height = MENU_SCREEN_INFO_ENTRY_SIZE; + int tilesize = MENU_SCREEN_INFO_TILE_SIZE; + int yoffset = (row_height - tilesize) / 2; int element, action, direction; int graphic; int delay; @@ -2933,13 +3140,7 @@ 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, - "Press any key or button for next page"); + DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_PAGE); FrameCounter = 0; } @@ -2961,7 +3162,10 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) continue; } - j += infoscreen_step[i - start]; + int ypos = i - start; + int ystart_pos = ystart + ypos * ystep + yoffset; + + j += infoscreen_step[ypos]; element = helpanim_info[j].element; action = helpanim_info[j].action; @@ -2984,39 +3188,38 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) if (delay == -1) delay = 1000000; - if (infoscreen_frame[i - start] == 0) + if (infoscreen_frame[ypos] == 0) { sync_frame = 0; - infoscreen_frame[i - start] = delay - 1; + infoscreen_frame[ypos] = delay - 1; } else { - sync_frame = delay - infoscreen_frame[i - start]; - infoscreen_frame[i - start]--; + sync_frame = delay - infoscreen_frame[ypos]; + infoscreen_frame[ypos]--; } if (helpanim_info[j].element == HELPANIM_LIST_NEXT) { - if (!infoscreen_frame[i - start]) - infoscreen_step[i - start] = 0; + if (!infoscreen_frame[ypos]) + infoscreen_step[ypos] = 0; } else { - if (!infoscreen_frame[i - start]) - infoscreen_step[i - start]++; + if (!infoscreen_frame[ypos]) + infoscreen_step[ypos]++; while (helpanim_info[j].element != HELPANIM_LIST_NEXT) j++; } j++; - ClearRectangleOnBackground(drawto, xstart, ystart2 + (i - start) * ystep, - TILEX, TILEY); - DrawFixedGraphicAnimationExt(drawto, xstart, ystart2 + (i - start) * ystep, - graphic, sync_frame, USE_MASKING); + ClearRectangleOnBackground(drawto, xstart, ystart_pos, tilesize, tilesize); + DrawSizedGraphicAnimationExt(drawto, xstart, ystart_pos, + graphic, sync_frame, tilesize, USE_MASKING); if (init) - DrawInfoScreen_HelpText(element, action, direction, i - start); + DrawInfoScreen_HelpText(element, action, direction, ypos); i++; } @@ -3046,15 +3249,24 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos) int font_nr = FONT_INFO_ELEMENTS; int font_width = getFontWidth(font_nr); 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 ystep = TILEY + 4; + int line_spacing = MENU_SCREEN_INFO_SPACE_LINE; + int left_spacing = MENU_SCREEN_INFO_SPACE_LEFT; + int middle_spacing = MENU_SCREEN_INFO_SPACE_MIDDLE; + int right_spacing = MENU_SCREEN_INFO_SPACE_RIGHT; + int line_height = font_height + line_spacing; + int row_height = MENU_SCREEN_INFO_ENTRY_SIZE; + int tilesize = MENU_SCREEN_INFO_TILE_SIZE; + int xstart = mSX + left_spacing + tilesize + middle_spacing; + int ystart = mSY + MENU_SCREEN_INFO_YSTART + getHeadlineSpacing(); + int ystep = MENU_SCREEN_INFO_YSTEP; int pad_left = xstart - SX; - int pad_right = MENU_SCREEN_INFO_SPACE_RIGHT; + int pad_right = right_spacing; int max_chars_per_line = (SXSIZE - pad_left - pad_right) / font_width; - int max_lines_per_text = 2; + int max_lines_per_text = (row_height + line_spacing) / line_height; char *text = NULL; + boolean autowrap = TRUE; + boolean centered = FALSE; + boolean parse_comments = FALSE; if (action != -1 && direction != -1) // element.action.direction text = getHelpText(element, action, direction); @@ -3071,49 +3283,68 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos) if (text == NULL) // not found text = "No description available"; - if (strlen(text) <= max_chars_per_line) // only one line of text - ystart += getFontHeight(font_nr) / 2; + DisableDrawingText(); + + // first get number of text lines to calculate offset for centering text + int num_lines_printed = + DrawTextBuffer(0, 0, text, font_nr, + max_chars_per_line, -1, max_lines_per_text, line_spacing, -1, + autowrap, centered, parse_comments); + + EnableDrawingText(); + + int size_lines_printed = num_lines_printed * line_height - line_spacing; + int yoffset = (row_height - size_lines_printed) / 2; - DrawTextBuffer(xstart, ystart + ypos * ystep, text, font_nr, - max_chars_per_line, -1, max_lines_per_text, 0, -1, - TRUE, FALSE, FALSE); + DrawTextBuffer(xstart, ystart + ypos * ystep + yoffset, text, font_nr, + max_chars_per_line, -1, max_lines_per_text, line_spacing, -1, + autowrap, centered, parse_comments); } static void DrawInfoScreen_TitleScreen(void) { SetGameStatus(GAME_MODE_TITLE); + UnmapAllGadgets(); + 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) { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS); + UnmapAllGadgets(); + FadeInfoSoundsAndMusic(); + FadeOut(REDRAW_FIELD); LoadHelpAnimInfo(); LoadHelpTextInfo(); - HandleInfoScreen_Elements(MB_MENU_INITIALIZE); + HandleInfoScreen_Elements(0, 0, MB_MENU_INITIALIZE); + + PlayInfoSoundsAndMusic(); FadeIn(REDRAW_FIELD); } -void HandleInfoScreen_Elements(int button) +void HandleInfoScreen_Elements(int dx, int dy, int button) { - static unsigned int info_delay = 0; + static DelayCounter info_delay = { 0 }; static int num_anims; static int num_pages; static int page; int anims_per_page = NUM_INFO_ELEMENTS_ON_SCREEN; int i; + info_delay.value = GameFrameDelay; + if (button == MB_MENU_INITIALIZE) { boolean new_element = TRUE; @@ -3144,18 +3375,18 @@ 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(); + FadeInfoSoundsAndMusic(); info_mode = INFO_MODE_MAIN; DrawInfoScreen(); @@ -3163,12 +3394,15 @@ void HandleInfoScreen_Elements(int button) return; } - if (page > 0) + if (button != MB_MENU_INITIALIZE) FadeSetNextScreen(); 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) @@ -3176,11 +3410,11 @@ void HandleInfoScreen_Elements(int button) } else { - if (DelayReached(&info_delay, GameFrameDelay)) + if (DelayReached(&info_delay)) if (page < num_pages) DrawInfoScreen_HelpAnim(page * anims_per_page, num_anims, FALSE); - PlayMenuSoundIfLoop(); + PlayInfoSoundIfLoop(); } } @@ -3188,34 +3422,48 @@ static void DrawInfoScreen_Music(void) { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC); + UnmapAllGadgets(); + FadeOut(REDRAW_FIELD); ClearField(); - DrawHeadline(); + + DrawInfoScreen_Headline(0, 1, TRUE); 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; + 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) @@ -3223,13 +3471,11 @@ void HandleInfoScreen_Music(int button) FadeMenuSoundsAndMusic(); ClearField(); - DrawHeadline(); - DrawTextSCentered(ystart, font_title, - "No music info for this level set."); + DrawInfoScreen_Headline(0, 1, TRUE); - DrawTextSCentered(ybottom, font_foot, - "Press any key or button for info menu"); + DrawTextSCentered(ystart, font_title, "No music info for this level set."); + DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_MENU); return; } @@ -3246,14 +3492,17 @@ 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); + screen_nr += (dx < 0 ? -1 : +1); + } } if (list == NULL) @@ -3275,7 +3524,8 @@ void HandleInfoScreen_Music(int button) FadeOut(REDRAW_FIELD); ClearField(); - DrawHeadline(); + + DrawInfoScreen_Headline(screen_nr, num_screens, TRUE); if (list->is_sound) { @@ -3285,8 +3535,6 @@ void HandleInfoScreen_Music(int button) PlaySoundLoop(sound); else PlaySound(sound); - - DrawTextSCentered(ystart, font_title, "The Game Background Sounds:"); } else { @@ -3296,19 +3544,16 @@ void HandleInfoScreen_Music(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; @@ -3353,8 +3598,52 @@ void HandleInfoScreen_Music(int button) ystart += ystep_head; } - DrawTextSCentered(ybottom, FONT_TEXT_4, - "Press any key or button for next page"); + if (!strEqual(list->played, UNKNOWN_NAME)) + { + if (!strEqual(list->played_header, UNKNOWN_NAME)) + DrawTextSCentered(ystart, font_head, list->played_header); + else + DrawTextSCentered(ystart, font_head, "played in"); + + ystart += ystep_head; + + DrawTextFCentered(ystart, font_text, "%s", list->played); + ystart += ystep_head; + } + else if (!list->is_sound) + { + int music_level_nr = -1; + int i; + + // check if this music is configured for a certain level + for (i = leveldir_current->first_level; + i <= leveldir_current->last_level; i++) + { + // (special case: "list->music" may be negative for unconfigured music) + if (levelset.music[i] != MUS_UNDEFINED && + levelset.music[i] == list->music) + { + music_level_nr = i; + + break; + } + } + + if (music_level_nr != -1) + { + if (!strEqual(list->played_header, UNKNOWN_NAME)) + DrawTextSCentered(ystart, font_head, list->played_header); + else + DrawTextSCentered(ystart, font_head, "played in"); + + ystart += ystep_head; + + DrawTextFCentered(ystart, font_text, "level %03d", music_level_nr); + ystart += ystep_head; + } + } + + DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_PAGE); if (button != MB_MENU_INITIALIZE) FadeIn(REDRAW_FIELD); @@ -3364,486 +3653,98 @@ void HandleInfoScreen_Music(int button) PlaySoundLoop(list->music); } -static void DrawInfoScreen_CreditsScreen(int screen_nr) +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 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 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_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 + getHeadlineSpacing(); int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; + int xstart1 = mSX - SX + 2 * xstep; + int xstart2 = mSX - SX + 18 * xstep; + int xstart3 = mSX - SX + 28 * xstep; + SDL_version sdl_version_compiled; + const SDL_version *sdl_version_linked; + int driver_name_len = 10; + SDL_version sdl_version_linked_ext; + const char *driver_name = NULL; - ClearField(); - 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"); - } - - DrawTextSCentered(ybottom, font_foot, - "Press any key or button for next page"); -} - -static void DrawInfoScreen_Credits(void) -{ - SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_CREDITS); + SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION); - FadeMenuSoundsAndMusic(); + UnmapAllGadgets(); + FadeInfoSoundsAndMusic(); FadeOut(REDRAW_FIELD); - HandleInfoScreen_Credits(MB_MENU_INITIALIZE); + ClearField(); - FadeIn(REDRAW_FIELD); -} + DrawInfoScreen_Headline(0, 1, TRUE); -void HandleInfoScreen_Credits(int button) -{ - static int screen_nr = 0; - int num_screens = 9; + DrawTextF(xstart1, ystart, font_head, "Name"); + DrawTextF(xstart2, ystart, font_text, getProgramTitleString()); + ystart += ystep_line; - if (button == MB_MENU_INITIALIZE) + if (!strEqual(getProgramVersionString(), getProgramRealVersionString())) { - screen_nr = 0; + DrawTextF(xstart1, ystart, font_head, "Version (fake)"); + DrawTextF(xstart2, ystart, font_text, getProgramVersionString()); + ystart += ystep_line; - // DrawInfoScreen_CreditsScreen(screen_nr); + DrawTextF(xstart1, ystart, font_head, "Version (real)"); + DrawTextF(xstart2, ystart, font_text, getProgramRealVersionString()); + ystart += ystep_line; } - - if (button == MB_MENU_LEAVE) + else { - PlaySound(SND_MENU_ITEM_SELECTING); - - info_mode = INFO_MODE_MAIN; - DrawInfoScreen(); - - return; + DrawTextF(xstart1, ystart, font_head, "Version"); + DrawTextF(xstart2, ystart, font_text, getProgramVersionString()); + ystart += ystep_line; } - else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE) - { - if (button != MB_MENU_INITIALIZE) - { - PlaySound(SND_MENU_ITEM_SELECTING); - screen_nr++; - } + DrawTextF(xstart1, ystart, font_head, "Platform"); + DrawTextF(xstart2, ystart, font_text, "%s (%s)", + PLATFORM_STRING, + PLATFORM_XX_BIT_STRING); + ystart += ystep_line; - if (screen_nr >= num_screens) - { - FadeMenuSoundsAndMusic(); + DrawTextF(xstart1, ystart, font_head, "Target"); + DrawTextF(xstart2, ystart, font_text, TARGET_STRING); + ystart += ystep_line; - info_mode = INFO_MODE_MAIN; - DrawInfoScreen(); + DrawTextF(xstart1, ystart, font_head, "Source date"); + DrawTextF(xstart2, ystart, font_text, getSourceDateString()); + ystart += ystep_line; - return; - } + DrawTextF(xstart1, ystart, font_head, "Commit hash"); + DrawTextF(xstart2, ystart, font_text, getSourceHashString()); + ystart += ystep_para; - if (screen_nr > 0) - FadeSetNextScreen(); + DrawTextF(xstart1, ystart, font_head, "Library"); + DrawTextF(xstart2, ystart, font_head, "compiled"); + DrawTextF(xstart3, ystart, font_head, "linked"); + ystart += ystep_head; - if (button != MB_MENU_INITIALIZE) - FadeOut(REDRAW_FIELD); + SDL_VERSION(&sdl_version_compiled); + SDL_GetVersion(&sdl_version_linked_ext); + sdl_version_linked = &sdl_version_linked_ext; - DrawInfoScreen_CreditsScreen(screen_nr); - - if (button != MB_MENU_INITIALIZE) - FadeIn(REDRAW_FIELD); - } - else - { - PlayMenuSoundIfLoop(); - } -} - -static void DrawInfoScreen_Program(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 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; - - SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM); - - FadeOut(REDRAW_FIELD); - - ClearField(); - DrawHeadline(); - - DrawTextSCentered(ystart, font_title, "Program Information:"); - ystart += ystep_title; - - DrawTextSCentered(ystart, font_head, - "This game is Freeware!"); - ystart += ystep_head; - DrawTextSCentered(ystart, font_head, - "If you like it, send e-mail to:"); - ystart += ystep_head; - DrawTextSCentered(ystart, font_text, - setup.internal.program_email); - ystart += ystep_para; - - DrawTextSCentered(ystart, font_head, - "More information and levels:"); - ystart += ystep_head; - DrawTextSCentered(ystart, font_text, - setup.internal.program_website); - ystart += ystep_para; - - DrawTextSCentered(ystart, font_head, - "If you have created new levels,"); - ystart += ystep_line; - DrawTextSCentered(ystart, font_head, - "send them to me to include them!"); - ystart += ystep_head; - DrawTextSCentered(ystart, font_head, - ":-)"); - - DrawTextSCentered(ybottom, font_foot, - "Press any key or button for info menu"); - - FadeIn(REDRAW_FIELD); -} - -void HandleInfoScreen_Program(int button) -{ - if (button == MB_MENU_LEAVE) - { - PlaySound(SND_MENU_ITEM_SELECTING); - - info_mode = INFO_MODE_MAIN; - DrawInfoScreen(); - - return; - } - else if (button == MB_MENU_CHOICE) - { - PlaySound(SND_MENU_ITEM_SELECTING); - - FadeMenuSoundsAndMusic(); - - info_mode = INFO_MODE_MAIN; - DrawInfoScreen(); - } - else - { - PlayMenuSoundIfLoop(); - } -} - -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 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 ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; - int xstart1 = mSX - SX + 2 * xstep; - int xstart2 = mSX - SX + 18 * xstep; - int xstart3 = mSX - SX + 28 * xstep; - SDL_version sdl_version_compiled; - const SDL_version *sdl_version_linked; - int driver_name_len = 10; - SDL_version sdl_version_linked_ext; - const char *driver_name = NULL; - - SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION); - - FadeOut(REDRAW_FIELD); - - ClearField(); - DrawHeadline(); - - DrawTextSCentered(ystart, font_title, "Version Information:"); - ystart += ystep_title; - - DrawTextF(xstart1, ystart, font_head, "Name"); - DrawTextF(xstart2, ystart, font_text, getProgramTitleString()); - ystart += ystep_line; - - if (!strEqual(getProgramVersionString(), getProgramRealVersionString())) - { - DrawTextF(xstart1, ystart, font_head, "Version (fake)"); - DrawTextF(xstart2, ystart, font_text, getProgramVersionString()); - ystart += ystep_line; - - DrawTextF(xstart1, ystart, font_head, "Version (real)"); - DrawTextF(xstart2, ystart, font_text, getProgramRealVersionString()); - ystart += ystep_line; - } - else - { - DrawTextF(xstart1, ystart, font_head, "Version"); - DrawTextF(xstart2, ystart, font_text, getProgramVersionString()); - ystart += ystep_line; - } - - DrawTextF(xstart1, ystart, font_head, "Platform"); - DrawTextF(xstart2, ystart, font_text, "%s (%s)", - PLATFORM_STRING, - PLATFORM_XX_BIT_STRING); - ystart += ystep_line; - - DrawTextF(xstart1, ystart, font_head, "Target"); - DrawTextF(xstart2, ystart, font_text, TARGET_STRING); - ystart += ystep_line; - - DrawTextF(xstart1, ystart, font_head, "Source date"); - DrawTextF(xstart2, ystart, font_text, getSourceDateString()); - ystart += ystep_line; - - DrawTextF(xstart1, ystart, font_head, "Commit hash"); - DrawTextF(xstart2, ystart, font_text, getSourceHashString()); - ystart += ystep_para; - - DrawTextF(xstart1, ystart, font_head, "Library"); - DrawTextF(xstart2, ystart, font_head, "compiled"); - DrawTextF(xstart3, ystart, font_head, "linked"); - ystart += ystep_head; - - SDL_VERSION(&sdl_version_compiled); - SDL_GetVersion(&sdl_version_linked_ext); - sdl_version_linked = &sdl_version_linked_ext; - - DrawTextF(xstart1, ystart, font_text, "SDL"); - DrawTextF(xstart2, ystart, font_text, "%d.%d.%d", - sdl_version_compiled.major, - sdl_version_compiled.minor, - sdl_version_compiled.patch); - DrawTextF(xstart3, ystart, font_text, "%d.%d.%d", - sdl_version_linked->major, - sdl_version_linked->minor, - sdl_version_linked->patch); - ystart += ystep_line; + DrawTextF(xstart1, ystart, font_text, "SDL"); + DrawTextF(xstart2, ystart, font_text, "%d.%d.%d", + sdl_version_compiled.major, + sdl_version_compiled.minor, + sdl_version_compiled.patch); + DrawTextF(xstart3, ystart, font_text, "%d.%d.%d", + sdl_version_linked->major, + sdl_version_linked->minor, + sdl_version_linked->patch); + ystart += ystep_line; SDL_IMAGE_VERSION(&sdl_version_compiled); sdl_version_linked = IMG_Linked_Version(); @@ -3915,8 +3816,9 @@ static void DrawInfoScreen_Version(void) DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_audiodriver); DrawTextF(xstart3, ystart, font_text, "%s", driver_name); - DrawTextSCentered(ybottom, font_foot, - "Press any key or button for info menu"); + DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_MENU); + + PlayInfoSoundsAndMusic(); FadeIn(REDRAW_FIELD); } @@ -3947,543 +3849,331 @@ void HandleInfoScreen_Version(int button) } } -static void DrawInfoScreen_LevelSet(void) +static char *getInfoScreenTitle_Generic(void) { - struct TitleMessageInfo *tmi = &readme; - char *filename = getLevelSetInfoFilename(); - char *title = "Level Set Information:"; - int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART1; - int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; - - if (filename == NULL) - { - DrawInfoScreen_NotAvailable(title, "No information for this level set."); - - return; - } - - SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET); - - FadeOut(REDRAW_FIELD); - - ClearField(); - DrawHeadline(); - - DrawTextSCentered(ystart, FONT_TEXT_1, title); - - // if x position set to "-1", automatically determine by playfield width - if (tmi->x == -1) - tmi->x = SXSIZE / 2; - - // if y position set to "-1", use static default value - if (tmi->y == -1) - tmi->y = 150; - - // if width set to "-1", automatically determine by playfield width - if (tmi->width == -1) - tmi->width = SXSIZE - 2 * TILEX; - - // if height set to "-1", automatically determine by playfield height - if (tmi->height == -1) - tmi->height = MENU_SCREEN_INFO_YBOTTOM - tmi->y - 10; - - // if chars set to "-1", automatically determine by text and font width - if (tmi->chars == -1) - tmi->chars = tmi->width / getFontWidth(tmi->font); - else - tmi->width = tmi->chars * getFontWidth(tmi->font); - - // if lines set to "-1", automatically determine by text and font height - if (tmi->lines == -1) - tmi->lines = tmi->height / getFontHeight(tmi->font); - else - tmi->height = tmi->lines * getFontHeight(tmi->font); - - DrawTextFile(mSX + ALIGNED_TEXT_XPOS(tmi), mSY + ALIGNED_TEXT_YPOS(tmi), - filename, tmi->font, tmi->chars, -1, tmi->lines, 0, -1, - tmi->autowrap, tmi->centered, tmi->parse_comments); - - DrawTextSCentered(ybottom, FONT_TEXT_4, - "Press any key or button for info menu"); - - FadeIn(REDRAW_FIELD); + 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 void HandleInfoScreen_LevelSet(int button) +static int getInfoScreenBackgroundImage_Generic(void) { - if (button == MB_MENU_LEAVE) - { - PlaySound(SND_MENU_ITEM_SELECTING); - - info_mode = INFO_MODE_MAIN; - DrawInfoScreen(); - - return; - } - else if (button == MB_MENU_CHOICE) - { - PlaySound(SND_MENU_ITEM_SELECTING); - - FadeMenuSoundsAndMusic(); - - info_mode = INFO_MODE_MAIN; - DrawInfoScreen(); - } - else - { - PlayMenuSoundIfLoop(); - } -} - -static void DrawInfoScreen(void) -{ - if (info_mode == INFO_MODE_TITLE) - DrawInfoScreen_TitleScreen(); - else if (info_mode == INFO_MODE_ELEMENTS) - DrawInfoScreen_Elements(); - else if (info_mode == INFO_MODE_MUSIC) - DrawInfoScreen_Music(); - else if (info_mode == INFO_MODE_CREDITS) - DrawInfoScreen_Credits(); - else if (info_mode == INFO_MODE_PROGRAM) - DrawInfoScreen_Program(); - else if (info_mode == INFO_MODE_VERSION) - DrawInfoScreen_Version(); - else if (info_mode == INFO_MODE_LEVELSET) - DrawInfoScreen_LevelSet(); - else - DrawInfoScreen_Main(); - - if (info_mode != INFO_MODE_MAIN && - info_mode != INFO_MODE_TITLE && - info_mode != INFO_MODE_MUSIC) - PlayMenuSoundsAndMusic(); + 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); } -void HandleInfoScreen(int mx, int my, int dx, int dy, int button) +static int getInfoScreenBackgroundSound_Generic(void) { - if (info_mode == INFO_MODE_TITLE) - HandleInfoScreen_TitleScreen(button); - else if (info_mode == INFO_MODE_ELEMENTS) - HandleInfoScreen_Elements(button); - else if (info_mode == INFO_MODE_MUSIC) - HandleInfoScreen_Music(button); - else if (info_mode == INFO_MODE_CREDITS) - HandleInfoScreen_Credits(button); - else if (info_mode == INFO_MODE_PROGRAM) - HandleInfoScreen_Program(button); - else if (info_mode == INFO_MODE_VERSION) - HandleInfoScreen_Version(button); - else if (info_mode == INFO_MODE_LEVELSET) - HandleInfoScreen_LevelSet(button); - else - HandleInfoScreen_Main(mx, my, dx, dy, button); + 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); } - -// ============================================================================ -// rename player API functions -// ============================================================================ - -struct ApiRenamePlayerThreadData -{ - char *player_name; - char *player_uuid; -}; - -static void *CreateThreadData_ApiRenamePlayer(void) +static int getInfoScreenBackgroundMusic_Generic(void) { - struct ApiRenamePlayerThreadData *data = - checked_malloc(sizeof(struct ApiRenamePlayerThreadData)); - - data->player_name = getStringCopy(setup.player_name); - data->player_uuid = getStringCopy(setup.player_uuid); - - return data; + 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 void FreeThreadData_ApiRenamePlayer(void *data_raw) +static char *getInfoScreenFilename_Generic(int nr, boolean global) { - struct ApiRenamePlayerThreadData *data = data_raw; - - checked_free(data->player_name); - checked_free(data->player_uuid); - checked_free(data); + return (info_mode == INFO_MODE_CREDITS ? getCreditsFilename(nr, global) : + info_mode == INFO_MODE_PROGRAM ? getProgramInfoFilename(nr) : + info_mode == INFO_MODE_LEVELSET ? getLevelSetInfoFilename(nr) : + NULL); } -static boolean SetRequest_ApiRenamePlayer(struct HttpRequest *request, - void *data_raw) +static void DrawInfoScreen_GenericScreen(int screen_nr, int num_screens, + int use_global_screens) { - struct ApiRenamePlayerThreadData *data = data_raw; - char *player_name_raw = data->player_name; - char *player_uuid_raw = data->player_uuid; - - request->hostname = setup.api_server_hostname; - request->port = API_SERVER_PORT; - request->method = API_SERVER_METHOD; - request->uri = API_SERVER_URI_RENAME; - - char *player_name = getEscapedJSON(player_name_raw); - char *player_uuid = getEscapedJSON(player_uuid_raw); - - snprintf(request->body, MAX_HTTP_BODY_SIZE, - "{\n" - "%s" - " \"game_version\": \"%s\",\n" - " \"game_platform\": \"%s\",\n" - " \"name\": \"%s\",\n" - " \"uuid\": \"%s\"\n" - "}\n", - getPasswordJSON(setup.api_server_password), - getProgramRealVersionString(), - getProgramPlatformString(), - player_name, - player_uuid); - - checked_free(player_name); - checked_free(player_uuid); - - ConvertHttpRequestBodyToServerEncoding(request); - - return TRUE; -} + char *filename = getInfoScreenFilename_Generic(screen_nr, use_global_screens); + 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; -static void HandleResponse_ApiRenamePlayer(struct HttpResponse *response, - void *data_raw) -{ - // nothing to do here -} + ClearField(); -#if defined(PLATFORM_EMSCRIPTEN) -static void Emscripten_ApiRenamePlayer_Loaded(unsigned handle, void *data_raw, - void *buffer, unsigned int size) -{ - struct HttpResponse *response = GetHttpResponseFromBuffer(buffer, size); + DrawInfoScreen_Headline(screen_nr, num_screens, use_global_screens); - if (response != NULL) + if (info_mode == INFO_MODE_CREDITS || + info_mode == INFO_MODE_PROGRAM) { - HandleResponse_ApiRenamePlayer(response, data_raw); + int width = SXSIZE; + 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; + int line_spacing = getMenuTextSpacing(spacing_line, font_text); + int xstart = mSX + padx; + int ystart = mSY + MENU_SCREEN_INFO_YSTART + getHeadlineSpacing(); + boolean autowrap = FALSE; + boolean centered = TRUE; + boolean parse_comments = TRUE; - checked_free(response); - } - else - { - Error("server response too large to handle (%d bytes)", size); + DrawTextFile(xstart, ystart, + filename, font_text, chars, -1, lines, line_spacing, -1, + autowrap, centered, parse_comments); } - - FreeThreadData_ApiRenamePlayer(data_raw); -} - -static void Emscripten_ApiRenamePlayer_Failed(unsigned handle, void *data_raw, - int code, const char *status) -{ - Error("server failed to handle request: %d %s", code, status); - - FreeThreadData_ApiRenamePlayer(data_raw); -} - -static void Emscripten_ApiRenamePlayer_Progress(unsigned handle, void *data_raw, - int bytes, int size) -{ - // nothing to do here -} - -static void Emscripten_ApiRenamePlayer_HttpRequest(struct HttpRequest *request, - void *data_raw) -{ - if (!SetRequest_ApiRenamePlayer(request, data_raw)) + else if (info_mode == INFO_MODE_LEVELSET) { - FreeThreadData_ApiRenamePlayer(data_raw); - - return; - } + struct TitleMessageInfo *tmi = &readme; - emscripten_async_wget2_data(request->uri, - request->method, - request->body, - data_raw, - TRUE, - Emscripten_ApiRenamePlayer_Loaded, - Emscripten_ApiRenamePlayer_Failed, - Emscripten_ApiRenamePlayer_Progress); -} + // if x position set to "-1", automatically determine by playfield width + if (tmi->x == -1) + tmi->x = SXSIZE / 2; -#else + // if y position set to "-1", use static default value + if (tmi->y == -1) + tmi->y = MENU_SCREEN_INFO_YSTART + getHeadlineSpacing(); -static void ApiRenamePlayer_HttpRequestExt(struct HttpRequest *request, - struct HttpResponse *response, - void *data_raw) -{ - if (!SetRequest_ApiRenamePlayer(request, data_raw)) - return; + // if width set to "-1", automatically determine by playfield width + if (tmi->width == -1) + tmi->width = SXSIZE - 2 * TILEX; - if (!DoHttpRequest(request, response)) - { - Error("HTTP request failed: %s", GetHttpError()); + // if height set to "-1", automatically determine by playfield height + if (tmi->height == -1) + tmi->height = MENU_SCREEN_INFO_YBOTTOM - tmi->y - 10; - return; - } + // if chars set to "-1", automatically determine by text and font width + if (tmi->chars == -1) + tmi->chars = tmi->width / getFontWidth(tmi->font); + else + tmi->width = tmi->chars * getFontWidth(tmi->font); - if (!HTTP_SUCCESS(response->status_code)) - { - Error("server failed to handle request: %d %s", - response->status_code, - response->status_text); + // if lines set to "-1", automatically determine by text and font height + if (tmi->lines == -1) + tmi->lines = tmi->height / getFontHeight(tmi->font); + else + tmi->height = tmi->lines * getFontHeight(tmi->font); - return; + DrawTextFile(mSX + ALIGNED_TEXT_XPOS(tmi), mSY + ALIGNED_TEXT_YPOS(tmi), + filename, tmi->font, tmi->chars, -1, tmi->lines, 0, -1, + tmi->autowrap, tmi->centered, tmi->parse_comments); } - HandleResponse_ApiRenamePlayer(response, data_raw); -} - -static void ApiRenamePlayer_HttpRequest(struct HttpRequest *request, - struct HttpResponse *response, - void *data_raw) -{ - ApiRenamePlayer_HttpRequestExt(request, response, data_raw); + boolean last_screen = (screen_nr == num_screens - 1); + char *text_foot = (last_screen ? TEXT_NEXT_MENU : TEXT_NEXT_PAGE); - FreeThreadData_ApiRenamePlayer(data_raw); + DrawTextSCentered(ybottom, font_foot, text_foot); } -#endif -static int ApiRenamePlayerThread(void *data_raw) +static void DrawInfoScreen_Generic(void) { - struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest)); - struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse)); - - program.api_thread_count++; + SetMainBackgroundImageIfDefined(getInfoScreenBackgroundImage_Generic()); -#if defined(PLATFORM_EMSCRIPTEN) - Emscripten_ApiRenamePlayer_HttpRequest(request, data_raw); -#else - ApiRenamePlayer_HttpRequest(request, response, data_raw); -#endif - - program.api_thread_count--; + UnmapAllGadgets(); + FadeInfoSoundsAndMusic(); - checked_free(request); - checked_free(response); + FadeOut(REDRAW_FIELD); - return 0; -} + HandleInfoScreen_Generic(0, 0, MB_MENU_INITIALIZE); -static void ApiRenamePlayerAsThread(void) -{ - struct ApiRenamePlayerThreadData *data = CreateThreadData_ApiRenamePlayer(); + PlayInfoSoundsAndMusic(); - ExecuteAsThread(ApiRenamePlayerThread, - "ApiRenamePlayer", data, - "rename player on server"); + FadeIn(REDRAW_FIELD); } - -// ============================================================================ -// 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) +void HandleInfoScreen_Generic(int dx, int dy, int button) { - struct ApiResetUUIDThreadData *data = - checked_malloc(sizeof(struct ApiResetUUIDThreadData)); + static char *text_no_info = ""; + static int num_screens = 0; + static int screen_nr = 0; + static boolean use_global_screens = FALSE; - data->player_name = getStringCopy(setup.player_name); - data->player_uuid_old = getStringCopy(setup.player_uuid); - data->player_uuid_new = getStringCopy(uuid_new); + if (button == MB_MENU_INITIALIZE) + { + num_screens = 0; + screen_nr = 0; - return data; -} + if (info_mode == INFO_MODE_CREDITS) + { + int i; -static void FreeThreadData_ApiResetUUID(void *data_raw) -{ - struct ApiResetUUIDThreadData *data = data_raw; + for (i = 0; i < 2; i++) + { + use_global_screens = i; // check for "FALSE", then "TRUE" - checked_free(data->player_name); - checked_free(data->player_uuid_old); - checked_free(data->player_uuid_new); - checked_free(data); -} + // determine number of (global or level set specific) credits screens + while (getCreditsFilename(num_screens, use_global_screens) != NULL) + num_screens++; -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; + if (num_screens > 0) + break; + } - request->hostname = setup.api_server_hostname; - request->port = API_SERVER_PORT; - request->method = API_SERVER_METHOD; - request->uri = API_SERVER_URI_RESETUUID; + text_no_info = "No credits available."; + } + else if (info_mode == INFO_MODE_PROGRAM) + { + use_global_screens = TRUE; - 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); + // determine number of program info screens + while (getProgramInfoFilename(num_screens) != NULL) + num_screens++; - 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); + text_no_info = "No program info available."; + } + else if (info_mode == INFO_MODE_LEVELSET) + { + use_global_screens = FALSE; - checked_free(player_name); - checked_free(player_uuid_old); - checked_free(player_uuid_new); + // determine number of levelset info screens + while (getLevelSetInfoFilename(num_screens) != NULL) + num_screens++; - ConvertHttpRequestBodyToServerEncoding(request); + text_no_info = "No level set info available."; + } - return TRUE; -} + if (num_screens == 0) + { + int font_title = MENU_INFO_FONT_TITLE; + int font_foot = MENU_INFO_FONT_FOOT; + int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART; + int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; -static void HandleResponse_ApiResetUUID(struct HttpResponse *response, - void *data_raw) -{ - struct ApiResetUUIDThreadData *data = data_raw; + ClearField(); - // upgrade player UUID in server setup file - setup.player_uuid = getStringCopy(data->player_uuid_new); - setup.player_version = 2; + DrawInfoScreen_Headline(screen_nr, num_screens, use_global_screens); - SaveSetup_ServerSetup(); -} + DrawTextSCentered(ystart, font_title, text_no_info); + DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_MENU); -#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); + return; + } - if (response != NULL) + DrawInfoScreen_GenericScreen(screen_nr, num_screens, use_global_screens); + } + else if (button == MB_MENU_LEAVE) { - HandleResponse_ApiResetUUID(response, data_raw); + PlaySound(SND_MENU_ITEM_SELECTING); - checked_free(response); + info_mode = INFO_MODE_MAIN; + DrawInfoScreen(); } - else + else if (button == MB_MENU_CHOICE || dx) { - Error("server response too large to handle (%d bytes)", size); - } + PlaySound(SND_MENU_ITEM_SELECTING); - FreeThreadData_ApiResetUUID(data_raw); -} + screen_nr += (dx < 0 ? -1 : +1); -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); + if (screen_nr < 0 || screen_nr >= num_screens) + { + FadeInfoSoundsAndMusic(); - FreeThreadData_ApiResetUUID(data_raw); -} + info_mode = INFO_MODE_MAIN; + DrawInfoScreen(); + } + else + { + FadeSetNextScreen(); -static void Emscripten_ApiResetUUID_Progress(unsigned handle, void *data_raw, - int bytes, int size) -{ - // nothing to do here -} + FadeOut(REDRAW_FIELD); -static void Emscripten_ApiResetUUID_HttpRequest(struct HttpRequest *request, - void *data_raw) -{ - if (!SetRequest_ApiResetUUID(request, data_raw)) - { - FreeThreadData_ApiResetUUID(data_raw); + DrawInfoScreen_GenericScreen(screen_nr, num_screens, use_global_screens); - return; + FadeIn(REDRAW_FIELD); + } + } + else + { + PlayInfoSoundIfLoop(); } - - 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 DrawInfoScreen(void) +{ + if (info_mode == INFO_MODE_TITLE) + DrawInfoScreen_TitleScreen(); + else if (info_mode == INFO_MODE_ELEMENTS) + DrawInfoScreen_Elements(); + else if (info_mode == INFO_MODE_MUSIC) + DrawInfoScreen_Music(); + else if (info_mode == INFO_MODE_CREDITS) + DrawInfoScreen_Generic(); + else if (info_mode == INFO_MODE_PROGRAM) + DrawInfoScreen_Generic(); + else if (info_mode == INFO_MODE_VERSION) + DrawInfoScreen_Version(); + else if (info_mode == INFO_MODE_LEVELSET) + DrawInfoScreen_Generic(); + else + DrawInfoScreen_Main(); +} -static void ApiResetUUID_HttpRequestExt(struct HttpRequest *request, - struct HttpResponse *response, - void *data_raw) +void DrawInfoScreen_FromMainMenu(int nr) { - if (!SetRequest_ApiResetUUID(request, data_raw)) - return; - - if (!DoHttpRequest(request, response)) - { - Error("HTTP request failed: %s", GetHttpError()); + int fade_mask = REDRAW_FIELD; + if (nr < INFO_MODE_MAIN || nr >= MAX_INFO_MODES) return; - } - if (!HTTP_SUCCESS(response->status_code)) - { - Error("server failed to handle request: %d %s", - response->status_code, - response->status_text); + CloseDoor(DOOR_CLOSE_2); - return; - } + SetGameStatus(GAME_MODE_INFO); - HandleResponse_ApiResetUUID(response, data_raw); -} + info_mode = nr; + info_screens_from_main = TRUE; -static void ApiResetUUID_HttpRequest(struct HttpRequest *request, - struct HttpResponse *response, - void *data_raw) -{ - ApiResetUUID_HttpRequestExt(request, response, data_raw); + if (redraw_mask & REDRAW_ALL) + fade_mask = REDRAW_ALL; - FreeThreadData_ApiResetUUID(data_raw); -} -#endif + if (CheckFadeAll()) + fade_mask = REDRAW_ALL; -static int ApiResetUUIDThread(void *data_raw) -{ - struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest)); - struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse)); + UnmapAllGadgets(); + FadeMenuSoundsAndMusic(); - program.api_thread_count++; + FadeSetEnterScreen(); -#if defined(PLATFORM_EMSCRIPTEN) - Emscripten_ApiResetUUID_HttpRequest(request, data_raw); -#else - ApiResetUUID_HttpRequest(request, response, data_raw); -#endif + FadeOut(fade_mask); + + FadeSkipNextFadeOut(); - program.api_thread_count--; + // needed if different viewport properties defined for info screen + ChangeViewportPropertiesIfNeeded(); - checked_free(request); - checked_free(response); + SetMainBackgroundImage(IMG_BACKGROUND_INFO); - return 0; + DrawInfoScreen(); } -static void ApiResetUUIDAsThread(char *uuid_new) +void HandleInfoScreen(int mx, int my, int dx, int dy, int button) { - struct ApiResetUUIDThreadData *data = CreateThreadData_ApiResetUUID(uuid_new); - - ExecuteAsThread(ApiResetUUIDThread, - "ApiResetUUID", data, - "reset UUID on server"); + if (info_mode == INFO_MODE_TITLE) + HandleInfoScreen_TitleScreen(dx, dy, button); + else if (info_mode == INFO_MODE_ELEMENTS) + HandleInfoScreen_Elements(dx, dy, button); + else if (info_mode == INFO_MODE_MUSIC) + HandleInfoScreen_Music(dx, dy, button); + else if (info_mode == INFO_MODE_CREDITS) + HandleInfoScreen_Generic(dx, dy, button); + else if (info_mode == INFO_MODE_PROGRAM) + HandleInfoScreen_Generic(dx, dy, button); + else if (info_mode == INFO_MODE_VERSION) + HandleInfoScreen_Version(button); + else if (info_mode == INFO_MODE_LEVELSET) + HandleInfoScreen_Generic(dx, dy, button); + else + HandleInfoScreen_Main(mx, my, dx, dy, button); } @@ -4501,7 +4191,7 @@ static int getPlayerNameColor(char *name) } static void drawTypeNameText(char *name, struct TextPosInfo *pos, - boolean active) + boolean active) { char text[MAX_PLAYER_NAME_LEN + 2] = { 0 }; boolean multiple_users = (game_status == GAME_MODE_PSEUDO_TYPENAMES); @@ -4509,8 +4199,12 @@ static void drawTypeNameText(char *name, struct TextPosInfo *pos, int sy = (multiple_users ? amSY + pos->y : mSY + ALIGNED_TEXT_YPOS(pos)); int font_nr = (active ? FONT_ACTIVE(pos->font) : pos->font); int font_width = getFontWidth(font_nr); + int font_xoffset = getFontDrawOffsetX(font_nr); + int font_yoffset = getFontDrawOffsetY(font_nr); + int font_sx = sx + font_xoffset; + int font_sy = sy + font_yoffset; - DrawBackgroundForFont(sx, sy, pos->width, pos->height, font_nr); + DrawBackgroundForFont(font_sx, font_sy, pos->width, pos->height, font_nr); sprintf(text, "%s%c", name, (active ? '_' : '\0')); @@ -4826,9 +4520,22 @@ static int getAlignYOffsetFromTreeInfo(TreeInfo *ti) return align_yoffset; } +static void StartPlayingFromHallOfFame(void) +{ + level_nr = scores.next_level_nr; + LoadLevel(level_nr); + + StartGameActions(network.enabled, setup.autorecord, level.random_seed); +} + 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); + + scores.continue_on_return = (game_status == GAME_MODE_SCORES && + game_status_last_screen == GAME_MODE_PLAYING); if (CheckFadeAll()) fade_mask = REDRAW_ALL; @@ -4839,7 +4546,11 @@ static void DrawChooseTree(TreeInfo **ti_ptr) { execSetupArtwork(); } - else // GAME_MODE_LEVELS + else if (game_status == GAME_MODE_SCORES && scores.continue_playing) + { + StartPlayingFromHallOfFame(); + } + else { SetGameStatus(GAME_MODE_MAIN); @@ -4854,7 +4565,7 @@ static void DrawChooseTree(TreeInfo **ti_ptr) FreeScreenGadgets(); CreateScreenGadgets(); - if (game_status != game_status_last_screen) + if (restart_music) FadeMenuSoundsAndMusic(); FadeOut(fade_mask); @@ -4885,7 +4596,7 @@ static void DrawChooseTree(TreeInfo **ti_ptr) DrawMaskedBorder(fade_mask); - if (game_status != game_status_last_screen) + if (restart_music) PlayMenuSoundsAndMusic(); FadeIn(fade_mask); @@ -4932,33 +4643,29 @@ static void drawChooseTreeText(TreeInfo *ti, int y, boolean active) 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 = 3 * font_size_1; + 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 dx2 = text_size_1; - int dx3 = dx2 + font_size_1; - int dx4 = screen_width - startdx - 2 * border - text_size_4; + 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 startx2 = startx + dx2; int startx3 = startx + dx3; int startx4 = startx + dx4; int pos = node->pos; - char *pos_text = getHallOfFameRankText(pos); - char *dot_text = "."; + char *pos_text = getHallOfFameRankText(pos, 3); int i; DrawText(startx1, starty, pos_text, font_nr1); - DrawText(startx2, starty, dot_text, font_nr1); for (i = 0; i < num_dots; i++) - DrawText(startx3 + i * font_size_3, starty, dot_text, font_nr3); + 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(startx4, starty, getHallOfFameScoreText(pos), font_nr4); + DrawText(startx4, starty, getHallOfFameScoreText(pos, 5), font_nr4); } else { @@ -5081,39 +4788,15 @@ static void drawChooseTreeScreen(TreeInfo *ti) MapScreenTreeGadgets(ti); } -static void drawChooseTreeScreen_Scores_NotAvailable(void) +static TreeInfo *setHallOfFameActiveEntry(TreeInfo **ti_ptr) { - // 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; + int score_pos = scores.last_added; - drawChooseTreeHeadExt(TREE_TYPE_SCORE_ENTRY, INFOTEXT_SCORE_ENTRY); - DrawTextFCentered(ystart0, font_info, text_info, scores.last_level_nr); + if (game_status_last_screen == GAME_MODE_SCOREINFO) + score_pos = scores.last_entry_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) -{ // set current tree entry to last added score entry - *ti_ptr = getTreeInfoFromIdentifier(score_entries, i_to_a(scores.last_added)); + *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) @@ -5138,17 +4821,14 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, boolean has_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->mapped; int mx_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x; int mx_right_border = (has_scrollbar ? mx_scrollbar : SX + SXSIZE); - int sx1_edit_name = getChooseTreeEditXPos(POS_LEFT); - int sx2_edit_name = getChooseTreeEditXPos(POS_RIGHT); + int sx1_edit_name = getChooseTreeEditXPosReal(POS_LEFT); + int sx2_edit_name = getChooseTreeEditXPosReal(POS_RIGHT); int x = 0; 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) { @@ -5161,31 +4841,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); } } @@ -5281,6 +4940,23 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, return; } +#if defined(PLATFORM_ANDROID) + // directly continue when touching the screen after playing + if ((mx || my) && scores.continue_on_return) + { + // ignore touch events until released + mx = my = 0; + } +#endif + + // any mouse click or cursor key stops leaving scores by "Return" key + if ((mx || my || dx || dy) && scores.continue_on_return) + { + scores.continue_on_return = FALSE; + level_nr = scores.last_level_nr; + LoadLevel(level_nr); + } + if (mx || my) // mouse input { x = (mx - amSX) / 32; @@ -5360,15 +5036,17 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, node_cursor->cl_first = ti->cl_first; node_cursor->cl_cursor = ti->cl_cursor; + *ti_ptr = node_cursor->node_group; DrawChooseTree(ti_ptr); return; } } - else if (dx == -1 && ti->node_parent) + else if ((dx == -1 || button == MB_MENU_CONTINUE) && ti->node_parent) { - FadeSetLeaveMenu(); + if (game_status != GAME_MODE_SCORES) + FadeSetLeaveMenu(); PlaySound(SND_MENU_ITEM_SELECTING); @@ -5451,6 +5129,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, node_cursor->cl_first = ti->cl_first; node_cursor->cl_cursor = ti->cl_cursor; + *ti_ptr = node_cursor->node_group; DrawChooseTree(ti_ptr); } @@ -5469,6 +5148,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, node_cursor->cl_first = ti->cl_first; node_cursor->cl_cursor = ti->cl_cursor; + *ti_ptr = node_cursor; if (ti->type == TREE_TYPE_LEVEL_DIR) @@ -5520,6 +5200,9 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, { // store level set if chosen from "last played level set" menu StoreLastPlayedLevels(leveldir_current); + + // store if level set chosen from "last played level set" menu + SaveLevelSetup_LastSeries(); } else if (game_status == GAME_MODE_NAMES) { @@ -5559,16 +5242,13 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, } 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) + if (scores.continue_playing && scores.continue_on_return) { - StartGameActions(network.enabled, setup.autorecord, - level.random_seed); + StartPlayingFromHallOfFame(); + return; } - else + else if (!scores.continue_on_return) { SetGameStatus(GAME_MODE_SCOREINFO); @@ -5632,6 +5312,9 @@ void DrawChoosePlayerName(void) if (player_name_current == NULL) player_name_current = player_name; + // set text size for main name input (also used on name selection screen) + InitializeMainControls(); + DrawChooseTree(&player_name_current); } @@ -5708,6 +5391,9 @@ void HandleChooseLevelNr(int mx, int my, int dx, int dy, int button) static void DrawHallOfFame_setScoreEntries(void) { + 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; @@ -5720,9 +5406,10 @@ static void DrawHallOfFame_setScoreEntries(void) for (i = 0; i < MAX_SCORE_ENTRIES; i++) { - // do not add empty score entries + // do not add empty score entries if off-screen if (scores.entry[i].score == 0 && - scores.entry[i].time == 0) + scores.entry[i].time == 0 && + i >= min_score_entries) break; TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_SCORE_ENTRY); @@ -5758,12 +5445,13 @@ static void DrawHallOfFame_setScoreEntries(void) if (score_entry_current == NULL) score_entry_current = getFirstValidTreeInfoEntry(score_entries); - // ("score_entries" and "score_entry_current" may be NULL here) + if (score_entries != NULL && scores.continue_playing) + setString(&score_entries->node_group->name, BACKLINK_TEXT_NEXT); } -void DrawHallOfFame(int level_nr) +void DrawHallOfFame(int nr) { - scores.last_level_nr = level_nr; + scores.last_level_nr = nr; // (this is needed when called from GameEnd() after winning a game) KeyboardAutoRepeatOn(); @@ -5772,7 +5460,7 @@ void DrawHallOfFame(int level_nr) SetDrawDeactivationMask(REDRAW_NONE); SetDrawBackgroundMask(REDRAW_FIELD); - LoadLocalAndServerScore(level_nr, TRUE); + LoadLocalAndServerScore(scores.last_level_nr, TRUE); DrawHallOfFame_setScoreEntries(); @@ -5784,11 +5472,15 @@ void DrawHallOfFame(int level_nr) DrawChooseTree(&score_entry_current); } -static char *getHallOfFameRankText(int nr) +static char *getHallOfFameRankText(int nr, int size) { + static char rank_text[10]; boolean forced = (scores.force_last_added && nr == scores.last_added); + char *rank_text_raw = (forced ? "???" : int2str(nr + 1, size)); - return (forced ? "???" : int2str(nr + 1, 3)); + sprintf(rank_text, "%s%s", rank_text_raw, (size > 0 || !forced ? "." : "")); + + return rank_text; } static char *getHallOfFameTimeText(int nr) @@ -5803,14 +5495,36 @@ static char *getHallOfFameTimeText(int nr) return score_text; } -static char *getHallOfFameScoreText(int nr) +static char *getHallOfFameScoreText(int nr, int size) { if (!level.rate_time_over_score) - return int2str(scores.entry[nr].score, 5); // show normal score + return int2str(scores.entry[nr].score, size); // show normal score else if (level.use_step_counter) - return int2str(scores.entry[nr].time, 5); // show number of steps + return int2str(scores.entry[nr].time, size); // show number of steps else - return getHallOfFameTimeText(nr); // show playing time + return getHallOfFameTimeText(nr); // show playing time +} + +static char *getHallOfFameTapeDateText(struct ScoreEntry *entry) +{ + static char tape_date[MAX_ISO_DATE_LEN + 1]; + int i, j; + + if (!strEqual(entry->tape_date, UNKNOWN_NAME) || + strEqual(entry->tape_basename, UNDEFINED_FILENAME)) + return entry->tape_date; + + for (i = 0, j = 0; i < 8; i++, j++) + { + tape_date[j] = entry->tape_basename[i]; + + if (i == 3 || i == 5) + tape_date[++j] = '-'; + } + + tape_date[MAX_ISO_DATE_LEN] = '\0'; + + return tape_date; } static void HandleHallOfFame_SelectLevel(int step, int direction) @@ -5831,21 +5545,30 @@ static void HandleHallOfFame_SelectLevel(int step, int direction) PlaySound(SND_MENU_ITEM_SELECTING); scores.last_level_nr = level_nr = new_level_nr; + scores.last_entry_nr = 0; + LoadLevel(level_nr); LoadLocalAndServerScore(level_nr, TRUE); DrawHallOfFame_setScoreEntries(); - // force remapping optional gadgets (especially scroll bar) - UnmapScreenTreeGadgets(); + if (game_status == GAME_MODE_SCORES) + { + // force remapping optional gadgets (especially scroll bar) + UnmapScreenTreeGadgets(); - // redraw complete high score screen, as sub-title has changed - ClearField(); + // redraw complete high score screen, as sub-title has changed + ClearField(); - // redraw level selection buttons (which have just been erased) - RedrawScreenMenuGadgets(SCREEN_MASK_SCORES); + // redraw level selection buttons (which have just been erased) + RedrawScreenMenuGadgets(SCREEN_MASK_SCORES); - HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, &score_entry_current); + HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, &score_entry_current); + } + else + { + DrawScoreInfo_Content(scores.last_entry_nr); + } SaveLevelSetup_SeriesInfo(); } @@ -5859,41 +5582,59 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) static void DrawScoreInfo_Content(int entry_nr) { struct ScoreEntry *entry = &scores.entry[entry_nr]; - char *pos_text = getHallOfFameRankText(entry_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[GAME_MODE_SCOREINFO]; - int spacing_para = menu.paragraph_spacing[GAME_MODE_SCOREINFO]; - int spacing_line = menu.line_spacing[GAME_MODE_SCOREINFO]; + char *pos_text = getHallOfFameRankText(entry_nr, 0); + char *tape_date = getHallOfFameTapeDateText(entry); + int font_head = MENU_INFO_FONT_HEAD; + int font_text = MENU_INFO_FONT_TEXT; + int font_foot = MENU_INFO_FONT_FOOT; + int spacing_para = menu.paragraph_spacing[GAME_MODE_SCOREINFO]; + int spacing_line = menu.line_spacing[GAME_MODE_SCOREINFO]; + int spacing_left = menu.left_spacing[GAME_MODE_SCOREINFO]; + int spacing_top = menu.top_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 ystep_para = getMenuTextStep(spacing_para, font_text); + int ystep_line = getMenuTextStep(spacing_line, font_text); + int xstart = mSX - SX + spacing_left; + int ystart = mSY - SY + spacing_top + getHeadlineSpacing(); int ybottom = mSY - SY + SYSIZE - menu.bottom_spacing[GAME_MODE_SCOREINFO]; - int xstart1 = mSX - SX + 2 * xstep; - int xstart2 = mSX - SX + 14 * xstep; + int xstart1 = xstart + xstep; + int xstart2 = xstart + xstep * 12; + int select_x = SX + xstart1; + int select_y1, select_y2; + int play_x, play_y; + int play_height = screen_gadget[SCREEN_CTRL_ID_PLAY_TAPE]->height; + boolean play_visible = !strEqual(tape_date, UNKNOWN_NAME); + int font_width = getFontWidth(font_text); + int font_height = getFontHeight(font_text); + int tape_date_width = getTextWidth(tape_date, font_text); + int pad_left = xstart2; + int pad_right = menu.right_spacing[GAME_MODE_SCOREINFO]; + int max_chars_per_line = (SXSIZE - pad_left - pad_right) / font_width; + int max_lines_per_text = 5; + int lines; ClearField(); - // redraw score selection buttons (which have just been erased) + // redraw level selection buttons (which have just been erased) RedrawScreenMenuGadgets(SCREEN_MASK_SCORES); drawChooseTreeHead(score_entries); drawChooseTreeInfo(score_entries); - DrawTextSCentered(ystart, font_title, "Score Information:"); - ystart += ystep_title; - DrawTextF(xstart1, ystart, font_head, "Level Set"); - DrawTextF(xstart2, ystart, font_text, leveldir_current->name); - ystart += ystep_line; + 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 Name"); - DrawTextF(xstart2, ystart, font_text, level.name); - ystart += ystep_para; + 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; + + select_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); @@ -5923,24 +5664,70 @@ static void DrawScoreInfo_Content(int entry_nr) ystart += ystep_line; } + ystart += ystep_line; + + play_x = SX + xstart2 + tape_date_width + font_width; + play_y = SY + ystart + (font_height - play_height) / 2; + + DrawTextF(xstart1, ystart, font_head, "Tape Date"); + DrawTextF(xstart2, ystart, font_text, tape_date); + ystart += ystep_line; + + 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; + + select_y2 = SY + ystart; + DrawTextSCentered(ybottom, font_foot, "Press any key or button to go back"); + + AdjustScoreInfoButtons_SelectScore(select_x, select_y1, select_y2); + AdjustScoreInfoButtons_PlayTape(play_x, play_y, play_visible); } static void DrawScoreInfo(int entry_nr) { scores.last_entry_nr = entry_nr; - - SetMainBackgroundImageIfDefined(IMG_BACKGROUND_SCOREINFO); + score_info_tape_play = FALSE; UnmapAllGadgets(); + FreeScreenGadgets(); + CreateScreenGadgets(); + FadeOut(REDRAW_FIELD); - // map gadgets for score info screen - MapScreenMenuGadgets(SCREEN_MASK_SCORES); + // needed if different viewport properties defined after playing score tape + ChangeViewportPropertiesIfNeeded(); + + // set this after "ChangeViewportPropertiesIfNeeded()" (which may reset it) + SetDrawDeactivationMask(REDRAW_NONE); + SetDrawBackgroundMask(REDRAW_FIELD); + + // needed if different background image defined after playing score tape + SetMainBackgroundImage(IMG_BACKGROUND_SCORES); + SetMainBackgroundImageIfDefined(IMG_BACKGROUND_SCOREINFO); + + // special compatibility handling for "Snake Bite" graphics set + if (strPrefix(leveldir_current->identifier, "snake_bite")) + ClearRectangle(gfx.background_bitmap, gfx.real_sx, gfx.real_sy + 64, + gfx.full_sxsize, gfx.full_sysize - 64); DrawScoreInfo_Content(entry_nr); + // map gadgets for score info screen + MapScreenMenuGadgets(SCREEN_MASK_SCORES_INFO); + FadeIn(REDRAW_FIELD); } @@ -5964,32 +5751,50 @@ static void HandleScoreInfo_SelectScore(int step, int direction) } } +static void HandleScoreInfo_PlayTape(void) +{ + if (!PlayScoreTape(scores.last_entry_nr)) + { + DrawScoreInfo_Content(scores.last_entry_nr); + + FadeIn(REDRAW_FIELD); + } +} + 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(scores.last_level_nr, FALSE); + + server_scores.updated = FALSE; + + DrawHallOfFame_setScoreEntries(); + + DrawScoreInfo_Content(scores.last_entry_nr); + } + if (button_screen_clicked) { PlaySound(SND_MENU_ITEM_SELECTING); SetGameStatus(GAME_MODE_SCORES); - DrawHallOfFame(level_nr); + DrawHallOfFame(scores.last_level_nr); } - else if (dx || dy) + else if (dx) { - HandleScoreInfo_SelectScore(1, SIGN(dx ? dx : dy)); + HandleHallOfFame_SelectLevel(1, SIGN(dx) * (ABS(dx) > 1 ? 10 : 1)); + } + else if (dy) + { + HandleScoreInfo_SelectScore(1, SIGN(dy) * (ABS(dy) > 1 ? 10 : 1)); } -} - -static void HandleHallOfFame_SelectLevelOrScore(int step, int direction) -{ - if (game_status == GAME_MODE_SCORES) - HandleHallOfFame_SelectLevel(step, direction); - else - HandleScoreInfo_SelectScore(step, direction); } @@ -6182,7 +5987,7 @@ static void execSetupGame_setScrollDelays(void) // set current scroll delay value to configured scroll delay value scroll_delay_current = - getTreeInfoFromIdentifier(scroll_delays,i_to_a(setup.scroll_delay_value)); + getTreeInfoFromIdentifier(scroll_delays, i_to_a(setup.scroll_delay_value)); // if that fails, set current scroll delay to reliable default value if (scroll_delay_current == NULL) @@ -6742,7 +6547,7 @@ static void execSetupSound(void) // set current volume value to configured volume value volume_simple_current = - getTreeInfoFromIdentifier(volumes_simple,i_to_a(setup.volume_simple)); + getTreeInfoFromIdentifier(volumes_simple, i_to_a(setup.volume_simple)); // if that fails, set current volume to reliable default value if (volume_simple_current == NULL) @@ -6810,7 +6615,7 @@ static void execSetupSound(void) // set current volume value to configured volume value volume_loops_current = - getTreeInfoFromIdentifier(volumes_loops,i_to_a(setup.volume_loops)); + getTreeInfoFromIdentifier(volumes_loops, i_to_a(setup.volume_loops)); // if that fails, set current volume to reliable default value if (volume_loops_current == NULL) @@ -6878,7 +6683,7 @@ static void execSetupSound(void) // set current volume value to configured volume value volume_music_current = - getTreeInfoFromIdentifier(volumes_music,i_to_a(setup.volume_music)); + getTreeInfoFromIdentifier(volumes_music, i_to_a(setup.volume_music)); // if that fails, set current volume to reliable default value if (volume_music_current == NULL) @@ -7444,7 +7249,12 @@ static void ToggleUseApiServerIfNeeded(void) runtime.use_api_server = setup.use_api_server; if (runtime.use_api_server) + { + if (setup.has_remaining_tapes) + setup.ask_for_uploading_tapes = TRUE; + CheckApiServerTasks(); + } } static void ModifyGameSpeedIfNeeded(void) @@ -7494,6 +7304,9 @@ static struct void *related_value; } hide_related_entry_list[] = { + { &setup.network_server_hostname, execGadgetNetworkServer }, + { &setup.network_server_hostname, &network_server_text }, + { &setup.scores_in_highscore_list, execSetupChooseScoresType }, { &setup.scores_in_highscore_list, &scores_type_text }, @@ -7572,6 +7385,21 @@ static struct { &setup.internal.menu_exit, execExitSetup }, { &setup.internal.menu_save_and_exit, execSaveAndExitSetup }, + { &setup.internal.menu_shortcuts_various, execSetupShortcuts1 }, + { &setup.internal.menu_shortcuts_focus, execSetupShortcuts2 }, + { &setup.internal.menu_shortcuts_tape, execSetupShortcuts3 }, + { &setup.internal.menu_shortcuts_sound, execSetupShortcuts4 }, + { &setup.internal.menu_shortcuts_snap, execSetupShortcuts5 }, + + { &setup.internal.info_title, execInfoTitleScreen }, + { &setup.internal.info_elements, execInfoElements }, + { &setup.internal.info_music, execInfoMusic }, + { &setup.internal.info_credits, execInfoCredits }, + { &setup.internal.info_program, execInfoProgram }, + { &setup.internal.info_version, execInfoVersion }, + { &setup.internal.info_levelset, execInfoLevelSet }, + { &setup.internal.info_exit, execExitInfo }, + { NULL, NULL } }; @@ -7616,8 +7444,8 @@ static struct TokenInfo setup_info_game[] = { 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:" }, - { TYPE_SWITCH, &setup.handicap, "Handicap:" }, - { TYPE_SWITCH, &setup.skip_levels, "Skip Unsolved Levels:" }, + { TYPE_SWITCH, &setup.handicap, "Force Solving Levels:" }, + { TYPE_SWITCH, &setup.skip_levels, "Allow Skipping Levels:" }, { TYPE_SWITCH, &setup.increment_levels,"Increment Solved Levels:" }, { TYPE_SWITCH, &setup.auto_play_next_level,"Auto-play Next Level:" }, { TYPE_SWITCH, &setup.count_score_after_game,"Count Score After Game:" }, @@ -7625,7 +7453,8 @@ static struct TokenInfo setup_info_game[] = { TYPE_YES_NO, &setup.ask_on_game_over, "Ask on Game Over:" }, { 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.autorecord, "Auto-Record When Playing:" }, + { TYPE_SWITCH, &setup.autorecord_after_replay, "Auto-Record After Replay:" }, { TYPE_SWITCH, &setup.auto_pause_on_start, "Start Game in Pause Mode:" }, { TYPE_ENTER_LIST, execSetupChooseGameSpeed, "Game Speed:" }, { TYPE_STRING, &game_speed_text, "" }, @@ -7698,7 +7527,7 @@ static struct TokenInfo setup_info_editor[] = static struct TokenInfo setup_info_graphics[] = { -#if !defined(PLATFORM_ANDROID) +#if !defined(PLATFORM_ANDROID) && !defined(PLATFORM_EMSCRIPTEN) { TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" }, { TYPE_ENTER_LIST, execSetupChooseWindowSize, "Window Scaling:" }, { TYPE_STRING, &window_size_text, "" }, @@ -7711,13 +7540,15 @@ static struct TokenInfo setup_info_graphics[] = { TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay:" }, { TYPE_STRING, &scroll_delay_text, "" }, #endif +#if !defined(PLATFORM_EMSCRIPTEN) { TYPE_ENTER_LIST, execSetupChooseVsyncMode, "Vertical Sync (VSync):" }, { TYPE_STRING, &vsync_mode_text, "" }, +#endif { TYPE_SWITCH, &setup.fade_screens, "Fade Screens:" }, { TYPE_SWITCH, &setup.quick_switch, "Quick Player Focus Switch:" }, { TYPE_SWITCH, &setup.quick_doors, "Quick Menu Doors:" }, { TYPE_SWITCH, &setup.show_titlescreen,"Show Title Screens:" }, - { TYPE_SWITCH, &setup.toons, "Show Menu Animations:" }, + { TYPE_SWITCH, &setup.toons, "Show Toons:" }, { TYPE_SWITCH, &setup.small_game_graphics, "Small Game Graphics:" }, { TYPE_YES_NO_AUTO, &setup.debug.xsn_mode, debug_xsn_mode }, { TYPE_EMPTY, NULL, "" }, @@ -7972,7 +7803,7 @@ static Key getSetupKey(void) { case EVENT_KEYPRESS: { - key = GetEventKey((KeyEvent *)&event, TRUE); + key = GetEventKey((KeyEvent *)&event); // press 'Escape' or 'Enter' to keep the existing key binding if (key == KSYM_Escape || key == KSYM_Return) @@ -8758,14 +8589,18 @@ static boolean CustomizeKeyboardMain(int player_nr) while (!finished) { Event event; + DelayCounter event_frame_delay = { GAME_FRAME_DELAY }; - if (NextValidEvent(&event)) + // reset frame delay counter directly after updating screen + ResetDelayCounter(&event_frame_delay); + + while (NextValidEvent(&event)) { switch (event.type) { case EVENT_KEYPRESS: { - Key key = GetEventKey((KeyEvent *)&event, FALSE); + Key key = GetEventKey((KeyEvent *)&event); // press 'Escape' to abort and keep the old key bindings if (key == KSYM_Escape) @@ -8830,6 +8665,10 @@ static boolean CustomizeKeyboardMain(int player_nr) HandleOtherEvents(&event); break; } + + // do not handle events for longer than standard frame delay period + if (DelayReached(&event_frame_delay)) + break; } BackToFront(); @@ -8852,8 +8691,7 @@ void CustomizeKeyboard(int player_nr) int font_height = getFontHeight(font_nr); int ypos1 = SYSIZE / 2 - font_height * 2; int ypos2 = SYSIZE / 2 - font_height * 1; - unsigned int wait_frame_delay = 0; - unsigned int wait_frame_delay_value = 2000; + DelayCounter wait_frame_delay = { 2000 }; ResetDelayCounter(&wait_frame_delay); @@ -8862,7 +8700,7 @@ void CustomizeKeyboard(int player_nr) DrawTextSCentered(ypos1, font_nr, "Keyboard"); DrawTextSCentered(ypos2, font_nr, "configured!"); - while (!DelayReached(&wait_frame_delay, wait_frame_delay_value)) + while (!DelayReached(&wait_frame_delay)) BackToFront(); ClearEventQueue(); @@ -8932,11 +8770,6 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) { 282, 210, MARKER_AXIS_Y, "righty", }, }; - unsigned int event_frame_delay = 0; - unsigned int event_frame_delay_value = GAME_FRAME_DELAY; - - ResetDelayCounter(&event_frame_delay); - if (!bitmaps_initialized) { controller = LoadCustomImage("joystick/controller.png"); @@ -9068,6 +8901,11 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) screen_initialized = TRUE; + DelayCounter event_frame_delay = { GAME_FRAME_DELAY }; + + // reset frame delay counter directly after updating screen + ResetDelayCounter(&event_frame_delay); + while (NextValidEvent(&event)) { switch (event.type) @@ -9201,7 +9039,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) } // do not handle events for longer than standard frame delay period - if (DelayReached(&event_frame_delay, event_frame_delay_value)) + if (DelayReached(&event_frame_delay)) break; } } @@ -9285,8 +9123,7 @@ void ConfigureJoystick(int player_nr) int font_height = getFontHeight(font_nr); int ypos1 = SYSIZE / 2 - font_height * 2; int ypos2 = SYSIZE / 2 - font_height * 1; - unsigned int wait_frame_delay = 0; - unsigned int wait_frame_delay_value = 2000; + DelayCounter wait_frame_delay = { 2000 }; ResetDelayCounter(&wait_frame_delay); @@ -9297,7 +9134,7 @@ void ConfigureJoystick(int player_nr) DrawTextSCentered(ypos1, font_nr, message1); DrawTextSCentered(ypos2, font_nr, message2); - while (!DelayReached(&wait_frame_delay, wait_frame_delay_value)) + while (!DelayReached(&wait_frame_delay)) BackToFront(); ClearEventQueue(); @@ -9414,7 +9251,7 @@ static boolean ConfigureVirtualButtonsMain(void) case EVENT_KEYPRESS: { - Key key = GetEventKey((KeyEvent *)&event, FALSE); + Key key = GetEventKey((KeyEvent *)&event); action = (key == KSYM_Escape ? ACTION_ESCAPE : key == KSYM_BackSpace || @@ -9615,8 +9452,7 @@ void ConfigureVirtualButtons(void) int font_height = getFontHeight(font_nr); int ypos1 = SYSIZE / 2 - font_height * 2; int ypos2 = SYSIZE / 2 - font_height * 1; - unsigned int wait_frame_delay = 0; - unsigned int wait_frame_delay_value = 2000; + DelayCounter wait_frame_delay = { 2000 }; ResetDelayCounter(&wait_frame_delay); @@ -9625,7 +9461,7 @@ void ConfigureVirtualButtons(void) DrawTextSCentered(ypos1, font_nr, "Virtual buttons"); DrawTextSCentered(ypos2, font_nr, "configured!"); - while (!DelayReached(&wait_frame_delay, wait_frame_delay_value)) + while (!DelayReached(&wait_frame_delay)) BackToFront(); ClearEventQueue(); @@ -9773,15 +9609,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) void HandleGameActions(void) { - if (setup.ask_on_game_over) - CheckGameOver(); - - if (game.restart_game_message != NULL) - { - RequestRestartGame(game.restart_game_message); - + if (CheckRestartGame()) return; - } if (game_status != GAME_MODE_PLAYING) return; @@ -9797,7 +9626,7 @@ void HandleGameActions(void) static struct { - int gfx_unpressed, gfx_pressed; + int gfx_unpressed, gfx_pressed, gfx_active; struct MenuPosInfo *pos; boolean *check_value; int gadget_id; @@ -9808,7 +9637,7 @@ static struct } menubutton_info[NUM_SCREEN_MENUBUTTONS] = { { - IMG_MENU_BUTTON_PREV_LEVEL, IMG_MENU_BUTTON_PREV_LEVEL_ACTIVE, + IMG_MENU_BUTTON_PREV_LEVEL, IMG_MENU_BUTTON_PREV_LEVEL_ACTIVE, -1, &menu.main.button.prev_level, NULL, SCREEN_CTRL_ID_PREV_LEVEL, SCREEN_MASK_MAIN, @@ -9816,7 +9645,7 @@ static struct FALSE, "previous level" }, { - IMG_MENU_BUTTON_NEXT_LEVEL, IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE, + IMG_MENU_BUTTON_NEXT_LEVEL, IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE, -1, &menu.main.button.next_level, NULL, SCREEN_CTRL_ID_NEXT_LEVEL, SCREEN_MASK_MAIN, @@ -9824,23 +9653,47 @@ static struct FALSE, "next level" }, { - IMG_MENU_BUTTON_PREV_LEVEL2, IMG_MENU_BUTTON_PREV_LEVEL2_ACTIVE, + IMG_MENU_BUTTON_PREV_LEVEL2, IMG_MENU_BUTTON_PREV_LEVEL2_ACTIVE, -1, &menu.scores.button.prev_level, NULL, SCREEN_CTRL_ID_PREV_LEVEL2, - SCREEN_MASK_SCORES, + 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, + IMG_MENU_BUTTON_NEXT_LEVEL2, IMG_MENU_BUTTON_NEXT_LEVEL2_ACTIVE, -1, &menu.scores.button.next_level, NULL, SCREEN_CTRL_ID_NEXT_LEVEL2, - SCREEN_MASK_SCORES, + SCREEN_MASK_SCORES | SCREEN_MASK_SCORES_INFO, GD_EVENT_PRESSED | GD_EVENT_REPEATED, FALSE, "next level" }, { - IMG_MENU_BUTTON_FIRST_LEVEL, IMG_MENU_BUTTON_FIRST_LEVEL_ACTIVE, + IMG_MENU_BUTTON_PREV_SCORE, IMG_MENU_BUTTON_PREV_SCORE_ACTIVE, -1, + &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, -1, + &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_PLAY_TAPE, IMG_MENU_BUTTON_PLAY_TAPE, -1, + &menu.scores.button.play_tape, NULL, + SCREEN_CTRL_ID_PLAY_TAPE, + SCREEN_MASK_SCORES_INFO, + GD_EVENT_RELEASED, + FALSE, "play tape" + }, + { + IMG_MENU_BUTTON_FIRST_LEVEL, IMG_MENU_BUTTON_FIRST_LEVEL_ACTIVE, -1, &menu.main.button.first_level, NULL, SCREEN_CTRL_ID_FIRST_LEVEL, SCREEN_MASK_MAIN, @@ -9848,7 +9701,7 @@ static struct FALSE, "first level" }, { - IMG_MENU_BUTTON_LAST_LEVEL, IMG_MENU_BUTTON_LAST_LEVEL_ACTIVE, + IMG_MENU_BUTTON_LAST_LEVEL, IMG_MENU_BUTTON_LAST_LEVEL_ACTIVE, -1, &menu.main.button.last_level, NULL, SCREEN_CTRL_ID_LAST_LEVEL, SCREEN_MASK_MAIN, @@ -9856,7 +9709,7 @@ static struct FALSE, "last level" }, { - IMG_MENU_BUTTON_LEVEL_NUMBER, IMG_MENU_BUTTON_LEVEL_NUMBER_ACTIVE, + IMG_MENU_BUTTON_LEVEL_NUMBER, IMG_MENU_BUTTON_LEVEL_NUMBER_ACTIVE, -1, &menu.main.button.level_number, NULL, SCREEN_CTRL_ID_LEVEL_NUMBER, SCREEN_MASK_MAIN, @@ -9864,7 +9717,7 @@ static struct FALSE, "level number" }, { - IMG_MENU_BUTTON_LEFT, IMG_MENU_BUTTON_LEFT_ACTIVE, + IMG_MENU_BUTTON_LEFT, IMG_MENU_BUTTON_LEFT_ACTIVE, -1, &menu.setup.button.prev_player, NULL, SCREEN_CTRL_ID_PREV_PLAYER, SCREEN_MASK_INPUT, @@ -9872,7 +9725,7 @@ static struct FALSE, "previous player" }, { - IMG_MENU_BUTTON_RIGHT, IMG_MENU_BUTTON_RIGHT_ACTIVE, + IMG_MENU_BUTTON_RIGHT, IMG_MENU_BUTTON_RIGHT_ACTIVE, -1, &menu.setup.button.next_player, NULL, SCREEN_CTRL_ID_NEXT_PLAYER, SCREEN_MASK_INPUT, @@ -9880,7 +9733,7 @@ static struct FALSE, "next player" }, { - IMG_MENU_BUTTON_INSERT_SOLUTION, IMG_MENU_BUTTON_INSERT_SOLUTION_ACTIVE, + IMG_MENU_BUTTON_INSERT_SOLUTION, IMG_MENU_BUTTON_INSERT_SOLUTION_ACTIVE, -1, &menu.main.button.insert_solution, NULL, SCREEN_CTRL_ID_INSERT_SOLUTION, SCREEN_MASK_MAIN_HAS_SOLUTION, @@ -9888,7 +9741,7 @@ static struct FALSE, "insert solution tape" }, { - IMG_MENU_BUTTON_PLAY_SOLUTION, IMG_MENU_BUTTON_PLAY_SOLUTION_ACTIVE, + IMG_MENU_BUTTON_PLAY_SOLUTION, IMG_MENU_BUTTON_PLAY_SOLUTION_ACTIVE, -1, &menu.main.button.play_solution, NULL, SCREEN_CTRL_ID_PLAY_SOLUTION, SCREEN_MASK_MAIN_HAS_SOLUTION, @@ -9896,7 +9749,16 @@ static struct FALSE, "play solution tape" }, { - IMG_MENU_BUTTON_SWITCH_ECS_AGA, IMG_MENU_BUTTON_SWITCH_ECS_AGA_ACTIVE, + IMG_MENU_BUTTON_LEVELSET_INFO, IMG_MENU_BUTTON_LEVELSET_INFO_PRESSED, + 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, -1, &menu.main.button.switch_ecs_aga, &setup.prefer_aga_graphics, SCREEN_CTRL_ID_SWITCH_ECS_AGA, SCREEN_MASK_MAIN, @@ -9904,7 +9766,7 @@ static struct FALSE, "switch ECS/AGA chipset" }, { - IMG_MENU_BUTTON_TOUCH_BACK, IMG_MENU_BUTTON_TOUCH_BACK, + IMG_MENU_BUTTON_TOUCH_BACK, IMG_MENU_BUTTON_TOUCH_BACK, -1, &menu.setup.button.touch_back, NULL, SCREEN_CTRL_ID_TOUCH_PREV_PAGE, SCREEN_MASK_TOUCH, @@ -9912,7 +9774,7 @@ static struct TRUE, "previous page" }, { - IMG_MENU_BUTTON_TOUCH_NEXT, IMG_MENU_BUTTON_TOUCH_NEXT, + IMG_MENU_BUTTON_TOUCH_NEXT, IMG_MENU_BUTTON_TOUCH_NEXT, -1, &menu.setup.button.touch_next, NULL, SCREEN_CTRL_ID_TOUCH_NEXT_PAGE, SCREEN_MASK_TOUCH, @@ -9920,7 +9782,7 @@ static struct TRUE, "next page" }, { - IMG_MENU_BUTTON_TOUCH_BACK2, IMG_MENU_BUTTON_TOUCH_BACK2, + IMG_MENU_BUTTON_TOUCH_BACK2, IMG_MENU_BUTTON_TOUCH_BACK2, -1, &menu.setup.button.touch_back2, NULL, SCREEN_CTRL_ID_TOUCH_PREV_PAGE2, SCREEN_MASK_TOUCH2, @@ -9928,7 +9790,7 @@ static struct TRUE, "previous page" }, { - IMG_MENU_BUTTON_TOUCH_NEXT2, IMG_MENU_BUTTON_TOUCH_NEXT2, + IMG_MENU_BUTTON_TOUCH_NEXT2, IMG_MENU_BUTTON_TOUCH_NEXT2, -1, &menu.setup.button.touch_next2, NULL, SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2, SCREEN_MASK_TOUCH2, @@ -10011,9 +9873,14 @@ static void CreateScreenMenubuttons(void) 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); + boolean is_score_button = (screen_mask & SCREEN_MASK_SCORES_INFO); + boolean has_gfx_pressed = (menubutton_info[i].gfx_pressed == + menubutton_info[i].gfx_unpressed); + boolean has_gfx_active = (menubutton_info[i].gfx_active != -1); Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed; + Bitmap *gd_bitmap_unpressed_alt, *gd_bitmap_pressed_alt; int gfx_unpressed, gfx_pressed; + int gfx_unpressed_alt, gfx_pressed_alt; int x, y, width, height; int gd_x1, gd_x2, gd_y1, gd_y2; int gd_x1a, gd_x2a, gd_y1a, gd_y2a; @@ -10021,6 +9888,10 @@ static void CreateScreenMenubuttons(void) int type = GD_TYPE_NORMAL_BUTTON; boolean checked = FALSE; + // do not use touch buttons if overlay touch buttons are disabled + if (is_touch_button && !setup.touch.overlay_buttons) + continue; + event_mask = menubutton_info[i].event_mask; x = (is_touch_button ? pos->x : mSX + GDI_ACTIVE_POS(pos->x)); @@ -10031,18 +9902,35 @@ static void CreateScreenMenubuttons(void) gfx_unpressed = menubutton_info[i].gfx_unpressed; gfx_pressed = menubutton_info[i].gfx_pressed; + gfx_unpressed_alt = gfx_unpressed; + gfx_pressed_alt = gfx_pressed; + + if (has_gfx_active) + { + gfx_unpressed_alt = menubutton_info[i].gfx_active; + + type = GD_TYPE_CHECK_BUTTON_2; + + if (menubutton_info[i].check_value != NULL) + checked = *menubutton_info[i].check_value; + } + gd_bitmap_unpressed = graphic_info[gfx_unpressed].bitmap; gd_bitmap_pressed = graphic_info[gfx_pressed].bitmap; + gd_bitmap_unpressed_alt = graphic_info[gfx_unpressed_alt].bitmap; + gd_bitmap_pressed_alt = graphic_info[gfx_pressed_alt].bitmap; + gd_x1 = graphic_info[gfx_unpressed].src_x; gd_y1 = graphic_info[gfx_unpressed].src_y; gd_x2 = graphic_info[gfx_pressed].src_x; gd_y2 = graphic_info[gfx_pressed].src_y; - gd_x1a = gd_x1; - gd_y1a = gd_y1; - gd_x2a = gd_x2; - gd_y2a = gd_y2; - if (is_touch_button) + gd_x1a = graphic_info[gfx_unpressed_alt].src_x; + gd_y1a = graphic_info[gfx_unpressed_alt].src_y; + gd_x2a = graphic_info[gfx_pressed_alt].src_x; + gd_y2a = graphic_info[gfx_pressed_alt].src_y; + + if (has_gfx_pressed) { gd_x2 += graphic_info[gfx_pressed].pressed_xoffset; gd_y2 += graphic_info[gfx_pressed].pressed_yoffset; @@ -10056,7 +9944,9 @@ static void CreateScreenMenubuttons(void) gd_y2a += graphic_info[gfx_pressed].active_yoffset; type = GD_TYPE_CHECK_BUTTON; - checked = *menubutton_info[i].check_value; + + if (menubutton_info[i].check_value != NULL) + checked = *menubutton_info[i].check_value; } if (is_score_button) @@ -10064,14 +9954,42 @@ static void CreateScreenMenubuttons(void) // if x/y set to -1, dynamically place buttons next to title text int title_width = getTextWidth(INFOTEXT_SCORE_ENTRY, FONT_TITLE_1); + // special compatibility handling for "Snake Bite" graphics set + if (strPrefix(leveldir_current->identifier, "snake_bite")) + title_width = strlen(INFOTEXT_SCORE_ENTRY) * 32; + + // use "SX" here to center buttons (ignore horizontal draw offset) 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); + // use "mSY" here to place buttons (respect vertical draw offset) if (pos->y == -1) - y = mSY + MENU_TITLE1_YPOS; + y = (id == SCREEN_CTRL_ID_PREV_LEVEL2 || + 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, @@ -10087,8 +10005,8 @@ static void CreateScreenMenubuttons(void) GDI_CHECKED, checked, GDI_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1, gd_y1, GDI_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2, gd_y2, - GDI_ALT_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1a, gd_y1a, - GDI_ALT_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2a, gd_y2a, + GDI_ALT_DESIGN_UNPRESSED, gd_bitmap_unpressed_alt, gd_x1a, gd_y1a, + GDI_ALT_DESIGN_PRESSED, gd_bitmap_pressed_alt, gd_x2a, gd_y2a, GDI_DIRECT_DRAW, FALSE, GDI_OVERLAY_TOUCH_BUTTON, is_touch_button, GDI_EVENT_MASK, event_mask, @@ -10395,6 +10313,33 @@ static void UnmapScreenTreeGadgets(void) UnmapScreenGadgets(); } +static void AdjustScoreInfoButtons_SelectScore(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 AdjustScoreInfoButtons_PlayTape(int x, int y, boolean visible) +{ + struct GadgetInfo *gi = screen_gadget[SCREEN_CTRL_ID_PLAY_TAPE]; + struct MenuPosInfo *pos = menubutton_info[SCREEN_CTRL_ID_PLAY_TAPE].pos; + + // set gadget position dynamically, pre-defined or off-screen + int xx = (visible ? (pos->x == -1 ? x : pos->x) : POS_OFFSCREEN); + int yy = (visible ? (pos->y == -1 ? y : pos->y) : POS_OFFSCREEN); + + ModifyGadget(gi, GDI_X, xx, GDI_Y, yy, GDI_END); + MapGadget(gi); // (needed if deactivated on last score page) +} + static void HandleScreenGadgets(struct GadgetInfo *gi) { int id = gi->custom_id; @@ -10414,11 +10359,23 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) break; case SCREEN_CTRL_ID_PREV_LEVEL2: - HandleHallOfFame_SelectLevelOrScore(step, -1); + HandleHallOfFame_SelectLevel(step, -1); break; case SCREEN_CTRL_ID_NEXT_LEVEL2: - HandleHallOfFame_SelectLevelOrScore(step, +1); + 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_PLAY_TAPE: + HandleScoreInfo_PlayTape(); break; case SCREEN_CTRL_ID_FIRST_LEVEL: @@ -10451,6 +10408,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(); @@ -10465,47 +10426,47 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) case SCREEN_CTRL_ID_SCROLL_UP: if (game_status == GAME_MODE_NAMES) - HandleChoosePlayerName(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); + HandleChoosePlayerName(0, 0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); else if (game_status == GAME_MODE_LEVELS) - HandleChooseLevelSet(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); + HandleChooseLevelSet(0, 0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); else if (game_status == GAME_MODE_LEVELNR) - HandleChooseLevelNr(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); + HandleChooseLevelNr(0, 0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); else if (game_status == GAME_MODE_SETUP) - HandleSetupScreen(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); + 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); + 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); + HandleHallOfFame(0, 0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); break; case SCREEN_CTRL_ID_SCROLL_DOWN: if (game_status == GAME_MODE_NAMES) - HandleChoosePlayerName(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); + HandleChoosePlayerName(0, 0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); else if (game_status == GAME_MODE_LEVELS) - HandleChooseLevelSet(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); + HandleChooseLevelSet(0, 0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); else if (game_status == GAME_MODE_LEVELNR) - HandleChooseLevelNr(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); + HandleChooseLevelNr(0, 0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); else if (game_status == GAME_MODE_SETUP) - HandleSetupScreen(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); + 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); + 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); + HandleHallOfFame(0, 0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); break; case SCREEN_CTRL_ID_SCROLL_VERTICAL: if (game_status == GAME_MODE_NAMES) - HandleChoosePlayerName(0,0,999,gi->event.item_position,MB_MENU_INITIALIZE); + HandleChoosePlayerName(0, 0, 999, gi->event.item_position, MB_MENU_INITIALIZE); else if (game_status == GAME_MODE_LEVELS) - HandleChooseLevelSet(0,0,999,gi->event.item_position,MB_MENU_INITIALIZE); + HandleChooseLevelSet(0, 0, 999, gi->event.item_position, MB_MENU_INITIALIZE); else if (game_status == GAME_MODE_LEVELNR) - HandleChooseLevelNr(0,0,999,gi->event.item_position,MB_MENU_INITIALIZE); + HandleChooseLevelNr(0, 0, 999, gi->event.item_position, MB_MENU_INITIALIZE); else if (game_status == GAME_MODE_SETUP) - HandleSetupScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE); + 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); + 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); + HandleHallOfFame(0, 0, 999, gi->event.item_position, MB_MENU_INITIALIZE); break; case SCREEN_CTRL_ID_NETWORK_SERVER: @@ -10538,6 +10499,12 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) } } +void HandleScreenGadgetKeys(Key key) +{ + if (key == setup.shortcut.tape_play) + HandleScreenGadgets(screen_gadget[SCREEN_CTRL_ID_PLAY_TAPE]); +} + void DumpScreenIdentifiers(void) { int i; @@ -10690,6 +10657,9 @@ static boolean OfferUploadTapes(void) "Upload all your tapes to the high score server now?", REQ_ASK)) return FALSE; + // when uploading tapes, make sure that high score server is enabled + runtime.use_api_server = setup.use_api_server = TRUE; + int num_tapes_uploaded = UploadTapes(); char message[100];