X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=0d7c6dd8079dae94976c2b85059b54430c2b8fb4;hb=4ed68b54ed9bed72d87eac4dd7b117fc4b8022d6;hp=cf0e528e3b69413649169776246ae4bf058502f2;hpb=d7b5b90fff5e2bcbaa71fc8a0086fab78ca4716b;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index cf0e528e..0d7c6dd8 100644 --- a/src/screens.c +++ b/src/screens.c @@ -25,233 +25,258 @@ #include "api.h" -#define DEBUG_JOYSTICKS 0 +#define DEBUG_JOYSTICKS 0 // screens on the info screen -#define INFO_MODE_MAIN 0 -#define INFO_MODE_TITLE 1 -#define INFO_MODE_ELEMENTS 2 -#define INFO_MODE_MUSIC 3 -#define INFO_MODE_CREDITS 4 -#define INFO_MODE_PROGRAM 5 -#define INFO_MODE_VERSION 6 -#define INFO_MODE_LEVELSET 7 +#define INFO_MODE_MAIN 0 +#define INFO_MODE_TITLE 1 +#define INFO_MODE_ELEMENTS 2 +#define INFO_MODE_MUSIC 3 +#define INFO_MODE_CREDITS 4 +#define INFO_MODE_PROGRAM 5 +#define INFO_MODE_VERSION 6 +#define INFO_MODE_LEVELSET 7 -#define MAX_INFO_MODES 8 +#define MAX_INFO_MODES 8 // screens on the setup screen // (must match GFX_SPECIAL_ARG_SETUP_* values as defined in src/main.h) // (should also match corresponding entries in src/conf_gfx.c) -#define SETUP_MODE_MAIN 0 -#define SETUP_MODE_GAME 1 -#define SETUP_MODE_ENGINES 2 -#define SETUP_MODE_EDITOR 3 -#define SETUP_MODE_GRAPHICS 4 -#define SETUP_MODE_SOUND 5 -#define SETUP_MODE_ARTWORK 6 -#define SETUP_MODE_INPUT 7 -#define SETUP_MODE_TOUCH 8 -#define SETUP_MODE_SHORTCUTS 9 -#define SETUP_MODE_SHORTCUTS_1 10 -#define SETUP_MODE_SHORTCUTS_2 11 -#define SETUP_MODE_SHORTCUTS_3 12 -#define SETUP_MODE_SHORTCUTS_4 13 -#define SETUP_MODE_SHORTCUTS_5 14 +#define SETUP_MODE_MAIN 0 +#define SETUP_MODE_GAME 1 +#define SETUP_MODE_ENGINES 2 +#define SETUP_MODE_EDITOR 3 +#define SETUP_MODE_GRAPHICS 4 +#define SETUP_MODE_SOUND 5 +#define SETUP_MODE_ARTWORK 6 +#define SETUP_MODE_INPUT 7 +#define SETUP_MODE_TOUCH 8 +#define SETUP_MODE_SHORTCUTS 9 +#define SETUP_MODE_SHORTCUTS_1 10 +#define SETUP_MODE_SHORTCUTS_2 11 +#define SETUP_MODE_SHORTCUTS_3 12 +#define SETUP_MODE_SHORTCUTS_4 13 +#define SETUP_MODE_SHORTCUTS_5 14 // sub-screens on the setup screen (generic) -#define SETUP_MODE_CHOOSE_ARTWORK 15 -#define SETUP_MODE_CHOOSE_OTHER 16 +#define SETUP_MODE_CHOOSE_ARTWORK 15 +#define SETUP_MODE_CHOOSE_OTHER 16 // sub-screens on the setup screen (specific) -#define SETUP_MODE_CHOOSE_SCORES_TYPE 17 -#define SETUP_MODE_CHOOSE_GAME_SPEED 18 -#define SETUP_MODE_CHOOSE_SCROLL_DELAY 19 -#define SETUP_MODE_CHOOSE_SNAPSHOT_MODE 20 -#define SETUP_MODE_CHOOSE_WINDOW_SIZE 21 -#define SETUP_MODE_CHOOSE_SCALING_TYPE 22 -#define SETUP_MODE_CHOOSE_RENDERING 23 -#define SETUP_MODE_CHOOSE_VSYNC 24 -#define SETUP_MODE_CHOOSE_GRAPHICS 25 -#define SETUP_MODE_CHOOSE_SOUNDS 26 -#define SETUP_MODE_CHOOSE_MUSIC 27 -#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE 28 -#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 29 -#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 30 -#define SETUP_MODE_CHOOSE_TOUCH_CONTROL 31 -#define SETUP_MODE_CHOOSE_MOVE_DISTANCE 32 -#define SETUP_MODE_CHOOSE_DROP_DISTANCE 33 -#define SETUP_MODE_CHOOSE_TRANSPARENCY 34 -#define SETUP_MODE_CHOOSE_GRID_XSIZE_0 35 -#define SETUP_MODE_CHOOSE_GRID_YSIZE_0 36 -#define SETUP_MODE_CHOOSE_GRID_XSIZE_1 37 -#define SETUP_MODE_CHOOSE_GRID_YSIZE_1 38 -#define SETUP_MODE_CONFIG_VIRT_BUTTONS 39 - -#define MAX_SETUP_MODES 40 - -#define MAX_MENU_MODES MAX(MAX_INFO_MODES, MAX_SETUP_MODES) +#define SETUP_MODE_CHOOSE_SCORES_TYPE 17 +#define SETUP_MODE_CHOOSE_GAME_SPEED 18 +#define SETUP_MODE_CHOOSE_SCROLL_DELAY 19 +#define SETUP_MODE_CHOOSE_SNAPSHOT_MODE 20 +#define SETUP_MODE_CHOOSE_WINDOW_SIZE 21 +#define SETUP_MODE_CHOOSE_SCALING_TYPE 22 +#define SETUP_MODE_CHOOSE_RENDERING 23 +#define SETUP_MODE_CHOOSE_VSYNC 24 +#define SETUP_MODE_CHOOSE_GRAPHICS 25 +#define SETUP_MODE_CHOOSE_SOUNDS 26 +#define SETUP_MODE_CHOOSE_MUSIC 27 +#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE 28 +#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 29 +#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 30 +#define SETUP_MODE_CHOOSE_TOUCH_CONTROL 31 +#define SETUP_MODE_CHOOSE_MOVE_DISTANCE 32 +#define SETUP_MODE_CHOOSE_DROP_DISTANCE 33 +#define SETUP_MODE_CHOOSE_TRANSPARENCY 34 +#define SETUP_MODE_CHOOSE_GRID_XSIZE_0 35 +#define SETUP_MODE_CHOOSE_GRID_YSIZE_0 36 +#define SETUP_MODE_CHOOSE_GRID_XSIZE_1 37 +#define SETUP_MODE_CHOOSE_GRID_YSIZE_1 38 +#define SETUP_MODE_CONFIG_VIRT_BUTTONS 39 + +#define MAX_SETUP_MODES 40 + +#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" -#define STR_SETUP_ENGINES "Game Engines" -#define STR_SETUP_EDITOR "Editor" -#define STR_SETUP_GRAPHICS "Graphics" -#define STR_SETUP_SOUND "Sound & Music" -#define STR_SETUP_ARTWORK "Custom Artwork" -#define STR_SETUP_INPUT "Input Devices" -#define STR_SETUP_TOUCH "Touch Controls" -#define STR_SETUP_SHORTCUTS "Key Shortcuts" -#define STR_SETUP_EXIT "Exit" -#define STR_SETUP_SAVE_AND_EXIT "Save and Exit" - -#define STR_SETUP_CHOOSE_SCORES_TYPE "Scores Type" -#define STR_SETUP_CHOOSE_GAME_SPEED "Game Speed" -#define STR_SETUP_CHOOSE_SCROLL_DELAY "Scroll Delay" -#define STR_SETUP_CHOOSE_SNAPSHOT_MODE "Snapshot Mode" -#define STR_SETUP_CHOOSE_WINDOW_SIZE "Window Scaling" -#define STR_SETUP_CHOOSE_SCALING_TYPE "Anti-Aliasing" -#define STR_SETUP_CHOOSE_RENDERING "Rendering Mode" -#define STR_SETUP_CHOOSE_VSYNC "VSync Mode" -#define STR_SETUP_CHOOSE_VOLUME_SIMPLE "Sound Volume" -#define STR_SETUP_CHOOSE_VOLUME_LOOPS "Loops Volume" -#define STR_SETUP_CHOOSE_VOLUME_MUSIC "Music Volume" -#define STR_SETUP_CHOOSE_TOUCH_CONTROL "Control Type" -#define STR_SETUP_CHOOSE_MOVE_DISTANCE "Move Distance" -#define STR_SETUP_CHOOSE_DROP_DISTANCE "Drop Distance" -#define STR_SETUP_CHOOSE_TRANSPARENCY "Transparency" -#define STR_SETUP_CHOOSE_GRID_XSIZE_0 "Horiz. Buttons" -#define STR_SETUP_CHOOSE_GRID_YSIZE_0 "Vert. Buttons" -#define STR_SETUP_CHOOSE_GRID_XSIZE_1 "Horiz. Buttons" -#define STR_SETUP_CHOOSE_GRID_YSIZE_1 "Vert. Buttons" +#define STR_SETUP_MAIN "Setup" +#define STR_SETUP_GAME "Game & Menu" +#define STR_SETUP_ENGINES "Game Engines" +#define STR_SETUP_EDITOR "Editor" +#define STR_SETUP_GRAPHICS "Graphics" +#define STR_SETUP_SOUND "Sound & Music" +#define STR_SETUP_ARTWORK "Custom Artwork" +#define STR_SETUP_INPUT "Input Devices" +#define STR_SETUP_TOUCH "Touch Controls" +#define STR_SETUP_SHORTCUTS "Key Shortcuts" +#define STR_SETUP_EXIT "Exit" +#define STR_SETUP_SAVE_AND_EXIT "Save and Exit" + +#define STR_SETUP_CHOOSE_SCORES_TYPE "Scores Type" +#define STR_SETUP_CHOOSE_GAME_SPEED "Game Speed" +#define STR_SETUP_CHOOSE_SCROLL_DELAY "Scroll Delay" +#define STR_SETUP_CHOOSE_SNAPSHOT_MODE "Snapshot Mode" +#define STR_SETUP_CHOOSE_WINDOW_SIZE "Window Scaling" +#define STR_SETUP_CHOOSE_SCALING_TYPE "Anti-Aliasing" +#define STR_SETUP_CHOOSE_RENDERING "Rendering Mode" +#define STR_SETUP_CHOOSE_VSYNC "VSync Mode" +#define STR_SETUP_CHOOSE_VOLUME_SIMPLE "Sound Volume" +#define STR_SETUP_CHOOSE_VOLUME_LOOPS "Loops Volume" +#define STR_SETUP_CHOOSE_VOLUME_MUSIC "Music Volume" +#define STR_SETUP_CHOOSE_TOUCH_CONTROL "Control Type" +#define STR_SETUP_CHOOSE_MOVE_DISTANCE "Move Distance" +#define STR_SETUP_CHOOSE_DROP_DISTANCE "Drop Distance" +#define STR_SETUP_CHOOSE_TRANSPARENCY "Transparency" +#define STR_SETUP_CHOOSE_GRID_XSIZE_0 "Horiz. Buttons" +#define STR_SETUP_CHOOSE_GRID_YSIZE_0 "Vert. Buttons" +#define STR_SETUP_CHOOSE_GRID_XSIZE_1 "Horiz. Buttons" +#define STR_SETUP_CHOOSE_GRID_YSIZE_1 "Vert. Buttons" // other screen text constants -#define STR_CHOOSE_TREE_EDIT "Edit" -#define MENU_CHOOSE_TREE_FONT(x) (FONT_TEXT_1 + (x)) -#define MENU_CHOOSE_TREE_COLOR(ti, a) TREE_COLOR(ti, a) +#define STR_CHOOSE_TREE_EDIT "Edit" +#define MENU_CHOOSE_TREE_FONT(x) (FONT_TEXT_1 + (x)) +#define MENU_CHOOSE_TREE_COLOR(ti, a) TREE_COLOR(ti, a) -#define TEXT_NEXT_PAGE "Press any key or button for next page" -#define TEXT_INFO_MENU "Press any key or button for info menu" +#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 -#define SETUPINPUT_SCREEN_POS_EMPTY2 12 -#define SETUPINPUT_SCREEN_POS_END 13 +#define SETUPINPUT_SCREEN_POS_START 0 +#define SETUPINPUT_SCREEN_POS_EMPTY1 3 +#define SETUPINPUT_SCREEN_POS_EMPTY2 12 +#define SETUPINPUT_SCREEN_POS_END 13 -#define MENU_SETUP_FONT_TITLE FONT_TEXT_1 -#define MENU_SETUP_FONT_TEXT FONT_TITLE_2 +#define MENU_SETUP_FONT_TITLE FONT_TEXT_1 +#define MENU_SETUP_FONT_TEXT FONT_TITLE_2 -#define MAX_SETUP_TEXT_INPUT_LEN 28 +#define MAX_SETUP_TEXT_INPUT_LEN 28 // for various menu stuff -#define MENU_SCREEN_START_XPOS 1 -#define MENU_SCREEN_START_YPOS 2 -#define MENU_SCREEN_VALUE_XPOS (SCR_FIELDX - 3) -#define MENU_SCREEN_TEXT2_XPOS (SCR_FIELDX - 2) -#define MENU_SCREEN_MAX_XPOS (SCR_FIELDX - 1) -#define MENU_TITLE1_YPOS 8 -#define MENU_TITLE2_YPOS 46 -#define MENU_INFO_FONT_TITLE FONT_TEXT_1 -#define MENU_INFO_FONT_HEAD FONT_TEXT_2 -#define MENU_INFO_FONT_TEXT FONT_TEXT_3 -#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_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_YBOTTOM (SYSIZE - MENU_SCREEN_INFO_SPACE_BOTTOM) -#define MENU_SCREEN_INFO_YSIZE (MENU_SCREEN_INFO_YBOTTOM - \ - MENU_SCREEN_INFO_YSTART2 - \ - TILEY / 2) -#define MAX_INFO_ELEMENTS_ON_SCREEN 128 -#define STD_INFO_ELEMENTS_ON_SCREEN (MENU_SCREEN_INFO_YSIZE / \ - MENU_SCREEN_INFO_YSTEP) -#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) -#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) +#define MENU_SCREEN_START_XPOS 1 +#define MENU_SCREEN_START_YPOS 2 +#define MENU_SCREEN_VALUE_XPOS (SCR_FIELDX - 3) +#define MENU_SCREEN_TEXT2_XPOS (SCR_FIELDX - 2) +#define MENU_SCREEN_MAX_XPOS (SCR_FIELDX - 1) +#define MENU_TITLE1_YPOS 8 +#define MENU_TITLE2_YPOS 46 +#define MENU_INFO_FONT_TITLE FONT_TEXT_1 +#define MENU_INFO_FONT_HEAD FONT_TEXT_2 +#define MENU_INFO_FONT_TEXT FONT_TEXT_3 +#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_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_YSTART - TILEY / 2) +#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 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] : \ + 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) // screen gadget identifiers -#define SCREEN_CTRL_ID_PREV_LEVEL 0 -#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_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_SWITCH_ECS_AGA 14 -#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE 15 -#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE 16 -#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE2 17 -#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2 18 - -#define NUM_SCREEN_MENUBUTTONS 19 - -#define SCREEN_CTRL_ID_SCROLL_UP 19 -#define SCREEN_CTRL_ID_SCROLL_DOWN 20 -#define SCREEN_CTRL_ID_SCROLL_VERTICAL 21 -#define SCREEN_CTRL_ID_NETWORK_SERVER 22 - -#define NUM_SCREEN_GADGETS 23 - -#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_SCORES_INFO (1 << 6) +#define SCREEN_CTRL_ID_PREV_LEVEL 0 +#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_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_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 -#define SC_MENUBUTTON_YSIZE TILEY +#define SC_MENUBUTTON_XSIZE TILEX +#define SC_MENUBUTTON_YSIZE TILEY -#define SC_SCROLLBUTTON_XSIZE TILEX -#define SC_SCROLLBUTTON_YSIZE TILEY +#define SC_SCROLLBUTTON_XSIZE TILEX +#define SC_SCROLLBUTTON_YSIZE TILEY -#define SC_SCROLLBAR_XPOS (SXSIZE - SC_SCROLLBUTTON_XSIZE) +#define SC_SCROLLBAR_XPOS (SXSIZE - SC_SCROLLBUTTON_XSIZE) -#define SC_SCROLL_VERTICAL_XSIZE SC_SCROLLBUTTON_XSIZE -#define SC_SCROLL_VERTICAL_YSIZE ((MAX_MENU_ENTRIES_ON_SCREEN - 2) * \ - SC_SCROLLBUTTON_YSIZE) +#define SC_SCROLL_VERTICAL_XSIZE SC_SCROLLBUTTON_XSIZE +#define SC_SCROLL_VERTICAL_YSIZE ((MAX_MENU_ENTRIES_ON_SCREEN - 2) * \ + SC_SCROLLBUTTON_YSIZE) -#define SC_SCROLL_UP_XPOS SC_SCROLLBAR_XPOS -#define SC_SCROLL_UP_YPOS (2 * SC_SCROLLBUTTON_YSIZE) +#define SC_SCROLL_UP_XPOS SC_SCROLLBAR_XPOS +#define SC_SCROLL_UP_YPOS (2 * SC_SCROLLBUTTON_YSIZE) -#define SC_SCROLL_VERTICAL_XPOS SC_SCROLLBAR_XPOS -#define SC_SCROLL_VERTICAL_YPOS (SC_SCROLL_UP_YPOS + \ - SC_SCROLLBUTTON_YSIZE) +#define SC_SCROLL_VERTICAL_XPOS SC_SCROLLBAR_XPOS +#define SC_SCROLL_VERTICAL_YPOS (SC_SCROLL_UP_YPOS + \ + SC_SCROLLBUTTON_YSIZE) -#define SC_SCROLL_DOWN_XPOS SC_SCROLLBAR_XPOS -#define SC_SCROLL_DOWN_YPOS (SC_SCROLL_VERTICAL_YPOS + \ - SC_SCROLL_VERTICAL_YSIZE) +#define SC_SCROLL_DOWN_XPOS SC_SCROLLBAR_XPOS +#define SC_SCROLL_DOWN_YPOS (SC_SCROLL_VERTICAL_YPOS + \ + SC_SCROLL_VERTICAL_YSIZE) -#define SC_BORDER_SIZE 14 +#define SC_BORDER_SIZE 14 // forward declarations of internal functions @@ -285,9 +310,8 @@ static void HandleInfoScreen_Main(int, int, int, int, 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_Credits(int, int, int); -static void HandleInfoScreen_Program(int, int, int); static void HandleInfoScreen_Version(int); +static void HandleInfoScreen_Generic(int, int, int); static void ModifyGameSpeedIfNeeded(void); static void DisableVsyncIfNeeded(void); @@ -311,12 +335,20 @@ static void DrawHallOfFame_setScoreEntries(void); static void HandleHallOfFame_SelectLevel(int, int); static char *getHallOfFameRankText(int, int); static char *getHallOfFameScoreText(int, int); +static char *getInfoScreenTitle_Generic(void); +static int getInfoScreenBackgroundImage_Generic(void); +static int getInfoScreenBackgroundSound_Generic(void); +static int getInfoScreenBackgroundMusic_Generic(void); + +static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *); 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; @@ -405,15 +437,15 @@ static struct StringValueTextInfo scaling_types_list[] = static struct StringValueTextInfo rendering_modes_list[] = { - { STR_SPECIAL_RENDERING_OFF, "Off (May show artifacts, fast)" }, - { STR_SPECIAL_RENDERING_BITMAP, "Bitmap/Texture mode (slower)" }, + { STR_SPECIAL_RENDERING_OFF, "Off (May show artifacts, fast)" }, + { STR_SPECIAL_RENDERING_BITMAP, "Bitmap/Texture mode (slower)" }, #if DEBUG // this mode may work under certain conditions, but does not work on Windows - { STR_SPECIAL_RENDERING_TARGET, "Target Texture mode (slower)" }, + { STR_SPECIAL_RENDERING_TARGET, "Target Texture mode (slower)" }, #endif - { STR_SPECIAL_RENDERING_DOUBLE, "Double Texture mode (slower)" }, + { STR_SPECIAL_RENDERING_DOUBLE, "Double Texture mode (slower)" }, - { NULL, NULL }, + { NULL, NULL }, }; static struct StringValueTextInfo vsync_modes_list[] = @@ -593,65 +625,60 @@ static struct ValueTextInfo grid_sizes_list[] = static int align_xoffset = 0; static int align_yoffset = 0; -#define DRAW_MODE(s) ((s) >= GAME_MODE_MAIN && \ - (s) <= GAME_MODE_SETUP ? (s) : \ - (s) == GAME_MODE_PSEUDO_TYPENAME ? \ - GAME_MODE_MAIN : \ - (s) == GAME_MODE_PSEUDO_TYPENAMES ? \ +#define DRAW_MODE(s) ((s) >= GAME_MODE_MAIN && \ + (s) <= GAME_MODE_SETUP ? (s) : \ + (s) == GAME_MODE_PSEUDO_TYPENAME ? \ + GAME_MODE_MAIN : \ + (s) == GAME_MODE_PSEUDO_TYPENAMES ? \ GAME_MODE_NAMES : GAME_MODE_DEFAULT) // (there are no draw offset definitions needed for INFO_MODE_TITLE) -#define DRAW_MODE_INFO(i) ((i) >= INFO_MODE_TITLE && \ - (i) <= INFO_MODE_LEVELSET ? (i) : \ +#define DRAW_MODE_INFO(i) ((i) >= INFO_MODE_TITLE && \ + (i) <= INFO_MODE_LEVELSET ? (i) : \ INFO_MODE_MAIN) -#define DRAW_MODE_SETUP(i) ((i) >= SETUP_MODE_MAIN && \ - (i) <= SETUP_MODE_SHORTCUTS_5 ? (i) : \ - (i) >= SETUP_MODE_CHOOSE_GRAPHICS && \ - (i) <= SETUP_MODE_CHOOSE_MUSIC ? \ - SETUP_MODE_CHOOSE_ARTWORK : \ +#define DRAW_MODE_SETUP(i) ((i) >= SETUP_MODE_MAIN && \ + (i) <= SETUP_MODE_SHORTCUTS_5 ? (i) : \ + (i) >= SETUP_MODE_CHOOSE_GRAPHICS && \ + (i) <= SETUP_MODE_CHOOSE_MUSIC ? \ + SETUP_MODE_CHOOSE_ARTWORK : \ SETUP_MODE_CHOOSE_OTHER) -#define DRAW_XOFFSET_INFO(i) (DRAW_MODE_INFO(i) == INFO_MODE_MAIN ? \ - menu.draw_xoffset[GAME_MODE_INFO] : \ +#define DRAW_XOFFSET_INFO(i) (DRAW_MODE_INFO(i) == INFO_MODE_MAIN ? \ + menu.draw_xoffset[GAME_MODE_INFO] : \ menu.draw_xoffset_info[DRAW_MODE_INFO(i)]) -#define DRAW_YOFFSET_INFO(i) (DRAW_MODE_INFO(i) == INFO_MODE_MAIN ? \ - menu.draw_yoffset[GAME_MODE_INFO] : \ +#define DRAW_YOFFSET_INFO(i) (DRAW_MODE_INFO(i) == INFO_MODE_MAIN ? \ + menu.draw_yoffset[GAME_MODE_INFO] : \ menu.draw_yoffset_info[DRAW_MODE_INFO(i)]) -#define EXTRA_SPACING_INFO(i) (DRAW_MODE_INFO(i) == INFO_MODE_MAIN ? \ - menu.extra_spacing[GAME_MODE_INFO] : \ +#define EXTRA_SPACING_INFO(i) (DRAW_MODE_INFO(i) == INFO_MODE_MAIN ? \ + menu.extra_spacing[GAME_MODE_INFO] : \ menu.extra_spacing_info[DRAW_MODE_INFO(i)]) -#define DRAW_XOFFSET_SETUP(i) (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \ - menu.draw_xoffset[GAME_MODE_SETUP] : \ +#define DRAW_XOFFSET_SETUP(i) (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \ + menu.draw_xoffset[GAME_MODE_SETUP] : \ menu.draw_xoffset_setup[DRAW_MODE_SETUP(i)]) -#define DRAW_YOFFSET_SETUP(i) (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \ - menu.draw_yoffset[GAME_MODE_SETUP] : \ +#define DRAW_YOFFSET_SETUP(i) (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \ + menu.draw_yoffset[GAME_MODE_SETUP] : \ menu.draw_yoffset_setup[DRAW_MODE_SETUP(i)]) -#define EXTRA_SPACING_SETUP(i) (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \ - menu.extra_spacing[GAME_MODE_SETUP] : \ +#define EXTRA_SPACING_SETUP(i) (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \ + menu.extra_spacing[GAME_MODE_SETUP] : \ menu.extra_spacing_setup[DRAW_MODE_SETUP(i)]) #define EXTRA_SPACING_SCORES(i) (EXTRA_SPACING_INFO(i)) #define EXTRA_SPACING_SCOREINFO(i) (menu.extra_spacing[GAME_MODE_SCOREINFO]) -#define DRAW_XOFFSET(s) ((s) == GAME_MODE_INFO ? \ - DRAW_XOFFSET_INFO(info_mode) : \ - (s) == GAME_MODE_SETUP ? \ - DRAW_XOFFSET_SETUP(setup_mode) : \ +#define DRAW_XOFFSET(s) ((s) == GAME_MODE_INFO ? DRAW_XOFFSET_INFO(info_mode) : \ + (s) == GAME_MODE_SETUP ? DRAW_XOFFSET_SETUP(setup_mode) : \ menu.draw_xoffset[DRAW_MODE(s)]) -#define DRAW_YOFFSET(s) ((s) == GAME_MODE_INFO ? \ - DRAW_YOFFSET_INFO(info_mode) : \ - (s) == GAME_MODE_SETUP ? \ - DRAW_YOFFSET_SETUP(setup_mode) : \ + +#define DRAW_YOFFSET(s) ((s) == GAME_MODE_INFO ? DRAW_YOFFSET_INFO(info_mode) : \ + (s) == GAME_MODE_SETUP ? DRAW_YOFFSET_SETUP(setup_mode) : \ menu.draw_yoffset[DRAW_MODE(s)]) -#define EXTRA_SPACING(s) ((s) == GAME_MODE_INFO ? \ - EXTRA_SPACING_INFO(info_mode) : \ - (s) == GAME_MODE_SETUP ? \ - EXTRA_SPACING_SETUP(setup_mode) : \ - (s) == GAME_MODE_SCORES ? \ - EXTRA_SPACING_SCORES(info_mode) : \ + +#define EXTRA_SPACING(s) ((s) == GAME_MODE_INFO ? EXTRA_SPACING_INFO(info_mode) : \ + (s) == GAME_MODE_SETUP ? EXTRA_SPACING_SETUP(setup_mode) : \ + (s) == GAME_MODE_SCORES ? EXTRA_SPACING_SCORES(info_mode) : \ menu.extra_spacing[DRAW_MODE(s)]) #define mSX (SX + DRAW_XOFFSET(game_status)) @@ -664,14 +691,12 @@ static int align_yoffset = 0; menu.list_size[game_status] : \ MAX_MENU_ENTRIES_ON_SCREEN) -#define IN_VIS_MENU(x, y) IN_FIELD(x, y, SCR_FIELDX, \ - NUM_MENU_ENTRIES_ON_SCREEN) +#define IN_VIS_MENU(x, y) IN_FIELD(x, y, SCR_FIELDX, NUM_MENU_ENTRIES_ON_SCREEN) // title display and control definitions -#define MAX_NUM_TITLE_SCREENS (2 * MAX_NUM_TITLE_IMAGES + \ - 2 * MAX_NUM_TITLE_MESSAGES) +#define MAX_NUM_TITLE_SCREENS (2 * MAX_NUM_TITLE_IMAGES + 2 * MAX_NUM_TITLE_MESSAGES) #define NO_DIRECT_LEVEL_SELECT (-1) @@ -690,17 +715,6 @@ struct TitleControlInfo struct TitleControlInfo title_controls[MAX_NUM_TITLE_SCREENS]; -// credits screens definitions - -static int num_credits_screens = 0; -static boolean use_global_credits_screens = FALSE; - - -// program info screens definitions - -static int num_program_info_screens = 0; - - // main menu display and control definitions #define MAIN_CONTROL_NAME 0 @@ -928,6 +942,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; @@ -1123,8 +1142,13 @@ static void InitializeTitleControls_CheckTitleInfo(boolean initial) int graphic = getTitleScreenGraphic(i, initial); Bitmap *bitmap = graphic_info[graphic].bitmap; int sort_priority = graphic_info[graphic].sort_priority; + boolean has_title_screen = (bitmap != NULL); - if (bitmap != NULL) + // check for optional title screen of native BD style level set + if (!has_title_screen && level.game_engine_type == GAME_ENGINE_TYPE_BD && !initial && i == 0) + has_title_screen = (GetTitleScreen_BD() != NULL); + + if (has_title_screen) InitializeTitleControlsExt_AddTitleInfo(TRUE, initial, i, sort_priority); } @@ -1456,6 +1480,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) @@ -1524,6 +1553,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); @@ -1533,22 +1571,59 @@ 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; int src_y = graphic_info[graphic].src_y; int dst_x, dst_y; + // check for optional title screen of native BD style level set + if (bitmap == NULL && level.game_engine_type == GAME_ENGINE_TYPE_BD && !initial && nr == 0) + { + bitmap = GetTitleScreen_BD(); + + if (bitmap != NULL) + { + width = bitmap->width; + height = bitmap->height; + src_x = 0; + src_y = 0; + } + } + if (bitmap == NULL) return; @@ -1575,7 +1650,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); @@ -1705,11 +1780,19 @@ void DrawMainMenu(void) 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; @@ -1718,6 +1801,18 @@ void DrawMainMenu(void) // store valid level series information leveldir_last_valid = leveldir_current; + // store first level of this level set for "level_nr" style animations + SetAnimationFirstLevel(leveldir_current->first_level); + + // level_nr may have been set to value over handicap with level editor + if (setup.handicap && level_nr > leveldir_current->handicap_level) + level_nr = leveldir_current->handicap_level; + + LoadLevel(level_nr); + LoadScore(level_nr); + + SaveLevelSetup_SeriesInfo(); + // needed if last screen (level choice) changed graphics, sounds or music ReloadCustomArtwork(0); @@ -1743,15 +1838,6 @@ void DrawMainMenu(void) SetDrawtoField(DRAW_TO_BACKBUFFER); - // level_nr may have been set to value over handicap with level editor - if (setup.handicap && level_nr > leveldir_current->handicap_level) - level_nr = leveldir_current->handicap_level; - - LoadLevel(level_nr); - LoadScore(level_nr); - - SaveLevelSetup_SeriesInfo(); - // set this after "ChangeViewportPropertiesIfNeeded()" (which may reset it) SetDrawDeactivationMask(REDRAW_NONE); SetDrawBackgroundMask(REDRAW_FIELD); @@ -1792,6 +1878,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); @@ -1853,7 +1940,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, @@ -2063,8 +2150,10 @@ static void HandleMainMenu_SelectLevel(int step, int direction, if (setup.handicap && new_level_nr > leveldir_current->handicap_level) { // 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)) + // (also, skipping BD style intermission levels is always possible) + if (new_level_nr == old_level_nr + 1 && + (level.bd_intermission || + (setup.skip_levels && Request("Level still unsolved! Skip it anyway?", REQ_ASK)))) { leveldir_current->handicap_level++; SaveLevelSetup_SeriesInfo(); @@ -2387,15 +2476,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 } }; @@ -2421,6 +2510,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) @@ -2525,6 +2686,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; @@ -2553,10 +2726,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++) @@ -2919,15 +3095,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); @@ -2935,27 +3119,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, TEXT_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; @@ -2967,10 +3151,6 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) for (i = 0; i < NUM_INFO_ELEMENTS_ON_SCREEN; i++) infoscreen_step[i] = infoscreen_frame[i] = 0; - ClearField(); - DrawHeadline(); - - DrawTextSCentered(ystart1, font_title, "The Game Elements:"); DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_PAGE); FrameCounter = 0; @@ -2993,7 +3173,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; @@ -3016,39 +3199,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++; } @@ -3078,15 +3260,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); @@ -3103,18 +3294,30 @@ 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(); - DrawTextBuffer(xstart, ystart + ypos * ystep, text, font_nr, - max_chars_per_line, -1, max_lines_per_text, 0, -1, - TRUE, FALSE, FALSE); + int size_lines_printed = num_lines_printed * line_height - line_spacing; + int yoffset = (row_height - size_lines_printed) / 2; + + 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(); } @@ -3127,6 +3330,9 @@ static void DrawInfoScreen_Elements(void) { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS); + UnmapAllGadgets(); + FadeInfoSoundsAndMusic(); + FadeOut(REDRAW_FIELD); LoadHelpAnimInfo(); @@ -3134,18 +3340,22 @@ static void DrawInfoScreen_Elements(void) HandleInfoScreen_Elements(0, 0, MB_MENU_INITIALIZE); + PlayInfoSoundsAndMusic(); + FadeIn(REDRAW_FIELD); } 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; @@ -3187,7 +3397,7 @@ void HandleInfoScreen_Elements(int dx, int dy, int button) if (page < 0 || page >= num_pages) { - FadeMenuSoundsAndMusic(); + FadeInfoSoundsAndMusic(); info_mode = INFO_MODE_MAIN; DrawInfoScreen(); @@ -3201,6 +3411,9 @@ void HandleInfoScreen_Elements(int dx, int dy, int button) if (button != MB_MENU_INITIALIZE) FadeOut(REDRAW_FIELD); + ClearField(); + + DrawInfoScreen_Headline(page, num_pages, TRUE); DrawInfoScreen_HelpAnim(page * anims_per_page, num_anims, TRUE); if (button != MB_MENU_INITIALIZE) @@ -3208,11 +3421,11 @@ void HandleInfoScreen_Elements(int dx, int dy, 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(); } } @@ -3220,10 +3433,13 @@ static void DrawInfoScreen_Music(void) { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC); + UnmapAllGadgets(); + FadeOut(REDRAW_FIELD); ClearField(); - DrawHeadline(); + + DrawInfoScreen_Headline(0, 1, TRUE); LoadMusicInfo(); @@ -3235,19 +3451,30 @@ static void DrawInfoScreen_Music(void) void HandleInfoScreen_Music(int dx, int dy, int button) { static struct MusicFileInfo *list = NULL; + static int num_screens = 0; + static int screen_nr = 0; int font_title = MENU_INFO_FONT_TITLE; int font_head = MENU_INFO_FONT_HEAD; int font_text = MENU_INFO_FONT_TEXT; int font_foot = MENU_INFO_FONT_FOOT; - int spacing_title = menu.headline1_spacing_info[info_mode]; - int spacing_head = menu.headline2_spacing_info[info_mode]; - int ystep_title = getMenuTextStep(spacing_title, font_title); - int ystep_head = getMenuTextStep(spacing_head, font_head); - int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART1; + int spacing_head = menu.headline2_spacing_info[info_mode]; + int ystep_head = getMenuTextStep(spacing_head, font_head); + int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART; int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; if (button == MB_MENU_INITIALIZE) { + struct MusicFileInfo *list_ptr = music_file_info; + + num_screens = 0; + screen_nr = 0; + + while (list_ptr != NULL) + { + list_ptr = list_ptr->next; + num_screens++; + } + list = music_file_info; if (list == NULL) @@ -3255,10 +3482,11 @@ void HandleInfoScreen_Music(int dx, int dy, int button) FadeMenuSoundsAndMusic(); ClearField(); - DrawHeadline(); + + DrawInfoScreen_Headline(0, 1, TRUE); DrawTextSCentered(ystart, font_title, "No music info for this level set."); - DrawTextSCentered(ybottom, font_foot, TEXT_INFO_MENU); + DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_MENU); return; } @@ -3282,7 +3510,10 @@ void HandleInfoScreen_Music(int dx, int dy, int button) PlaySound(SND_MENU_ITEM_SELECTING); if (list != NULL) + { list = (dx < 0 ? list->prev : list->next); + screen_nr += (dx < 0 ? -1 : +1); + } } if (list == NULL) @@ -3304,7 +3535,8 @@ void HandleInfoScreen_Music(int dx, int dy, int button) FadeOut(REDRAW_FIELD); ClearField(); - DrawHeadline(); + + DrawInfoScreen_Headline(screen_nr, num_screens, TRUE); if (list->is_sound) { @@ -3314,8 +3546,6 @@ void HandleInfoScreen_Music(int dx, int dy, int button) PlaySoundLoop(sound); else PlaySound(sound); - - DrawTextSCentered(ystart, font_title, "The Game Background Sounds:"); } else { @@ -3325,19 +3555,16 @@ void HandleInfoScreen_Music(int dx, int dy, int button) PlayMusicLoop(music); else PlayMusic(music); - - DrawTextSCentered(ystart, font_title, "The Game Background Music:"); } - ystart += ystep_title; - if (!strEqual(list->title, UNKNOWN_NAME)) { if (!strEqual(list->title_header, UNKNOWN_NAME)) - { DrawTextSCentered(ystart, font_head, list->title_header); - ystart += ystep_head; - } + else + DrawTextSCentered(ystart, font_head, "Track"); + + ystart += ystep_head; DrawTextFCentered(ystart, font_text, "\"%s\"", list->title); ystart += ystep_head; @@ -3382,284 +3609,74 @@ void HandleInfoScreen_Music(int dx, int dy, int button) ystart += ystep_head; } - DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_PAGE); - - if (button != MB_MENU_INITIALIZE) - FadeIn(REDRAW_FIELD); - } - - if (list != NULL && list->is_sound && IS_LOOP_SOUND(list->music)) - PlaySoundLoop(list->music); -} - -static void DrawInfoScreen_CreditsScreen(int screen_nr) -{ - int font_title = MENU_INFO_FONT_TITLE; - int font_text = MENU_INFO_FONT_TEXT; - int font_foot = MENU_INFO_FONT_FOOT; - int spacing_title = menu.headline1_spacing_info[info_mode]; - int spacing_line = menu.line_spacing_info[info_mode]; - int ystep_title = getMenuTextStep(spacing_title, font_title); - int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART1; - int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; - - ClearField(); - DrawHeadline(); - - DrawTextSCentered(ystart, font_title, "Credits:"); - - char *filename = getCreditsFilename(screen_nr, use_global_credits_screens); - int width = SXSIZE; - int height = MENU_SCREEN_INFO_YBOTTOM - MENU_SCREEN_INFO_YSTART1; - 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); - boolean autowrap = FALSE; - boolean centered = TRUE; - boolean parse_comments = TRUE; - - DrawTextFile(mSX + padx, mSY + MENU_SCREEN_INFO_YSTART1 + ystep_title, - filename, font_text, chars, -1, lines, line_spacing, -1, - autowrap, centered, parse_comments); - - boolean last_screen = (screen_nr == num_credits_screens - 1); - char *text_foot = (last_screen ? TEXT_INFO_MENU : TEXT_NEXT_PAGE); - - DrawTextSCentered(ybottom, font_foot, text_foot); -} - -static void DrawInfoScreen_Credits(void) -{ - SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_CREDITS); - - FadeMenuSoundsAndMusic(); - - FadeOut(REDRAW_FIELD); - - HandleInfoScreen_Credits(0, 0, MB_MENU_INITIALIZE); - - FadeIn(REDRAW_FIELD); -} - -void HandleInfoScreen_Credits(int dx, int dy, int button) -{ - static int screen_nr = 0; - - if (button == MB_MENU_INITIALIZE) - { - int i; - - // determine number of (global or level set specific) credits screens - for (i = 0; i < 2; i++) + if (!strEqual(list->played, UNKNOWN_NAME)) { - num_credits_screens = 0; - use_global_credits_screens = i; + if (!strEqual(list->played_header, UNKNOWN_NAME)) + DrawTextSCentered(ystart, font_head, list->played_header); + else + DrawTextSCentered(ystart, font_head, "played in"); - while (getCreditsFilename(num_credits_screens, - use_global_credits_screens) != NULL) - num_credits_screens++; + ystart += ystep_head; - if (num_credits_screens > 0) - break; + DrawTextFCentered(ystart, font_text, "%s", list->played); + ystart += ystep_head; } - - if (num_credits_screens == 0) + else if (!list->is_sound) { - int font_title = MENU_INFO_FONT_TITLE; - int font_foot = MENU_INFO_FONT_FOOT; - int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART1; - int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; - - ClearField(); - DrawHeadline(); - - DrawTextSCentered(ystart, font_title, "No credits for this level set."); - DrawTextSCentered(ybottom, font_foot, TEXT_INFO_MENU); - - return; - } + int music_level_nr = -1; + int i; - screen_nr = 0; - - DrawInfoScreen_CreditsScreen(screen_nr); - } - else if (button == MB_MENU_LEAVE) - { - PlaySound(SND_MENU_ITEM_SELECTING); - - info_mode = INFO_MODE_MAIN; - DrawInfoScreen(); - - return; - } - else if (button == MB_MENU_CHOICE || dx) - { - PlaySound(SND_MENU_ITEM_SELECTING); - - screen_nr += (dx < 0 ? -1 : +1); - - if (screen_nr < 0 || screen_nr >= num_credits_screens) - { - FadeMenuSoundsAndMusic(); - - info_mode = INFO_MODE_MAIN; - DrawInfoScreen(); - - return; - } - - FadeSetNextScreen(); - - FadeOut(REDRAW_FIELD); - - DrawInfoScreen_CreditsScreen(screen_nr); - - FadeIn(REDRAW_FIELD); - } - else - { - PlayMenuSoundIfLoop(); - } -} - -static void DrawInfoScreen_ProgramScreen(int screen_nr) -{ - int font_title = MENU_INFO_FONT_TITLE; - int font_text = MENU_INFO_FONT_TEXT; - int font_foot = MENU_INFO_FONT_FOOT; - int spacing_title = menu.headline1_spacing_info[info_mode]; - int spacing_line = menu.line_spacing_info[info_mode]; - int ystep_title = getMenuTextStep(spacing_title, font_title); - int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART1; - int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; - - ClearField(); - DrawHeadline(); - - DrawTextSCentered(ystart, font_title, "Program Information:"); - - char *filename = getProgramInfoFilename(screen_nr); - int width = SXSIZE; - int height = MENU_SCREEN_INFO_YBOTTOM - MENU_SCREEN_INFO_YSTART1; - 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); - boolean autowrap = FALSE; - boolean centered = TRUE; - boolean parse_comments = TRUE; - - DrawTextFile(mSX + padx, mSY + MENU_SCREEN_INFO_YSTART1 + ystep_title, - filename, font_text, chars, -1, lines, line_spacing, -1, - autowrap, centered, parse_comments); - - boolean last_screen = (screen_nr == num_program_info_screens - 1); - char *text_foot = (last_screen ? TEXT_INFO_MENU : TEXT_NEXT_PAGE); - - DrawTextSCentered(ybottom, font_foot, text_foot); -} - -static void DrawInfoScreen_Program(void) -{ - SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM); - - FadeMenuSoundsAndMusic(); - - FadeOut(REDRAW_FIELD); - - HandleInfoScreen_Program(0, 0, MB_MENU_INITIALIZE); - - FadeIn(REDRAW_FIELD); -} - -void HandleInfoScreen_Program(int dx, int dy, int button) -{ - static int screen_nr = 0; - - if (button == MB_MENU_INITIALIZE) - { - // determine number of program info screens - num_program_info_screens = 0; - - while (getProgramInfoFilename(num_program_info_screens) != NULL) - num_program_info_screens++; + // 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; - if (num_program_info_screens == 0) - { - int font_title = MENU_INFO_FONT_TITLE; - int font_foot = MENU_INFO_FONT_FOOT; - int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART1; - int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; + break; + } + } - ClearField(); - DrawHeadline(); + 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"); - DrawTextSCentered(ystart, font_title, "No program info available."); - DrawTextSCentered(ybottom, font_foot, TEXT_INFO_MENU); + ystart += ystep_head; - return; + DrawTextFCentered(ystart, font_text, "level %03d", music_level_nr); + ystart += ystep_head; + } } - screen_nr = 0; - - DrawInfoScreen_ProgramScreen(screen_nr); - } - else if (button == MB_MENU_LEAVE) - { - PlaySound(SND_MENU_ITEM_SELECTING); - - info_mode = INFO_MODE_MAIN; - DrawInfoScreen(); + DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_PAGE); - return; + if (button != MB_MENU_INITIALIZE) + FadeIn(REDRAW_FIELD); } - else if (button == MB_MENU_CHOICE || dx) - { - PlaySound(SND_MENU_ITEM_SELECTING); - - screen_nr += (dx < 0 ? -1 : +1); - if (screen_nr < 0 || screen_nr >= num_program_info_screens) - { - FadeMenuSoundsAndMusic(); - - info_mode = INFO_MODE_MAIN; - DrawInfoScreen(); - - return; - } - - FadeSetNextScreen(); - - FadeOut(REDRAW_FIELD); - - DrawInfoScreen_ProgramScreen(screen_nr); - - FadeIn(REDRAW_FIELD); - } - else - { - PlayMenuSoundIfLoop(); - } + if (list != NULL && list->is_sound && IS_LOOP_SOUND(list->music)) + PlaySoundLoop(list->music); } static void DrawInfoScreen_Version(void) { - int font_title = MENU_INFO_FONT_TITLE; - int font_head = MENU_INFO_FONT_HEAD; - int font_text = MENU_INFO_FONT_TEXT; - int font_foot = MENU_INFO_FONT_FOOT; - int spacing_title = menu.headline1_spacing_info[info_mode]; - int spacing_head = menu.headline2_spacing_info[info_mode]; - int spacing_para = menu.paragraph_spacing_info[info_mode]; - int spacing_line = menu.line_spacing_info[info_mode]; + int font_head = MENU_INFO_FONT_HEAD; + int font_text = MENU_INFO_FONT_TEXT; + int font_foot = MENU_INFO_FONT_FOOT; + int spacing_head = menu.headline2_spacing_info[info_mode]; + int spacing_para = menu.paragraph_spacing_info[info_mode]; + int spacing_line = menu.line_spacing_info[info_mode]; int xstep = getFontWidth(font_text); - int ystep_title = getMenuTextStep(spacing_title, font_title); - int ystep_head = getMenuTextStep(spacing_head, font_head); - int ystep_para = getMenuTextStep(spacing_para, font_text); - int ystep_line = getMenuTextStep(spacing_line, font_text); - int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART1; + int ystep_head = getMenuTextStep(spacing_head, font_head); + int ystep_para = getMenuTextStep(spacing_para, font_text); + int ystep_line = getMenuTextStep(spacing_line, font_text); + int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART + getHeadlineSpacing(); int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; int xstart1 = mSX - SX + 2 * xstep; int xstart2 = mSX - SX + 18 * xstep; @@ -3672,13 +3689,14 @@ static void DrawInfoScreen_Version(void) SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION); + UnmapAllGadgets(); + FadeInfoSoundsAndMusic(); + FadeOut(REDRAW_FIELD); ClearField(); - DrawHeadline(); - DrawTextSCentered(ystart, font_title, "Version Information:"); - ystart += ystep_title; + DrawInfoScreen_Headline(0, 1, TRUE); DrawTextF(xstart1, ystart, font_head, "Name"); DrawTextF(xstart2, ystart, font_text, getProgramTitleString()); @@ -3809,7 +3827,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, TEXT_INFO_MENU); + DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_MENU); + + PlayInfoSoundsAndMusic(); FadeIn(REDRAW_FIELD); } @@ -3840,91 +3860,253 @@ void HandleInfoScreen_Version(int button) } } -static void DrawInfoScreen_LevelSet(void) +static char *getInfoScreenTitle_Generic(void) +{ + return (info_mode == INFO_MODE_MAIN ? STR_INFO_MAIN : + info_mode == INFO_MODE_TITLE ? STR_INFO_TITLE : + info_mode == INFO_MODE_ELEMENTS ? STR_INFO_ELEMENTS : + info_mode == INFO_MODE_MUSIC ? STR_INFO_MUSIC : + info_mode == INFO_MODE_CREDITS ? STR_INFO_CREDITS : + info_mode == INFO_MODE_PROGRAM ? STR_INFO_PROGRAM : + info_mode == INFO_MODE_VERSION ? STR_INFO_VERSION : + info_mode == INFO_MODE_LEVELSET ? STR_INFO_LEVELSET : + ""); +} + +static int getInfoScreenBackgroundImage_Generic(void) +{ + return (info_mode == INFO_MODE_ELEMENTS ? IMG_BACKGROUND_INFO_ELEMENTS : + info_mode == INFO_MODE_MUSIC ? IMG_BACKGROUND_INFO_MUSIC : + info_mode == INFO_MODE_CREDITS ? IMG_BACKGROUND_INFO_CREDITS : + info_mode == INFO_MODE_PROGRAM ? IMG_BACKGROUND_INFO_PROGRAM : + info_mode == INFO_MODE_VERSION ? IMG_BACKGROUND_INFO_VERSION : + info_mode == INFO_MODE_LEVELSET ? IMG_BACKGROUND_INFO_LEVELSET : + IMG_BACKGROUND_INFO); +} + +static int getInfoScreenBackgroundSound_Generic(void) { - struct TitleMessageInfo *tmi = &readme; - char *filename = getLevelSetInfoFilename(); - char *title = "Level Set Information:"; + return (info_mode == INFO_MODE_ELEMENTS ? SND_BACKGROUND_INFO_ELEMENTS : + info_mode == INFO_MODE_CREDITS ? SND_BACKGROUND_INFO_CREDITS : + info_mode == INFO_MODE_PROGRAM ? SND_BACKGROUND_INFO_PROGRAM : + info_mode == INFO_MODE_VERSION ? SND_BACKGROUND_INFO_VERSION : + info_mode == INFO_MODE_LEVELSET ? SND_BACKGROUND_INFO_LEVELSET : + SND_BACKGROUND_INFO); +} + +static int getInfoScreenBackgroundMusic_Generic(void) +{ + return (info_mode == INFO_MODE_ELEMENTS ? MUS_BACKGROUND_INFO_ELEMENTS : + info_mode == INFO_MODE_CREDITS ? MUS_BACKGROUND_INFO_CREDITS : + info_mode == INFO_MODE_PROGRAM ? MUS_BACKGROUND_INFO_PROGRAM : + info_mode == INFO_MODE_VERSION ? MUS_BACKGROUND_INFO_VERSION : + info_mode == INFO_MODE_LEVELSET ? MUS_BACKGROUND_INFO_LEVELSET : + MUS_BACKGROUND_INFO); +} + +static char *getInfoScreenFilename_Generic(int nr, boolean global) +{ + return (info_mode == INFO_MODE_CREDITS ? getCreditsFilename(nr, global) : + info_mode == INFO_MODE_PROGRAM ? getProgramInfoFilename(nr) : + info_mode == INFO_MODE_LEVELSET ? getLevelSetInfoFilename(nr) : + NULL); +} + +static void DrawInfoScreen_GenericScreen(int screen_nr, int num_screens, + int use_global_screens) +{ + char *filename = getInfoScreenFilename_Generic(screen_nr, use_global_screens); + int font_text = MENU_INFO_FONT_TEXT; int font_foot = MENU_INFO_FONT_FOOT; - int ystart = mSY - SY + MENU_SCREEN_INFO_YSTART1; + int spacing_line = menu.line_spacing_info[info_mode]; int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; - if (filename == NULL) + ClearField(); + + DrawInfoScreen_Headline(screen_nr, num_screens, use_global_screens); + + if (info_mode == INFO_MODE_CREDITS || + info_mode == INFO_MODE_PROGRAM) { - DrawInfoScreen_NotAvailable(title, "No information for this level set."); + 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; - return; + DrawTextFile(xstart, ystart, + filename, font_text, chars, -1, lines, line_spacing, -1, + autowrap, centered, parse_comments); } + else if (info_mode == INFO_MODE_LEVELSET) + { + struct TitleMessageInfo *tmi = &readme; - SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET); + // if x position set to "-1", automatically determine by playfield width + if (tmi->x == -1) + tmi->x = SXSIZE / 2; - FadeOut(REDRAW_FIELD); + // if y position set to "-1", use static default value + if (tmi->y == -1) + tmi->y = MENU_SCREEN_INFO_YSTART + getHeadlineSpacing(); - ClearField(); - DrawHeadline(); + // if width set to "-1", automatically determine by playfield width + if (tmi->width == -1) + tmi->width = SXSIZE - 2 * TILEX; - DrawTextSCentered(ystart, FONT_TEXT_1, title); + // if height set to "-1", automatically determine by playfield height + if (tmi->height == -1) + tmi->height = MENU_SCREEN_INFO_YBOTTOM - tmi->y - 10; - // if x position set to "-1", automatically determine by playfield width - if (tmi->x == -1) - tmi->x = SXSIZE / 2; + // 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 y position set to "-1", use static default value - if (tmi->y == -1) - tmi->y = 150; + // 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); - // if width set to "-1", automatically determine by playfield width - if (tmi->width == -1) - tmi->width = SXSIZE - 2 * TILEX; + 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); + } - // if height set to "-1", automatically determine by playfield height - if (tmi->height == -1) - tmi->height = MENU_SCREEN_INFO_YBOTTOM - tmi->y - 10; + boolean last_screen = (screen_nr == num_screens - 1); + char *text_foot = (last_screen ? TEXT_NEXT_MENU : TEXT_NEXT_PAGE); - // 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); + DrawTextSCentered(ybottom, font_foot, text_foot); +} - // 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); +static void DrawInfoScreen_Generic(void) +{ + SetMainBackgroundImageIfDefined(getInfoScreenBackgroundImage_Generic()); - 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); + UnmapAllGadgets(); + FadeInfoSoundsAndMusic(); + + FadeOut(REDRAW_FIELD); - DrawTextSCentered(ybottom, font_foot, TEXT_INFO_MENU); + HandleInfoScreen_Generic(0, 0, MB_MENU_INITIALIZE); + + PlayInfoSoundsAndMusic(); FadeIn(REDRAW_FIELD); } -static void HandleInfoScreen_LevelSet(int button) +void HandleInfoScreen_Generic(int dx, int dy, int button) { - if (button == MB_MENU_LEAVE) + static char *text_no_info = ""; + static int num_screens = 0; + static int screen_nr = 0; + static boolean use_global_screens = FALSE; + + if (button == MB_MENU_INITIALIZE) + { + num_screens = 0; + screen_nr = 0; + + if (info_mode == INFO_MODE_CREDITS) + { + int i; + + for (i = 0; i < 2; i++) + { + use_global_screens = i; // check for "FALSE", then "TRUE" + + // determine number of (global or level set specific) credits screens + while (getCreditsFilename(num_screens, use_global_screens) != NULL) + num_screens++; + + if (num_screens > 0) + break; + } + + text_no_info = "No credits available."; + } + else if (info_mode == INFO_MODE_PROGRAM) + { + use_global_screens = TRUE; + + // determine number of program info screens + while (getProgramInfoFilename(num_screens) != NULL) + num_screens++; + + text_no_info = "No program info available."; + } + else if (info_mode == INFO_MODE_LEVELSET) + { + use_global_screens = FALSE; + + // determine number of levelset info screens + while (getLevelSetInfoFilename(num_screens) != NULL) + num_screens++; + + text_no_info = "No level set info available."; + } + + 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; + + ClearField(); + + DrawInfoScreen_Headline(screen_nr, num_screens, use_global_screens); + + DrawTextSCentered(ystart, font_title, text_no_info); + DrawTextSCentered(ybottom, font_foot, TEXT_NEXT_MENU); + + return; + } + + DrawInfoScreen_GenericScreen(screen_nr, num_screens, use_global_screens); + } + else if (button == MB_MENU_LEAVE) { PlaySound(SND_MENU_ITEM_SELECTING); info_mode = INFO_MODE_MAIN; DrawInfoScreen(); + } + else if (button == MB_MENU_CHOICE || dx) + { + PlaySound(SND_MENU_ITEM_SELECTING); + + screen_nr += (dx < 0 ? -1 : +1); + + if (screen_nr < 0 || screen_nr >= num_screens) + { + FadeInfoSoundsAndMusic(); + + info_mode = INFO_MODE_MAIN; + DrawInfoScreen(); + } + else + { + FadeSetNextScreen(); - return; - } - else if (button == MB_MENU_CHOICE) - { - PlaySound(SND_MENU_ITEM_SELECTING); + FadeOut(REDRAW_FIELD); - FadeMenuSoundsAndMusic(); + DrawInfoScreen_GenericScreen(screen_nr, num_screens, use_global_screens); - info_mode = INFO_MODE_MAIN; - DrawInfoScreen(); + FadeIn(REDRAW_FIELD); + } } else { - PlayMenuSoundIfLoop(); + PlayInfoSoundIfLoop(); } } @@ -3937,20 +4119,52 @@ static void DrawInfoScreen(void) else if (info_mode == INFO_MODE_MUSIC) DrawInfoScreen_Music(); else if (info_mode == INFO_MODE_CREDITS) - DrawInfoScreen_Credits(); + DrawInfoScreen_Generic(); else if (info_mode == INFO_MODE_PROGRAM) - DrawInfoScreen_Program(); + DrawInfoScreen_Generic(); else if (info_mode == INFO_MODE_VERSION) DrawInfoScreen_Version(); else if (info_mode == INFO_MODE_LEVELSET) - DrawInfoScreen_LevelSet(); + DrawInfoScreen_Generic(); else DrawInfoScreen_Main(); +} - if (info_mode != INFO_MODE_MAIN && - info_mode != INFO_MODE_TITLE && - info_mode != INFO_MODE_MUSIC) - PlayMenuSoundsAndMusic(); +void DrawInfoScreen_FromMainMenu(int nr) +{ + int fade_mask = REDRAW_FIELD; + + if (nr < INFO_MODE_MAIN || nr >= MAX_INFO_MODES) + return; + + CloseDoor(DOOR_CLOSE_2); + + SetGameStatus(GAME_MODE_INFO); + + info_mode = nr; + info_screens_from_main = TRUE; + + if (redraw_mask & REDRAW_ALL) + fade_mask = REDRAW_ALL; + + if (CheckFadeAll()) + fade_mask = REDRAW_ALL; + + UnmapAllGadgets(); + FadeMenuSoundsAndMusic(); + + FadeSetEnterScreen(); + + FadeOut(fade_mask); + + FadeSkipNextFadeOut(); + + // needed if different viewport properties defined for info screen + ChangeViewportPropertiesIfNeeded(); + + SetMainBackgroundImage(IMG_BACKGROUND_INFO); + + DrawInfoScreen(); } void HandleInfoScreen(int mx, int my, int dx, int dy, int button) @@ -3962,13 +4176,13 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button) else if (info_mode == INFO_MODE_MUSIC) HandleInfoScreen_Music(dx, dy, button); else if (info_mode == INFO_MODE_CREDITS) - HandleInfoScreen_Credits(dx, dy, button); + HandleInfoScreen_Generic(dx, dy, button); else if (info_mode == INFO_MODE_PROGRAM) - HandleInfoScreen_Program(dx, dy, button); + HandleInfoScreen_Generic(dx, dy, button); else if (info_mode == INFO_MODE_VERSION) HandleInfoScreen_Version(button); else if (info_mode == INFO_MODE_LEVELSET) - HandleInfoScreen_LevelSet(button); + HandleInfoScreen_Generic(dx, dy, button); else HandleInfoScreen_Main(mx, my, dx, dy, button); } @@ -3988,7 +4202,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); @@ -3996,8 +4210,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')); @@ -4313,12 +4531,23 @@ 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; @@ -4328,7 +4557,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); @@ -4566,35 +4799,6 @@ static void drawChooseTreeScreen(TreeInfo *ti) MapScreenTreeGadgets(ti); } -static void drawChooseTreeScreen_Scores_NotAvailable(void) -{ - // dirty workaround to use spacing definitions from info screen - info_mode = INFO_MODE_TITLE; - - char *text_info = "HighScores of Level %d"; - char *text_title = "Score information:"; - char *text_error = "No scores for this level."; - char *text_foot = "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; - - drawChooseTreeHeadExt(TREE_TYPE_SCORE_ENTRY, INFOTEXT_SCORE_ENTRY); - DrawTextFCentered(ystart0, font_info, text_info, scores.last_level_nr); - - DrawTextSCentered(ystart1, font_title, text_title); - DrawTextSCentered(ystart2, font_error, text_error); - - DrawTextSCentered(ybottom, font_foot, text_foot); -} - static TreeInfo *setHallOfFameActiveEntry(TreeInfo **ti_ptr) { int score_pos = scores.last_added; @@ -4628,17 +4832,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) { @@ -4651,31 +4852,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); } } @@ -4771,6 +4951,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; @@ -4850,15 +5047,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); @@ -4941,6 +5140,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); } @@ -4959,6 +5159,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) @@ -5010,6 +5211,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) { @@ -5049,16 +5253,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); @@ -5122,6 +5323,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); } @@ -5252,12 +5456,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(); @@ -5266,7 +5471,7 @@ void DrawHallOfFame(int level_nr) SetDrawDeactivationMask(REDRAW_NONE); SetDrawBackgroundMask(REDRAW_FIELD); - LoadLocalAndServerScore(level_nr, TRUE); + LoadLocalAndServerScore(scores.last_level_nr, TRUE); DrawHallOfFame_setScoreEntries(); @@ -5311,6 +5516,28 @@ static char *getHallOfFameScoreText(int nr, int size) 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) { int old_level_nr = scores.last_level_nr; @@ -5367,53 +5594,44 @@ static void DrawScoreInfo_Content(int entry_nr) { struct ScoreEntry *entry = &scores.entry[entry_nr]; char *pos_text = getHallOfFameRankText(entry_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[GAME_MODE_SCOREINFO]; - int spacing_para = menu.paragraph_spacing[GAME_MODE_SCOREINFO]; - int spacing_line = menu.line_spacing[GAME_MODE_SCOREINFO]; + 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 + 13 * 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 = (entry->id != -1); + 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(entry->tape_date, font_text); + int tape_date_width = getTextWidth(tape_date, font_text); int pad_left = xstart2; - int pad_right = MENU_SCREEN_INFO_SPACE_RIGHT; + 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); - if (score_entries == NULL) - { - drawChooseTreeScreen_Scores_NotAvailable(); - - return; - } - drawChooseTreeHead(score_entries); drawChooseTreeInfo(score_entries); - DrawTextSCentered(ystart, font_title, "Score Information:"); - ystart += ystep_title; - DrawTextF(xstart1, ystart, font_head, "Level Set"); lines = DrawTextBufferS(xstart2, ystart, leveldir_current->name, font_text, max_chars_per_line, -1, max_lines_per_text, 0, -1, @@ -5463,7 +5681,7 @@ static void DrawScoreInfo_Content(int entry_nr) play_y = SY + ystart + (font_height - play_height) / 2; DrawTextF(xstart1, ystart, font_head, "Tape Date"); - DrawTextF(xstart2, ystart, font_text, entry->tape_date); + DrawTextF(xstart2, ystart, font_text, tape_date); ystart += ystep_line; DrawTextF(xstart1, ystart, font_head, "Platform"); @@ -5493,15 +5711,29 @@ static void DrawScoreInfo(int entry_nr) scores.last_entry_nr = entry_nr; score_info_tape_play = FALSE; - SetMainBackgroundImageIfDefined(IMG_BACKGROUND_SCOREINFO); - UnmapAllGadgets(); + FreeScreenGadgets(); + CreateScreenGadgets(); + FadeOut(REDRAW_FIELD); // 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 @@ -5564,7 +5796,7 @@ void HandleScoreInfo(int mx, int my, int dx, int dy, int button) SetGameStatus(GAME_MODE_SCORES); - DrawHallOfFame(level_nr); + DrawHallOfFame(scores.last_level_nr); } else if (dx) { @@ -5766,7 +5998,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) @@ -6326,7 +6558,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) @@ -6394,7 +6626,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) @@ -6462,7 +6694,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) @@ -7028,7 +7260,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) @@ -7078,85 +7315,103 @@ static struct void *related_value; } hide_related_entry_list[] = { - { &setup.scores_in_highscore_list, execSetupChooseScoresType }, - { &setup.scores_in_highscore_list, &scores_type_text }, + { &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 }, - { &setup.game_frame_delay, execSetupChooseGameSpeed }, - { &setup.game_frame_delay, &game_speed_text }, + { &setup.game_frame_delay, execSetupChooseGameSpeed }, + { &setup.game_frame_delay, &game_speed_text }, - { &setup.scroll_delay_value, execSetupChooseScrollDelay }, - { &setup.scroll_delay_value, &scroll_delay_text }, + { &setup.scroll_delay_value, execSetupChooseScrollDelay }, + { &setup.scroll_delay_value, &scroll_delay_text }, - { &setup.engine_snapshot_mode, execSetupChooseSnapshotMode }, - { &setup.engine_snapshot_mode, &snapshot_mode_text }, + { &setup.engine_snapshot_mode, execSetupChooseSnapshotMode }, + { &setup.engine_snapshot_mode, &snapshot_mode_text }, - { &setup.window_scaling_percent, execSetupChooseWindowSize }, - { &setup.window_scaling_percent, &window_size_text }, + { &setup.window_scaling_percent, execSetupChooseWindowSize }, + { &setup.window_scaling_percent, &window_size_text }, - { &setup.window_scaling_quality, execSetupChooseScalingType }, - { &setup.window_scaling_quality, &scaling_type_text }, + { &setup.window_scaling_quality, execSetupChooseScalingType }, + { &setup.window_scaling_quality, &scaling_type_text }, - { &setup.screen_rendering_mode, execSetupChooseRenderingMode }, - { &setup.screen_rendering_mode, &rendering_mode_text }, + { &setup.screen_rendering_mode, execSetupChooseRenderingMode }, + { &setup.screen_rendering_mode, &rendering_mode_text }, - { &setup.vsync_mode, execSetupChooseVsyncMode }, - { &setup.vsync_mode, &vsync_mode_text }, + { &setup.vsync_mode, execSetupChooseVsyncMode }, + { &setup.vsync_mode, &vsync_mode_text }, - { &setup.graphics_set, execSetupChooseGraphics }, - { &setup.graphics_set, &graphics_set_name }, + { &setup.graphics_set, execSetupChooseGraphics }, + { &setup.graphics_set, &graphics_set_name }, - { &setup.sounds_set, execSetupChooseSounds }, - { &setup.sounds_set, &sounds_set_name }, + { &setup.sounds_set, execSetupChooseSounds }, + { &setup.sounds_set, &sounds_set_name }, - { &setup.music_set, execSetupChooseMusic }, - { &setup.music_set, &music_set_name }, + { &setup.music_set, execSetupChooseMusic }, + { &setup.music_set, &music_set_name }, - { &setup.volume_simple, execSetupChooseVolumeSimple }, - { &setup.volume_simple, &volume_simple_text }, + { &setup.volume_simple, execSetupChooseVolumeSimple }, + { &setup.volume_simple, &volume_simple_text }, - { &setup.volume_loops, execSetupChooseVolumeLoops }, - { &setup.volume_loops, &volume_loops_text }, + { &setup.volume_loops, execSetupChooseVolumeLoops }, + { &setup.volume_loops, &volume_loops_text }, - { &setup.volume_music, execSetupChooseVolumeMusic }, - { &setup.volume_music, &volume_music_text }, + { &setup.volume_music, execSetupChooseVolumeMusic }, + { &setup.volume_music, &volume_music_text }, - { &setup.touch.control_type, execSetupChooseTouchControls }, - { &setup.touch.control_type, &touch_controls_text }, + { &setup.touch.control_type, execSetupChooseTouchControls }, + { &setup.touch.control_type, &touch_controls_text }, - { &setup.touch.move_distance, execSetupChooseMoveDistance }, - { &setup.touch.move_distance, &move_distance_text }, + { &setup.touch.move_distance, execSetupChooseMoveDistance }, + { &setup.touch.move_distance, &move_distance_text }, - { &setup.touch.drop_distance, execSetupChooseDropDistance }, - { &setup.touch.drop_distance, &drop_distance_text }, + { &setup.touch.drop_distance, execSetupChooseDropDistance }, + { &setup.touch.drop_distance, &drop_distance_text }, - { &setup.touch.transparency, execSetupChooseTransparency }, - { &setup.touch.transparency, &transparency_text }, + { &setup.touch.transparency, execSetupChooseTransparency }, + { &setup.touch.transparency, &transparency_text }, - { &setup.touch.grid_xsize[0], execSetupChooseGridXSize_0 }, - { &setup.touch.grid_xsize[0], &grid_size_text[0][0] }, + { &setup.touch.grid_xsize[0], execSetupChooseGridXSize_0 }, + { &setup.touch.grid_xsize[0], &grid_size_text[0][0] }, - { &setup.touch.grid_ysize[0], execSetupChooseGridYSize_0 }, - { &setup.touch.grid_ysize[0], &grid_size_text[0][1] }, + { &setup.touch.grid_ysize[0], execSetupChooseGridYSize_0 }, + { &setup.touch.grid_ysize[0], &grid_size_text[0][1] }, - { &setup.touch.grid_xsize[1], execSetupChooseGridXSize_1 }, - { &setup.touch.grid_xsize[1], &grid_size_text[1][0] }, + { &setup.touch.grid_xsize[1], execSetupChooseGridXSize_1 }, + { &setup.touch.grid_xsize[1], &grid_size_text[1][0] }, - { &setup.touch.grid_ysize[1], execSetupChooseGridYSize_1 }, - { &setup.touch.grid_ysize[1], &grid_size_text[1][1] }, + { &setup.touch.grid_ysize[1], execSetupChooseGridYSize_1 }, + { &setup.touch.grid_ysize[1], &grid_size_text[1][1] }, - { &setup.internal.menu_game, execSetupGame }, - { &setup.internal.menu_engines, execSetupEngines }, - { &setup.internal.menu_editor, execSetupEditor }, - { &setup.internal.menu_graphics, execSetupGraphics }, - { &setup.internal.menu_sound, execSetupSound }, - { &setup.internal.menu_artwork, execSetupArtwork }, - { &setup.internal.menu_input, execSetupInput }, - { &setup.internal.menu_touch, execSetupTouch }, - { &setup.internal.menu_shortcuts, execSetupShortcuts }, - { &setup.internal.menu_exit, execExitSetup }, - { &setup.internal.menu_save_and_exit, execSaveAndExitSetup }, + { &setup.internal.menu_game, execSetupGame }, + { &setup.internal.menu_engines, execSetupEngines }, + { &setup.internal.menu_editor, execSetupEditor }, + { &setup.internal.menu_graphics, execSetupGraphics }, + { &setup.internal.menu_sound, execSetupSound }, + { &setup.internal.menu_artwork, execSetupArtwork }, + { &setup.internal.menu_input, execSetupInput }, + { &setup.internal.menu_touch, execSetupTouch }, + { &setup.internal.menu_shortcuts, execSetupShortcuts }, + { &setup.internal.menu_exit, execExitSetup }, + { &setup.internal.menu_save_and_exit, execSaveAndExitSetup }, - { NULL, NULL } + { &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 } }; void setHideRelatedSetupEntries(void) @@ -7170,252 +7425,262 @@ void setHideRelatedSetupEntries(void) static struct TokenInfo setup_info_main[] = { - { TYPE_ENTER_MENU, execSetupGame, STR_SETUP_GAME }, - { TYPE_ENTER_MENU, execSetupEngines, STR_SETUP_ENGINES }, - { TYPE_ENTER_MENU, execSetupEditor, STR_SETUP_EDITOR }, - { TYPE_ENTER_MENU, execSetupGraphics, STR_SETUP_GRAPHICS }, - { TYPE_ENTER_MENU, execSetupSound, STR_SETUP_SOUND }, - { TYPE_ENTER_MENU, execSetupArtwork, STR_SETUP_ARTWORK }, - { TYPE_ENTER_MENU, execSetupInput, STR_SETUP_INPUT }, - { TYPE_ENTER_MENU, execSetupTouch, STR_SETUP_TOUCH }, - { TYPE_ENTER_MENU, execSetupShortcuts, STR_SETUP_SHORTCUTS }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execExitSetup, STR_SETUP_EXIT }, - { TYPE_LEAVE_MENU, execSaveAndExitSetup, STR_SETUP_SAVE_AND_EXIT }, - - { 0, NULL, NULL } + { TYPE_ENTER_MENU, execSetupGame, STR_SETUP_GAME }, + { TYPE_ENTER_MENU, execSetupEngines, STR_SETUP_ENGINES }, + { TYPE_ENTER_MENU, execSetupEditor, STR_SETUP_EDITOR }, + { TYPE_ENTER_MENU, execSetupGraphics, STR_SETUP_GRAPHICS }, + { TYPE_ENTER_MENU, execSetupSound, STR_SETUP_SOUND }, + { TYPE_ENTER_MENU, execSetupArtwork, STR_SETUP_ARTWORK }, + { TYPE_ENTER_MENU, execSetupInput, STR_SETUP_INPUT }, + { TYPE_ENTER_MENU, execSetupTouch, STR_SETUP_TOUCH }, + { TYPE_ENTER_MENU, execSetupShortcuts, STR_SETUP_SHORTCUTS }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execExitSetup, STR_SETUP_EXIT }, + { TYPE_LEAVE_MENU, execSaveAndExitSetup, STR_SETUP_SAVE_AND_EXIT }, + + { 0, NULL, NULL } }; static struct TokenInfo setup_info_game[] = { - { TYPE_SWITCH, &setup.team_mode, "Team-Mode (Multi-Player):" }, - { TYPE_SWITCH, &setup.network_mode, "Network Multi-Player Mode:" }, - { TYPE_PLAYER, &setup.network_player_nr,"Preferred Network Player:" }, - { TYPE_TEXT_INPUT, execGadgetNetworkServer, "Network Server Hostname:" }, - { TYPE_STRING, &network_server_text, "" }, - { TYPE_SWITCH, &setup.use_api_server, "Use Highscore Server:" }, - { TYPE_ENTER_LIST, execSetupChooseScoresType,"Scores in Highscore List:" }, - { TYPE_STRING, &scores_type_text, "" }, - { TYPE_ENTER_LIST, execOfferUploadTapes, "Upload Tapes to Server" }, - { 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.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:" }, - { TYPE_SWITCH, &setup.show_scores_after_game,"Show Scores After 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.auto_pause_on_start, "Start Game in Pause Mode:" }, - { TYPE_ENTER_LIST, execSetupChooseGameSpeed, "Game Speed:" }, - { TYPE_STRING, &game_speed_text, "" }, - { TYPE_SWITCH, &setup.game_speed_extended, "Game Speed Extended List:" }, + { TYPE_SWITCH, &setup.team_mode, "Team-Mode (Multi-Player):" }, + { TYPE_SWITCH, &setup.network_mode, "Network Multi-Player Mode:" }, + { TYPE_PLAYER, &setup.network_player_nr, "Preferred Network Player:" }, + { TYPE_TEXT_INPUT, execGadgetNetworkServer, "Network Server Hostname:" }, + { TYPE_STRING, &network_server_text, "" }, + { TYPE_SWITCH, &setup.use_api_server, "Use Highscore Server:" }, + { TYPE_ENTER_LIST, execSetupChooseScoresType, "Scores in Highscore List:" }, + { TYPE_STRING, &scores_type_text, "" }, + { TYPE_ENTER_LIST, execOfferUploadTapes, "Upload Tapes to Server" }, + { 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, "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:" }, + { TYPE_SWITCH, &setup.show_scores_after_game, "Show Scores After 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 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, "" }, + { TYPE_SWITCH, &setup.game_speed_extended, "Game Speed Extended List:" }, #if 1 - { TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay:" }, - { TYPE_STRING, &scroll_delay_text, "" }, + { TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay:" }, + { TYPE_STRING, &scroll_delay_text, "" }, #endif - { TYPE_ENTER_LIST, execSetupChooseSnapshotMode,"Game Engine Snapshot Mode:" }, - { TYPE_STRING, &snapshot_mode_text, "" }, - { TYPE_SWITCH, &setup.show_load_save_buttons,"Show Load/Save Buttons:" }, - { TYPE_SWITCH, &setup.show_undo_redo_buttons,"Show Undo/Redo Buttons:" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupMain, "Back" }, - - { 0, NULL, NULL } + { TYPE_ENTER_LIST, execSetupChooseSnapshotMode, "Game Engine Snapshot Mode:" }, + { TYPE_STRING, &snapshot_mode_text, "" }, + { TYPE_SWITCH, &setup.show_load_save_buttons, "Show Load/Save Buttons:" }, + { TYPE_SWITCH, &setup.show_undo_redo_buttons, "Show Undo/Redo Buttons:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + + { 0, NULL, NULL } }; static struct TokenInfo setup_info_engines[] = { - { TYPE_HEADLINE, NULL, "Emerald Mine" }, - { TYPE_SWITCH, &setup.forced_scroll_delay, "Scroll Delay:" }, - { TYPE_ECS_AGA, &setup.prefer_aga_graphics, "Amiga Graphics Chipset:" }, - { TYPE_SWITCH, &setup.prefer_lowpass_sounds,"Low-Pass Filter Sounds:" }, - { TYPE_SWITCH, &setup.prefer_extra_panel_items,"Show Dynamite and Keys:" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_HEADLINE, NULL, "Supaplex" }, - { TYPE_SWITCH, &setup.sp_show_border_elements, "Border Elements:" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupMain, "Back" }, - - { 0, NULL, NULL } + { TYPE_HEADLINE, NULL, "Boulder Dash" }, + { TYPE_SWITCH, &setup.bd_skip_uncovering, "Skip (un)covering screen:" }, + { TYPE_SWITCH, &setup.bd_skip_hatching, "Skip hatching player:" }, + { TYPE_SWITCH, &setup.bd_scroll_delay, "Scroll Delay:" }, + { TYPE_YES_NO_AUTO, &setup.bd_smooth_movements, "Smooth Element Movement:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_HEADLINE, NULL, "Emerald Mine" }, + { TYPE_SWITCH, &setup.forced_scroll_delay, "Scroll Delay:" }, + { TYPE_ECS_AGA, &setup.prefer_aga_graphics, "Amiga Graphics Chipset:" }, + { TYPE_SWITCH, &setup.prefer_lowpass_sounds, "Low-Pass Filter Sounds:" }, + { TYPE_SWITCH, &setup.prefer_extra_panel_items,"Show Dynamite and Keys:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_HEADLINE, NULL, "Supaplex" }, + { TYPE_SWITCH, &setup.sp_show_border_elements, "Border Elements:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + + { 0, NULL, NULL } }; static struct TokenInfo setup_info_editor[] = { #if 0 - { TYPE_SWITCH, &setup.editor.el_boulderdash, "Boulder Dash:" }, - { TYPE_SWITCH, &setup.editor.el_emerald_mine, "Emerald Mine:" }, - { TYPE_SWITCH, &setup.editor.el_emerald_mine_club, "Emerald Mine Club:" }, - { TYPE_SWITCH, &setup.editor.el_more, "Rocks'n'Diamonds:" }, - { TYPE_SWITCH, &setup.editor.el_sokoban, "Sokoban:" }, - { TYPE_SWITCH, &setup.editor.el_supaplex, "Supaplex:" }, - { TYPE_SWITCH, &setup.editor.el_diamond_caves, "Diamond Caves II:" }, - { TYPE_SWITCH, &setup.editor.el_dx_boulderdash,"DX-Boulderdash:" }, - { TYPE_SWITCH, &setup.editor.el_chars, "Text Characters:" }, - { TYPE_SWITCH, &setup.editor.el_steel_chars, "Text Characters (Steel):" }, + { TYPE_SWITCH, &setup.editor.el_boulderdash, "Boulder Dash:" }, + { TYPE_SWITCH, &setup.editor.el_boulderdash_native, "Boulder Dash Native:" }, + { TYPE_SWITCH, &setup.editor.el_emerald_mine, "Emerald Mine:" }, + { TYPE_SWITCH, &setup.editor.el_emerald_mine_club, "Emerald Mine Club:" }, + { TYPE_SWITCH, &setup.editor.el_more, "Rocks'n'Diamonds:" }, + { TYPE_SWITCH, &setup.editor.el_sokoban, "Sokoban:" }, + { TYPE_SWITCH, &setup.editor.el_supaplex, "Supaplex:" }, + { TYPE_SWITCH, &setup.editor.el_diamond_caves, "Diamond Caves II:" }, + { TYPE_SWITCH, &setup.editor.el_dx_boulderdash,"DX-Boulderdash:" }, + { TYPE_SWITCH, &setup.editor.el_chars, "Text Characters:" }, + { TYPE_SWITCH, &setup.editor.el_steel_chars, "Text Characters (Steel):" }, #endif - { TYPE_SWITCH, &setup.editor.el_classic, "Classic Elements:" }, - { TYPE_SWITCH, &setup.editor.el_custom, "Custom & Group Elements:" }, + { TYPE_SWITCH, &setup.editor.el_classic, "Classic Elements:" }, + { TYPE_SWITCH, &setup.editor.el_custom, "Custom & Group Elements:" }, #if 0 - { TYPE_SWITCH, &setup.editor.el_headlines, "Headlines:" }, + { TYPE_SWITCH, &setup.editor.el_headlines, "Headlines:" }, #endif - { TYPE_SWITCH, &setup.editor.el_user_defined, "User defined element list:" }, - { TYPE_SWITCH, &setup.editor.el_dynamic, "Dynamic level elements:" }, - { TYPE_EMPTY, NULL, "" }, + { TYPE_SWITCH, &setup.editor.el_user_defined, "User defined element list:" }, + { TYPE_SWITCH, &setup.editor.el_dynamic, "Dynamic level elements:" }, + { TYPE_EMPTY, NULL, "" }, #if 0 - { TYPE_SWITCH, &setup.editor.el_by_game, "Show elements by game:" }, - { TYPE_SWITCH, &setup.editor.el_by_type, "Show elements by type:" }, - { TYPE_EMPTY, NULL, "" }, + { TYPE_SWITCH, &setup.editor.el_by_game, "Show elements by game:" }, + { TYPE_SWITCH, &setup.editor.el_by_type, "Show elements by type:" }, + { TYPE_EMPTY, NULL, "" }, #endif - { TYPE_SWITCH, &setup.editor.show_element_token, "Show element token:" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_SWITCH, &setup.editor.show_read_only_warning, "Show read-only warning:" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + { TYPE_SWITCH, &setup.editor.show_element_token, "Show element token:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_SWITCH, &setup.editor.show_read_only_warning, "Show read-only warning:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, - { 0, NULL, NULL } + { 0, NULL, NULL } }; static struct TokenInfo setup_info_graphics[] = { -#if !defined(PLATFORM_ANDROID) - { TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" }, - { TYPE_ENTER_LIST, execSetupChooseWindowSize, "Window Scaling:" }, - { TYPE_STRING, &window_size_text, "" }, - { TYPE_ENTER_LIST, execSetupChooseScalingType, "Anti-Aliasing:" }, - { TYPE_STRING, &scaling_type_text, "" }, - { TYPE_ENTER_LIST, execSetupChooseRenderingMode, "Special Rendering:" }, - { TYPE_STRING, &rendering_mode_text, "" }, +#if !defined(PLATFORM_ANDROID) && !defined(PLATFORM_EMSCRIPTEN) + { TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" }, + { TYPE_ENTER_LIST, execSetupChooseWindowSize, "Window Scaling:" }, + { TYPE_STRING, &window_size_text, "" }, + { TYPE_ENTER_LIST, execSetupChooseScalingType, "Anti-Aliasing:" }, + { TYPE_STRING, &scaling_type_text, "" }, + { TYPE_ENTER_LIST, execSetupChooseRenderingMode, "Special Rendering:" }, + { TYPE_STRING, &rendering_mode_text, "" }, #endif #if 0 - { TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay:" }, - { TYPE_STRING, &scroll_delay_text, "" }, + { TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay:" }, + { TYPE_STRING, &scroll_delay_text, "" }, #endif - { TYPE_ENTER_LIST, execSetupChooseVsyncMode, "Vertical Sync (VSync):" }, - { TYPE_STRING, &vsync_mode_text, "" }, - { 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.small_game_graphics, "Small Game Graphics:" }, - { TYPE_YES_NO_AUTO, &setup.debug.xsn_mode, debug_xsn_mode }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupMain, "Back" }, - - { 0, NULL, NULL } +#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 Toons:" }, + { TYPE_SWITCH, &setup.small_game_graphics, "Small Game Graphics:" }, + { TYPE_YES_NO_AUTO, &setup.debug.xsn_mode, debug_xsn_mode }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + + { 0, NULL, NULL } }; static struct TokenInfo setup_info_sound[] = { - { TYPE_SWITCH, &setup.sound_simple, "Sound Effects (Normal):" }, - { TYPE_SWITCH, &setup.sound_loops, "Sound Effects (Looping):" }, - { TYPE_SWITCH, &setup.sound_music, "Music:" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_ENTER_LIST, execSetupChooseVolumeSimple, "Sound Volume (Normal):" }, - { TYPE_STRING, &volume_simple_text, "" }, - { TYPE_ENTER_LIST, execSetupChooseVolumeLoops, "Sound Volume (Looping):" }, - { TYPE_STRING, &volume_loops_text, "" }, - { TYPE_ENTER_LIST, execSetupChooseVolumeMusic, "Music Volume:" }, - { TYPE_STRING, &volume_music_text, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupMain, "Back" }, - - { 0, NULL, NULL } + { TYPE_SWITCH, &setup.sound_simple, "Sound Effects (Normal):" }, + { TYPE_SWITCH, &setup.sound_loops, "Sound Effects (Looping):" }, + { TYPE_SWITCH, &setup.sound_music, "Music:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_ENTER_LIST, execSetupChooseVolumeSimple, "Sound Volume (Normal):" }, + { TYPE_STRING, &volume_simple_text, "" }, + { TYPE_ENTER_LIST, execSetupChooseVolumeLoops, "Sound Volume (Looping):" }, + { TYPE_STRING, &volume_loops_text, "" }, + { TYPE_ENTER_LIST, execSetupChooseVolumeMusic, "Music Volume:" }, + { TYPE_STRING, &volume_music_text, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + + { 0, NULL, NULL } }; static struct TokenInfo setup_info_artwork[] = { - { TYPE_ENTER_LIST, execSetupChooseGraphics,"Custom Graphics:" }, - { TYPE_STRING, &graphics_set_name, "" }, - { TYPE_ENTER_LIST, execSetupChooseSounds, "Custom Sounds:" }, - { TYPE_STRING, &sounds_set_name, "" }, - { TYPE_ENTER_LIST, execSetupChooseMusic, "Custom Music:" }, - { TYPE_STRING, &music_set_name, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_YES_NO_AUTO,&setup.override_level_graphics,"Override Level Graphics:"}, - { TYPE_YES_NO_AUTO,&setup.override_level_sounds, "Override Level Sounds:" }, - { TYPE_YES_NO_AUTO,&setup.override_level_music, "Override Level Music:" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupMain, "Back" }, - - { 0, NULL, NULL } + { TYPE_ENTER_LIST, execSetupChooseGraphics, "Custom Graphics:" }, + { TYPE_STRING, &graphics_set_name, "" }, + { TYPE_ENTER_LIST, execSetupChooseSounds, "Custom Sounds:" }, + { TYPE_STRING, &sounds_set_name, "" }, + { TYPE_ENTER_LIST, execSetupChooseMusic, "Custom Music:" }, + { TYPE_STRING, &music_set_name, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_YES_NO_AUTO, &setup.override_level_graphics,"Override Level Graphics:" }, + { TYPE_YES_NO_AUTO, &setup.override_level_sounds, "Override Level Sounds:" }, + { TYPE_YES_NO_AUTO, &setup.override_level_music, "Override Level Music:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + + { 0, NULL, NULL } }; static struct TokenInfo setup_info_input[] = { - { TYPE_SWITCH, NULL, "Player:" }, - { TYPE_SWITCH, NULL, "Device:" }, - { TYPE_SWITCH, NULL, "" }, - { TYPE_SKIPPABLE, NULL, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_SKIPPABLE, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupMain, "Back" }, - - { 0, NULL, NULL } + { TYPE_SWITCH, NULL, "Player:" }, + { TYPE_SWITCH, NULL, "Device:" }, + { TYPE_SWITCH, NULL, "" }, + { TYPE_SKIPPABLE, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_SKIPPABLE, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + + { 0, NULL, NULL } }; static struct TokenInfo setup_info_touch[] = { - { TYPE_ENTER_LIST, execSetupChooseTouchControls, "Touch Control Type:" }, - { TYPE_STRING, &touch_controls_text, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + { TYPE_ENTER_LIST, execSetupChooseTouchControls, "Touch Control Type:" }, + { TYPE_STRING, &touch_controls_text, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, - { 0, NULL, NULL } + { 0, NULL, NULL } }; static struct TokenInfo setup_info_touch_virtual_buttons_0[] = { - { TYPE_ENTER_LIST, execSetupChooseTouchControls, "Touch Control Type:" }, - { TYPE_STRING, &touch_controls_text, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_ENTER_LIST, execSetupChooseGridXSize_0, "Horizontal Buttons (Landscape):" }, - { TYPE_STRING, &grid_size_text[0][0], "" }, - { TYPE_ENTER_LIST, execSetupChooseGridYSize_0, "Vertical Buttons (Landscape):" }, - { TYPE_STRING, &grid_size_text[0][1], "" }, - { TYPE_ENTER_LIST, execSetupChooseTransparency, "Button Transparency:" }, - { TYPE_STRING, &transparency_text, "" }, - { TYPE_SWITCH, &setup.touch.draw_outlined, "Draw Buttons Outlined:" }, - { TYPE_SWITCH, &setup.touch.draw_pressed, "Highlight Pressed Buttons:" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_ENTER_LIST, execSetupConfigureVirtualButtons, "Configure Virtual Buttons" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupMain, "Back" }, - - { 0, NULL, NULL } + { TYPE_ENTER_LIST, execSetupChooseTouchControls, "Touch Control Type:" }, + { TYPE_STRING, &touch_controls_text, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_ENTER_LIST, execSetupChooseGridXSize_0, "Horizontal Buttons (Landscape):" }, + { TYPE_STRING, &grid_size_text[0][0], "" }, + { TYPE_ENTER_LIST, execSetupChooseGridYSize_0, "Vertical Buttons (Landscape):" }, + { TYPE_STRING, &grid_size_text[0][1], "" }, + { TYPE_ENTER_LIST, execSetupChooseTransparency, "Button Transparency:" }, + { TYPE_STRING, &transparency_text, "" }, + { TYPE_SWITCH, &setup.touch.draw_outlined, "Draw Buttons Outlined:" }, + { TYPE_SWITCH, &setup.touch.draw_pressed, "Highlight Pressed Buttons:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_ENTER_LIST, execSetupConfigureVirtualButtons, "Configure Virtual Buttons" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + + { 0, NULL, NULL } }; static struct TokenInfo setup_info_touch_virtual_buttons_1[] = { - { TYPE_ENTER_LIST, execSetupChooseTouchControls, "Touch Control Type:" }, - { TYPE_STRING, &touch_controls_text, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_ENTER_LIST, execSetupChooseGridXSize_1, "Horizontal Buttons (Portrait):" }, - { TYPE_STRING, &grid_size_text[1][0], "" }, - { TYPE_ENTER_LIST, execSetupChooseGridYSize_1, "Vertical Buttons (Portrait):" }, - { TYPE_STRING, &grid_size_text[1][1], "" }, - { TYPE_ENTER_LIST, execSetupChooseTransparency, "Button Transparency:" }, - { TYPE_STRING, &transparency_text, "" }, - { TYPE_SWITCH, &setup.touch.draw_outlined, "Draw Buttons Outlined:" }, - { TYPE_SWITCH, &setup.touch.draw_pressed, "Highlight Pressed Buttons:" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_ENTER_LIST, execSetupConfigureVirtualButtons, "Configure Virtual Buttons" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupMain, "Back" }, - - { 0, NULL, NULL } + { TYPE_ENTER_LIST, execSetupChooseTouchControls, "Touch Control Type:" }, + { TYPE_STRING, &touch_controls_text, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_ENTER_LIST, execSetupChooseGridXSize_1, "Horizontal Buttons (Portrait):" }, + { TYPE_STRING, &grid_size_text[1][0], "" }, + { TYPE_ENTER_LIST, execSetupChooseGridYSize_1, "Vertical Buttons (Portrait):" }, + { TYPE_STRING, &grid_size_text[1][1], "" }, + { TYPE_ENTER_LIST, execSetupChooseTransparency, "Button Transparency:" }, + { TYPE_STRING, &transparency_text, "" }, + { TYPE_SWITCH, &setup.touch.draw_outlined, "Draw Buttons Outlined:" }, + { TYPE_SWITCH, &setup.touch.draw_pressed, "Highlight Pressed Buttons:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_ENTER_LIST, execSetupConfigureVirtualButtons, "Configure Virtual Buttons" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + + { 0, NULL, NULL } }; static struct TokenInfo *setup_info_touch_virtual_buttons[] = @@ -7426,119 +7691,119 @@ static struct TokenInfo *setup_info_touch_virtual_buttons[] = static struct TokenInfo setup_info_touch_wipe_gestures[] = { - { TYPE_ENTER_LIST, execSetupChooseTouchControls, "Touch Control Type:" }, - { TYPE_STRING, &touch_controls_text, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_ENTER_LIST, execSetupChooseMoveDistance, "Move Trigger Distance:" }, - { TYPE_STRING, &move_distance_text, "" }, - { TYPE_ENTER_LIST, execSetupChooseDropDistance, "Drop Trigger Distance:" }, - { TYPE_STRING, &drop_distance_text, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupMain, "Back" }, - - { 0, NULL, NULL } + { TYPE_ENTER_LIST, execSetupChooseTouchControls, "Touch Control Type:" }, + { TYPE_STRING, &touch_controls_text, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_ENTER_LIST, execSetupChooseMoveDistance, "Move Trigger Distance:" }, + { TYPE_STRING, &move_distance_text, "" }, + { TYPE_ENTER_LIST, execSetupChooseDropDistance, "Drop Trigger Distance:" }, + { TYPE_STRING, &drop_distance_text, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + + { 0, NULL, NULL } }; static struct TokenInfo setup_info_shortcuts[] = { - { TYPE_ENTER_MENU, execSetupShortcuts1, "Various Keys" }, - { TYPE_ENTER_MENU, execSetupShortcuts2, "Player Focus" }, - { TYPE_ENTER_MENU, execSetupShortcuts3, "Tape Buttons" }, - { TYPE_ENTER_MENU, execSetupShortcuts4, "Sound & Music" }, - { TYPE_ENTER_MENU, execSetupShortcuts5, "TAS Snap Keys" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + { TYPE_ENTER_MENU, execSetupShortcuts1, "Various Keys" }, + { TYPE_ENTER_MENU, execSetupShortcuts2, "Player Focus" }, + { TYPE_ENTER_MENU, execSetupShortcuts3, "Tape Buttons" }, + { TYPE_ENTER_MENU, execSetupShortcuts4, "Sound & Music" }, + { TYPE_ENTER_MENU, execSetupShortcuts5, "TAS Snap Keys" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, - { 0, NULL, NULL } + { 0, NULL, NULL } }; static struct TokenInfo setup_info_shortcuts_1[] = { - { TYPE_KEYTEXT, NULL, "Quick Save Game to Tape:", }, - { TYPE_KEY, &setup.shortcut.save_game, "" }, - { TYPE_KEYTEXT, NULL, "Quick Load Game from Tape:", }, - { TYPE_KEY, &setup.shortcut.load_game, "" }, - { TYPE_KEYTEXT, NULL, "Restart Game:", }, - { TYPE_KEY, &setup.shortcut.restart_game, "" }, - { TYPE_KEYTEXT, NULL, "Replay & Pause Before End:", }, - { TYPE_KEY, &setup.shortcut.pause_before_end, "" }, - { TYPE_KEYTEXT, NULL, "Start Game & Toggle Pause:", }, - { TYPE_KEY, &setup.shortcut.toggle_pause, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_YES_NO, &setup.ask_on_escape, "Ask on 'Esc' Key:" }, - { TYPE_YES_NO, &setup.ask_on_escape_editor, "Ask on 'Esc' Key (Editor):" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupShortcuts, "Back" }, - - { 0, NULL, NULL } + { TYPE_KEYTEXT, NULL, "Quick Save Game to Tape:" }, + { TYPE_KEY, &setup.shortcut.save_game, "" }, + { TYPE_KEYTEXT, NULL, "Quick Load Game from Tape:" }, + { TYPE_KEY, &setup.shortcut.load_game, "" }, + { TYPE_KEYTEXT, NULL, "Restart Game:" }, + { TYPE_KEY, &setup.shortcut.restart_game, "" }, + { TYPE_KEYTEXT, NULL, "Replay & Pause Before End:" }, + { TYPE_KEY, &setup.shortcut.pause_before_end, "" }, + { TYPE_KEYTEXT, NULL, "Start Game & Toggle Pause:" }, + { TYPE_KEY, &setup.shortcut.toggle_pause, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_YES_NO, &setup.ask_on_escape, "Ask on 'Esc' Key:" }, + { TYPE_YES_NO, &setup.ask_on_escape_editor, "Ask on 'Esc' Key (Editor):" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupShortcuts, "Back" }, + + { 0, NULL, NULL } }; static struct TokenInfo setup_info_shortcuts_2[] = { - { TYPE_KEYTEXT, NULL, "Set Focus to Player 1:", }, - { TYPE_KEY, &setup.shortcut.focus_player[0], "" }, - { TYPE_KEYTEXT, NULL, "Set Focus to Player 2:", }, - { TYPE_KEY, &setup.shortcut.focus_player[1], "" }, - { TYPE_KEYTEXT, NULL, "Set Focus to Player 3:", }, - { TYPE_KEY, &setup.shortcut.focus_player[2], "" }, - { TYPE_KEYTEXT, NULL, "Set Focus to Player 4:", }, - { TYPE_KEY, &setup.shortcut.focus_player[3], "" }, - { TYPE_KEYTEXT, NULL, "Set Focus to All Players:", }, - { TYPE_KEY, &setup.shortcut.focus_player_all, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupShortcuts, "Back" }, - - { 0, NULL, NULL } + { TYPE_KEYTEXT, NULL, "Set Focus to Player 1:" }, + { TYPE_KEY, &setup.shortcut.focus_player[0], "" }, + { TYPE_KEYTEXT, NULL, "Set Focus to Player 2:" }, + { TYPE_KEY, &setup.shortcut.focus_player[1], "" }, + { TYPE_KEYTEXT, NULL, "Set Focus to Player 3:" }, + { TYPE_KEY, &setup.shortcut.focus_player[2], "" }, + { TYPE_KEYTEXT, NULL, "Set Focus to Player 4:" }, + { TYPE_KEY, &setup.shortcut.focus_player[3], "" }, + { TYPE_KEYTEXT, NULL, "Set Focus to All Players:" }, + { TYPE_KEY, &setup.shortcut.focus_player_all, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupShortcuts, "Back" }, + + { 0, NULL, NULL } }; static struct TokenInfo setup_info_shortcuts_3[] = { - { TYPE_KEYTEXT, NULL, "Eject Tape:", }, - { TYPE_KEY, &setup.shortcut.tape_eject, "" }, - { TYPE_KEYTEXT, NULL, "Warp / Single Step:", }, - { TYPE_KEY, &setup.shortcut.tape_extra, "" }, - { TYPE_KEYTEXT, NULL, "Stop Tape:", }, - { TYPE_KEY, &setup.shortcut.tape_stop, "" }, - { TYPE_KEYTEXT, NULL, "Pause / Unpause Tape:",}, - { TYPE_KEY, &setup.shortcut.tape_pause, "" }, - { TYPE_KEYTEXT, NULL, "Record Tape:", }, - { TYPE_KEY, &setup.shortcut.tape_record, "" }, - { TYPE_KEYTEXT, NULL, "Play Tape:", }, - { TYPE_KEY, &setup.shortcut.tape_play, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupShortcuts, "Back" }, - - { 0, NULL, NULL } + { TYPE_KEYTEXT, NULL, "Eject Tape:" }, + { TYPE_KEY, &setup.shortcut.tape_eject, "" }, + { TYPE_KEYTEXT, NULL, "Warp / Single Step:" }, + { TYPE_KEY, &setup.shortcut.tape_extra, "" }, + { TYPE_KEYTEXT, NULL, "Stop Tape:" }, + { TYPE_KEY, &setup.shortcut.tape_stop, "" }, + { TYPE_KEYTEXT, NULL, "Pause / Unpause Tape:" }, + { TYPE_KEY, &setup.shortcut.tape_pause, "" }, + { TYPE_KEYTEXT, NULL, "Record Tape:" }, + { TYPE_KEY, &setup.shortcut.tape_record, "" }, + { TYPE_KEYTEXT, NULL, "Play Tape:" }, + { TYPE_KEY, &setup.shortcut.tape_play, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupShortcuts, "Back" }, + + { 0, NULL, NULL } }; static struct TokenInfo setup_info_shortcuts_4[] = { - { TYPE_KEYTEXT, NULL, "Toggle Sound Effects (Normal):", }, - { TYPE_KEY, &setup.shortcut.sound_simple, "" }, - { TYPE_KEYTEXT, NULL, "Toggle Sound Effects (Looping):", }, - { TYPE_KEY, &setup.shortcut.sound_loops, "" }, - { TYPE_KEYTEXT, NULL, "Toggle Music:", }, - { TYPE_KEY, &setup.shortcut.sound_music, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupShortcuts, "Back" }, + { TYPE_KEYTEXT, NULL, "Toggle Sound Effects (Normal):" }, + { TYPE_KEY, &setup.shortcut.sound_simple, "" }, + { TYPE_KEYTEXT, NULL, "Toggle Sound Effects (Looping):" }, + { TYPE_KEY, &setup.shortcut.sound_loops, "" }, + { TYPE_KEYTEXT, NULL, "Toggle Music:" }, + { TYPE_KEY, &setup.shortcut.sound_music, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupShortcuts, "Back" }, - { 0, NULL, NULL } + { 0, NULL, NULL } }; static struct TokenInfo setup_info_shortcuts_5[] = { - { TYPE_KEYTEXT, NULL, "Snap Left:", }, - { TYPE_KEY, &setup.shortcut.snap_left, "" }, - { TYPE_KEYTEXT, NULL, "Snap Right:", }, - { TYPE_KEY, &setup.shortcut.snap_right, "" }, - { TYPE_KEYTEXT, NULL, "Snap Up:", }, - { TYPE_KEY, &setup.shortcut.snap_up, "" }, - { TYPE_KEYTEXT, NULL, "Snap Down:", }, - { TYPE_KEY, &setup.shortcut.snap_down, "" }, - { TYPE_EMPTY, NULL, "" }, - { TYPE_LEAVE_MENU, execSetupShortcuts, "Back" }, - - { 0, NULL, NULL } + { TYPE_KEYTEXT, NULL, "Snap Left:" }, + { TYPE_KEY, &setup.shortcut.snap_left, "" }, + { TYPE_KEYTEXT, NULL, "Snap Right:" }, + { TYPE_KEY, &setup.shortcut.snap_right, "" }, + { TYPE_KEYTEXT, NULL, "Snap Up:" }, + { TYPE_KEY, &setup.shortcut.snap_up, "" }, + { TYPE_KEYTEXT, NULL, "Snap Down:" }, + { TYPE_KEY, &setup.shortcut.snap_down, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupShortcuts, "Back" }, + + { 0, NULL, NULL } }; static Key getSetupKey(void) @@ -7556,7 +7821,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) @@ -8342,14 +8607,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) @@ -8414,6 +8683,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(); @@ -8436,8 +8709,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); @@ -8446,7 +8718,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(); @@ -8516,11 +8788,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"); @@ -8652,6 +8919,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) @@ -8785,7 +9057,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; } } @@ -8869,8 +9141,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); @@ -8881,7 +9152,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(); @@ -8998,7 +9269,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 || @@ -9199,8 +9470,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); @@ -9209,7 +9479,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(); @@ -9357,15 +9627,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; @@ -9381,7 +9644,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; @@ -9392,7 +9655,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, @@ -9400,7 +9663,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, @@ -9408,7 +9671,7 @@ 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_INFO, @@ -9416,7 +9679,7 @@ static struct 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_INFO, @@ -9424,7 +9687,7 @@ static struct FALSE, "next level" }, { - IMG_MENU_BUTTON_PREV_SCORE, IMG_MENU_BUTTON_PREV_SCORE_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, @@ -9432,7 +9695,7 @@ static struct FALSE, "previous score" }, { - IMG_MENU_BUTTON_NEXT_SCORE, IMG_MENU_BUTTON_NEXT_SCORE_ACTIVE, + 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, @@ -9440,7 +9703,7 @@ static struct FALSE, "next score" }, { - IMG_MENU_BUTTON_PLAY_TAPE, IMG_MENU_BUTTON_PLAY_TAPE, + 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, @@ -9448,7 +9711,7 @@ static struct FALSE, "play tape" }, { - IMG_MENU_BUTTON_FIRST_LEVEL, IMG_MENU_BUTTON_FIRST_LEVEL_ACTIVE, + 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, @@ -9456,7 +9719,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, @@ -9464,7 +9727,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, @@ -9472,7 +9735,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, @@ -9480,7 +9743,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, @@ -9488,7 +9751,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, @@ -9496,7 +9759,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, @@ -9504,7 +9767,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, @@ -9512,7 +9784,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, @@ -9520,7 +9792,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, @@ -9528,7 +9800,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, @@ -9536,7 +9808,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, @@ -9622,8 +9894,11 @@ static void CreateScreenMenubuttons(void) 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; @@ -9631,6 +9906,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)); @@ -9641,16 +9920,33 @@ 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; + + 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) { @@ -9666,7 +9962,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) @@ -9674,17 +9972,44 @@ 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 = (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, GDI_CUSTOM_TYPE_ID, i, GDI_IMAGE_ID, gfx_unpressed, @@ -9698,8 +10023,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, @@ -9985,7 +10310,7 @@ static void MapScreenGadgets(int num_entries) MapGadget(screen_gadget[scrollbar_info[i].gadget_id]); } -static void UnmapScreenGadgets() +static void UnmapScreenGadgets(void) { int i; @@ -10101,6 +10426,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(); @@ -10115,47 +10444,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: @@ -10188,6 +10517,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; @@ -10340,6 +10675,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];