X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=fc7602749d33b7d3091c04e18d8c6f03ae1f7cf5;hp=8b5c2bb474efcf9d70e24b507fc6ca684888e9ba;hb=20e9d89a234989e55d9d232b6e5ba5a81342ced6;hpb=73b48f8afe7e1e1faf0e87436d7d74b27bba5f27 diff --git a/src/screens.c b/src/screens.c index 8b5c2bb4..fc760274 100644 --- a/src/screens.c +++ b/src/screens.c @@ -27,7 +27,7 @@ #define DEBUG_JOYSTICKS 0 -/* screens on the info screen */ +// screens on the info screen #define INFO_MODE_MAIN 0 #define INFO_MODE_TITLE 1 #define INFO_MODE_ELEMENTS 2 @@ -39,9 +39,9 @@ #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) */ +// 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_EDITOR 2 @@ -57,32 +57,39 @@ #define SETUP_MODE_SHORTCUTS_4 12 #define SETUP_MODE_SHORTCUTS_5 13 -/* sub-screens on the setup screen (generic) */ +// sub-screens on the setup screen (generic) #define SETUP_MODE_CHOOSE_ARTWORK 14 #define SETUP_MODE_CHOOSE_OTHER 15 -/* sub-screens on the setup screen (specific) */ +// sub-screens on the setup screen (specific) #define SETUP_MODE_CHOOSE_GAME_SPEED 16 #define SETUP_MODE_CHOOSE_SCROLL_DELAY 17 #define SETUP_MODE_CHOOSE_SNAPSHOT_MODE 18 #define SETUP_MODE_CHOOSE_WINDOW_SIZE 19 #define SETUP_MODE_CHOOSE_SCALING_TYPE 20 #define SETUP_MODE_CHOOSE_RENDERING 21 -#define SETUP_MODE_CHOOSE_GRAPHICS 22 -#define SETUP_MODE_CHOOSE_SOUNDS 23 -#define SETUP_MODE_CHOOSE_MUSIC 24 -#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE 25 -#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 26 -#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 27 -#define SETUP_MODE_CHOOSE_TOUCH_CONTROL 28 -#define SETUP_MODE_CHOOSE_MOVE_DISTANCE 29 -#define SETUP_MODE_CHOOSE_DROP_DISTANCE 30 - -#define MAX_SETUP_MODES 31 +#define SETUP_MODE_CHOOSE_VSYNC 22 +#define SETUP_MODE_CHOOSE_GRAPHICS 23 +#define SETUP_MODE_CHOOSE_SOUNDS 24 +#define SETUP_MODE_CHOOSE_MUSIC 25 +#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE 26 +#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 27 +#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 28 +#define SETUP_MODE_CHOOSE_TOUCH_CONTROL 29 +#define SETUP_MODE_CHOOSE_MOVE_DISTANCE 30 +#define SETUP_MODE_CHOOSE_DROP_DISTANCE 31 +#define SETUP_MODE_CHOOSE_TRANSPARENCY 32 +#define SETUP_MODE_CHOOSE_GRID_XSIZE_0 33 +#define SETUP_MODE_CHOOSE_GRID_YSIZE_0 34 +#define SETUP_MODE_CHOOSE_GRID_XSIZE_1 35 +#define SETUP_MODE_CHOOSE_GRID_YSIZE_1 36 +#define SETUP_MODE_CONFIG_VIRT_BUTTONS 37 + +#define MAX_SETUP_MODES 38 #define MAX_MENU_MODES MAX(MAX_INFO_MODES, MAX_SETUP_MODES) -/* setup screen titles */ +// setup screen titles #define STR_SETUP_MAIN "Setup" #define STR_SETUP_GAME "Game & Menu" #define STR_SETUP_EDITOR "Editor" @@ -101,14 +108,20 @@ #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" -/* for input setup functions */ +// for input setup functions #define SETUPINPUT_SCREEN_POS_START 0 #define SETUPINPUT_SCREEN_POS_EMPTY1 3 #define SETUPINPUT_SCREEN_POS_EMPTY2 12 @@ -117,7 +130,9 @@ #define MENU_SETUP_FONT_TITLE FONT_TEXT_1 #define MENU_SETUP_FONT_TEXT FONT_TITLE_2 -/* for various menu stuff */ +#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) @@ -156,25 +171,33 @@ #define MAX_MENU_TEXT_LENGTH_BIG 13 #define MAX_MENU_TEXT_LENGTH_MEDIUM (MAX_MENU_TEXT_LENGTH_BIG * 2) -/* buttons and scrollbars identifiers */ +// screen gadget identifiers #define SCREEN_CTRL_ID_PREV_LEVEL 0 #define SCREEN_CTRL_ID_NEXT_LEVEL 1 -#define SCREEN_CTRL_ID_PREV_PLAYER 2 -#define SCREEN_CTRL_ID_NEXT_PLAYER 3 -#define SCREEN_CTRL_ID_SCROLL_UP 4 -#define SCREEN_CTRL_ID_SCROLL_DOWN 5 -#define SCREEN_CTRL_ID_SCROLL_VERTICAL 6 - -#define NUM_SCREEN_GADGETS 7 - -#define NUM_SCREEN_MENUBUTTONS 4 +#define SCREEN_CTRL_ID_FIRST_LEVEL 2 +#define SCREEN_CTRL_ID_LAST_LEVEL 3 +#define SCREEN_CTRL_ID_LEVEL_NUMBER 4 +#define SCREEN_CTRL_ID_PREV_PLAYER 5 +#define SCREEN_CTRL_ID_NEXT_PLAYER 6 +#define SCREEN_CTRL_ID_INSERT_SOLUTION 7 +#define SCREEN_CTRL_ID_PLAY_SOLUTION 8 +#define SCREEN_CTRL_ID_SCROLL_UP 9 +#define SCREEN_CTRL_ID_SCROLL_DOWN 10 +#define SCREEN_CTRL_ID_SCROLL_VERTICAL 11 +#define SCREEN_CTRL_ID_NETWORK_SERVER 12 + +#define NUM_SCREEN_GADGETS 13 + +#define NUM_SCREEN_MENUBUTTONS 9 #define NUM_SCREEN_SCROLLBUTTONS 2 #define NUM_SCREEN_SCROLLBARS 1 +#define NUM_SCREEN_TEXTINPUT 1 #define SCREEN_MASK_MAIN (1 << 0) -#define SCREEN_MASK_INPUT (1 << 1) +#define SCREEN_MASK_MAIN_HAS_SOLUTION (1 << 1) +#define SCREEN_MASK_INPUT (1 << 2) -/* graphic position and size values for buttons and scrollbars */ +// graphic position and size values for buttons and scrollbars #define SC_MENUBUTTON_XSIZE TILEX #define SC_MENUBUTTON_YSIZE TILEY @@ -201,13 +224,13 @@ #define SC_BORDER_SIZE 14 -/* forward declarations of internal functions */ +// forward declarations of internal functions static void HandleScreenGadgets(struct GadgetInfo *); static void HandleSetupScreen_Generic(int, int, int, int, int); static void HandleSetupScreen_Input(int, int, int, int, int); static void CustomizeKeyboard(int); static void ConfigureJoystick(int); -static void ConfigureVirtualButtons(); +static void ConfigureVirtualButtons(void); static void execSetupGame(void); static void execSetupGraphics(void); static void execSetupSound(void); @@ -231,10 +254,15 @@ static void HandleInfoScreen_Credits(int); static void HandleInfoScreen_Program(int); static void HandleInfoScreen_Version(int); +static void ModifyGameSpeedIfNeeded(void); +static void DisableVsyncIfNeeded(void); + static void MapScreenMenuGadgets(int); static void MapScreenGadgets(int); static void MapScreenTreeGadgets(TreeInfo *); +static void UpdateScreenMenuGadgets(int, boolean); + static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS]; static int info_mode = INFO_MODE_MAIN; @@ -249,12 +277,17 @@ static TreeInfo *scaling_type_current = NULL; static TreeInfo *rendering_modes = NULL; static TreeInfo *rendering_mode_current = NULL; +static TreeInfo *vsync_modes = NULL; +static TreeInfo *vsync_mode_current = NULL; + static TreeInfo *scroll_delays = NULL; static TreeInfo *scroll_delay_current = NULL; static TreeInfo *snapshot_modes = NULL; static TreeInfo *snapshot_mode_current = NULL; +static TreeInfo *game_speeds_normal = NULL; +static TreeInfo *game_speeds_extended = NULL; static TreeInfo *game_speeds = NULL; static TreeInfo *game_speed_current = NULL; @@ -276,14 +309,16 @@ static TreeInfo *move_distance_current = NULL; static TreeInfo *drop_distances = NULL; static TreeInfo *drop_distance_current = NULL; +static TreeInfo *transparencies = NULL; +static TreeInfo *transparency_current = NULL; + +static TreeInfo *grid_sizes[2][2] = { { NULL, NULL }, { NULL, NULL } }; +static TreeInfo *grid_size_current[2][2] = { { NULL, NULL }, { NULL, NULL } }; + static TreeInfo *level_number = NULL; static TreeInfo *level_number_current = NULL; -static struct -{ - int value; - char *text; -} window_sizes_list[] = +static struct ValueTextInfo window_sizes_list[] = { { 50, "50 %" }, { 80, "80 %" }, @@ -301,11 +336,7 @@ static struct { -1, NULL }, }; -static struct -{ - char *value; - char *text; -} scaling_types_list[] = +static struct StringValueTextInfo scaling_types_list[] = { { SCALING_QUALITY_NEAREST, "Off" }, { SCALING_QUALITY_LINEAR, "Linear" }, @@ -314,11 +345,7 @@ static struct { NULL, NULL }, }; -static struct -{ - char *value; - char *text; -} rendering_modes_list[] = +static struct StringValueTextInfo rendering_modes_list[] = { { STR_SPECIAL_RENDERING_OFF, "Off (May show artifacts, fast)" }, { STR_SPECIAL_RENDERING_BITMAP, "Bitmap/Texture mode (slower)" }, @@ -331,42 +358,49 @@ static struct { NULL, NULL }, }; -static struct +static struct StringValueTextInfo vsync_modes_list[] = { - int value; - char *text; -} game_speeds_list[] = + { STR_VSYNC_MODE_OFF, "Off" }, + { STR_VSYNC_MODE_NORMAL, "Normal" }, + { STR_VSYNC_MODE_ADAPTIVE, "Adaptive" }, + + { NULL, NULL }, +}; + +static struct ValueTextInfo game_speeds_list_normal[] = { -#if 1 { 30, "Very Slow" }, { 25, "Slow" }, { 20, "Normal" }, { 15, "Fast" }, { 10, "Very Fast" }, -#else - { 1000, "1/1s (Extremely Slow)" }, - { 500, "1/2s" }, - { 200, "1/5s" }, - { 100, "1/10s" }, - { 50, "1/20s" }, - { 29, "1/35s (Original Supaplex)" }, - { 25, "1/40s" }, - { 20, "1/50s (Normal Speed)" }, - { 14, "1/70s (Maximum Supaplex)" }, - { 10, "1/100s" }, - { 5, "1/200s" }, - { 2, "1/500s" }, - { 1, "1/1000s (Extremely Fast)" }, -#endif { -1, NULL }, }; -static struct -{ - int value; - char *text; -} scroll_delays_list[] = +static struct ValueTextInfo game_speeds_list_extended[] = +{ + { 1000, "1 fps (Extremely Slow)" }, + { 500, "2 fps" }, + { 200, "5 fps" }, + { 100, "10 fps" }, + { 50, "20 fps" }, + { 29, "35 fps (Original Supaplex)" }, + { 25, "40 fps" }, + { 20, "50 fps (=== Normal Speed ===)" }, + { 16, "60 fps (60 Hz VSync Speed)" }, + { 14, "70 fps (Maximum Supaplex)" }, + { 10, "100 fps" }, + { 5, "200 fps" }, + { 2, "500 fps" }, + { 1, "1000 fps (Extremely Fast)" }, + + { -1, NULL }, +}; + +static struct ValueTextInfo *game_speeds_list; + +static struct ValueTextInfo scroll_delays_list[] = { { 0, "0 Tiles (No Scroll Delay)" }, { 1, "1 Tile" }, @@ -381,11 +415,7 @@ static struct { -1, NULL }, }; -static struct -{ - char *value; - char *text; -} snapshot_modes_list[] = +static struct StringValueTextInfo snapshot_modes_list[] = { { STR_SNAPSHOT_MODE_OFF, "Off" }, { STR_SNAPSHOT_MODE_EVERY_STEP, "Every Step" }, @@ -395,11 +425,7 @@ static struct { NULL, NULL }, }; -static struct -{ - int value; - char *text; -} volumes_list[] = +static struct ValueTextInfo volumes_list[] = { { 0, "0 %" }, { 1, "1 %" }, @@ -419,11 +445,7 @@ static struct { -1, NULL }, }; -static struct -{ - char *value; - char *text; -} touch_controls_list[] = +static struct StringValueTextInfo touch_controls_list[] = { { TOUCH_CONTROL_OFF, "Off" }, { TOUCH_CONTROL_VIRTUAL_BUTTONS, "Virtual Buttons" }, @@ -433,11 +455,7 @@ static struct { NULL, NULL }, }; -static struct -{ - int value; - char *text; -} distances_list[] = +static struct ValueTextInfo distances_list[] = { { 1, "1 %" }, { 2, "2 %" }, @@ -452,12 +470,68 @@ static struct { -1, NULL }, }; +static struct ValueTextInfo transparencies_list[] = +{ + { 0, "0 % (Opaque)" }, + { 10, "10 %" }, + { 20, "20 %" }, + { 30, "30 %" }, + { 40, "40 %" }, + { 50, "50 %" }, + { 60, "60 %" }, + { 70, "70 %" }, + { 80, "80 %" }, + { 90, "90 %" }, + { 100, "100 % (Invisible)" }, + + { -1, NULL }, +}; + +static struct ValueTextInfo grid_sizes_list[] = +{ + { 3, "3" }, + { 4, "4" }, + { 5, "5" }, + { 6, "6" }, + { 7, "7" }, + { 8, "8" }, + { 9, "9" }, + { 10, "10" }, + { 11, "11" }, + { 12, "12" }, + { 13, "13" }, + { 14, "14" }, + { 15, "15" }, + { 16, "16" }, + { 17, "17" }, + { 18, "18" }, + { 19, "19" }, + { 20, "20" }, + { 21, "21" }, + { 22, "22" }, + { 23, "23" }, + { 24, "24" }, + { 25, "25" }, + { 26, "26" }, + { 27, "27" }, + { 28, "28" }, + { 29, "29" }, + { 30, "30" }, + { 31, "31" }, + { 32, "32" }, + + { -1, NULL }, +}; + +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 : GAME_MODE_DEFAULT) -/* (there are no draw offset definitions needed for INFO_MODE_TITLE) */ +// (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) : \ INFO_MODE_MAIN) @@ -508,6 +582,9 @@ static struct #define mSX (SX + DRAW_XOFFSET(game_status)) #define mSY (SY + DRAW_YOFFSET(game_status)) +#define amSX (mSX + align_xoffset) +#define amSY (mSY + align_yoffset) + #define NUM_MENU_ENTRIES_ON_SCREEN (menu.list_size[game_status] > 2 ? \ menu.list_size[game_status] : \ MAX_MENU_ENTRIES_ON_SCREEN) @@ -516,7 +593,7 @@ static struct NUM_MENU_ENTRIES_ON_SCREEN) -/* title display and control definitions */ +// title display and control definitions #define MAX_NUM_TITLE_SCREENS (2 * MAX_NUM_TITLE_IMAGES + \ 2 * MAX_NUM_TITLE_MESSAGES) @@ -537,7 +614,7 @@ struct TitleControlInfo struct TitleControlInfo title_controls[MAX_NUM_TITLE_SCREENS]; -/* main menu display and control definitions */ +// main menu display and control definitions #define MAIN_CONTROL_NAME 0 #define MAIN_CONTROL_LEVELS 1 @@ -569,6 +646,8 @@ static char str_main_text_first_level[10]; static char str_main_text_last_level[10]; static char str_main_text_level_number[10]; +static char network_server_hostname[MAX_SETUP_TEXT_INPUT_LEN + 1]; + static char *main_text_name = str_main_text_name; static char *main_text_first_level = str_main_text_first_level; static char *main_text_last_level = str_main_text_last_level; @@ -654,21 +733,18 @@ static struct MainControlInfo main_controls[] = &menu.main.text.quit, &main_text_quit, NULL, NULL, }, -#if 0 - /* (these two buttons are real gadgets) */ { MAIN_CONTROL_PREV_LEVEL, - &menu.main.button.prev_level, IMG_MENU_BUTTON_PREV_LEVEL, + NULL, -1, NULL, NULL, NULL, NULL, }, { MAIN_CONTROL_NEXT_LEVEL, - &menu.main.button.next_level, IMG_MENU_BUTTON_NEXT_LEVEL, + NULL, -1, NULL, NULL, NULL, NULL, }, -#endif { MAIN_CONTROL_FIRST_LEVEL, NULL, -1, @@ -912,6 +988,7 @@ static struct TitleFadingInfo getTitleFading(struct TitleControlInfo *tci) ti.fade_delay = tmi.fade_delay; ti.post_delay = tmi.post_delay; ti.auto_delay = tmi.auto_delay; + ti.auto_delay_unit = tmi.auto_delay_unit; return ti; } @@ -943,7 +1020,7 @@ static void InitializeTitleControlsExt_AddTitleInfo(boolean is_image, title_controls[num_title_screens].local_nr = nr; title_controls[num_title_screens].sort_priority = sort_priority; - title_controls[num_title_screens].first = FALSE; /* will be set later */ + title_controls[num_title_screens].first = FALSE; // will be set later num_title_screens++; } @@ -977,18 +1054,18 @@ static void InitializeTitleControls(boolean show_title_initial) { num_title_screens = 0; - /* 1st step: initialize title screens for game start (only when starting) */ + // 1st step: initialize title screens for game start (only when starting) if (show_title_initial) InitializeTitleControls_CheckTitleInfo(TRUE); - /* 2nd step: initialize title screens for current level set */ + // 2nd step: initialize title screens for current level set InitializeTitleControls_CheckTitleInfo(FALSE); - /* sort title screens according to sort_priority and title number */ + // sort title screens according to sort_priority and title number qsort(title_controls, num_title_screens, sizeof(struct TitleControlInfo), compareTitleControlInfo); - /* mark first title screen */ + // mark first title screen title_controls[0].first = TRUE; } @@ -1002,12 +1079,12 @@ static boolean visibleTextPos(struct TextPosInfo *pos) return (pos != NULL && pos->x != -1 && pos->y != -1); } -static void InitializeMainControls() +static void InitializeMainControls(void) { - boolean local_team_mode = (!options.network && setup.team_mode); + boolean local_team_mode = (!network.enabled && setup.team_mode); int i; - /* set main control text values to dynamically determined values */ + // set main control text values to dynamically determined values sprintf(main_text_name, "%s", local_team_mode ? "Team:" : "Name:"); strcpy(main_text_first_level, int2str(leveldir_current->first_level, @@ -1026,7 +1103,7 @@ static void InitializeMainControls() main_text_title_2 = getConfigProgramCopyrightString(); main_text_title_3 = getConfigProgramCompanyString(); - /* set main control screen positions to dynamically determined values */ + // set main control screen positions to dynamically determined values for (i = 0; main_controls[i].nr != -1; i++) { struct MainControlInfo *mci = &main_controls[i]; @@ -1062,16 +1139,16 @@ static void InitializeMainControls() menu.main.input.name.height = input_height; } - if (pos_button != NULL) /* (x/y may be -1/-1 here) */ + if (pos_button != NULL) // (x/y may be -1/-1 here) { pos_button->width = button_width; pos_button->height = button_height; } - if (pos_text != NULL) /* (x/y may be -1/-1 here) */ + if (pos_text != NULL) // (x/y may be -1/-1 here) { - /* calculate size for non-clickable text -- needed for text alignment */ - boolean calculate_text_size = (pos_button == NULL && text != NULL); + // calculate text size -- needed for text alignment + boolean calculate_text_size = (text != NULL); if (pos_text->width == -1 || calculate_text_size) pos_text->width = text_width; @@ -1088,7 +1165,7 @@ static void InitializeMainControls() } } - if (pos_input != NULL) /* (x/y may be -1/-1 here) */ + if (pos_input != NULL) // (x/y may be -1/-1 here) { if (visibleTextPos(pos_text)) { @@ -1170,7 +1247,7 @@ static void DrawCursorAndText_Main_Ext(int nr, boolean active_text, int y = mSY + ALIGNED_TEXT_YPOS(pos); #if 1 - /* (check why/if this is needed) */ + // (check why/if this is needed) DrawBackgroundForFont(x, y, pos->width, pos->height, font_text); #endif DrawText(x, y, text, font_text); @@ -1183,7 +1260,7 @@ static void DrawCursorAndText_Main_Ext(int nr, boolean active_text, int y = mSY + ALIGNED_TEXT_YPOS(pos); #if 1 - /* (check why/if this is needed) */ + // (check why/if this is needed) DrawBackgroundForFont(x, y, pos->width, pos->height, font_input); #endif DrawText(x, y, input, font_input); @@ -1278,15 +1355,15 @@ static void AdjustChooseTreeScrollbar(int id, int first_entry, TreeInfo *ti) first_entry); } -static void clearMenuListArea() +static void clearMenuListArea(void) { int scrollbar_xpos = mSX + SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset; - /* correct scrollbar position if placed outside menu (playfield) area */ + // correct scrollbar position if placed outside menu (playfield) area if (scrollbar_xpos > SX + SC_SCROLLBAR_XPOS) scrollbar_xpos = SX + SC_SCROLLBAR_XPOS; - /* clear menu list area, but not title or scrollbar */ + // 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); } @@ -1294,8 +1371,8 @@ static void clearMenuListArea() static void drawCursorExt(int xpos, int ypos, boolean active, int graphic) { static int cursor_array[MAX_LEV_FIELDY]; - int x = mSX + TILEX * xpos; - int y = mSY + TILEY * (MENU_SCREEN_START_YPOS + ypos); + int x = amSX + TILEX * xpos; + int y = amSY + TILEY * (MENU_SCREEN_START_YPOS + ypos); if (xpos == 0) { @@ -1332,13 +1409,13 @@ static void drawChooseTreeCursor(int ypos, boolean active) drawCursorExt(0, ypos, active, -1); } -void DrawHeadline() +static void DrawHeadline(void) { DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, main_text_title_1); DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, main_text_title_2); } -void DrawTitleScreenImage(int nr, boolean initial) +static void DrawTitleScreenImage(int nr, boolean initial) { int graphic = getTitleScreenGraphic(nr, initial); Bitmap *bitmap = graphic_info[graphic].bitmap; @@ -1353,19 +1430,19 @@ void DrawTitleScreenImage(int nr, boolean initial) if (width > WIN_XSIZE) { - /* image width too large for window => center image horizontally */ + // image width too large for window => center image horizontally src_x = (width - WIN_XSIZE) / 2; width = WIN_XSIZE; } if (height > WIN_YSIZE) { - /* image height too large for window => center image vertically */ + // image height too large for window => center image vertically src_y = (height - WIN_YSIZE) / 2; height = WIN_YSIZE; } - /* always display title screens centered */ + // always display title screens centered dst_x = (WIN_XSIZE - width) / 2; dst_y = (WIN_YSIZE - height) / 2; @@ -1382,7 +1459,7 @@ void DrawTitleScreenImage(int nr, boolean initial) redraw_mask = REDRAW_ALL; } -void DrawTitleScreenMessage(int nr, boolean initial) +static void DrawTitleScreenMessage(int nr, boolean initial) { char *filename = getLevelSetTitleMessageFilename(nr, initial); struct TitleMessageInfo *tmi = getTitleMessageInfo(nr, initial); @@ -1390,34 +1467,34 @@ void DrawTitleScreenMessage(int nr, boolean initial) if (filename == NULL) return; - /* force TITLE font on title message screen */ + // force TITLE font on title message screen SetFontStatus(getTitleMessageGameMode(initial)); - /* if chars *and* width set to "-1", automatically determine width */ + // if chars *and* width set to "-1", automatically determine width if (tmi->chars == -1 && tmi->width == -1) tmi->width = viewport.window[game_status].width; - /* if lines *and* height set to "-1", automatically determine height */ + // if lines *and* height set to "-1", automatically determine height if (tmi->lines == -1 && tmi->height == -1) tmi->height = viewport.window[game_status].height; - /* if chars set to "-1", automatically determine by text and font width */ + // if chars set to "-1", automatically determine by text and font width if (tmi->chars == -1) tmi->chars = tmi->width / getFontWidth(tmi->font); else tmi->width = tmi->chars * getFontWidth(tmi->font); - /* if lines set to "-1", automatically determine by text and font height */ + // if 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 x set to "-1", automatically determine by width and alignment */ + // if x set to "-1", automatically determine by width and alignment if (tmi->x == -1) tmi->x = -1 * ALIGNED_XPOS(0, tmi->width, tmi->align); - /* if y set to "-1", automatically determine by height and alignment */ + // if y set to "-1", automatically determine by height and alignment if (tmi->y == -1) tmi->y = -1 * ALIGNED_YPOS(0, tmi->height, tmi->valign); @@ -1433,31 +1510,31 @@ void DrawTitleScreenMessage(int nr, boolean initial) ResetFontStatus(); } -void DrawTitleScreen() +static void DrawTitleScreen(void) { KeyboardAutoRepeatOff(); HandleTitleScreen(0, 0, 0, 0, MB_MENU_INITIALIZE); } -boolean CheckTitleScreen(boolean levelset_has_changed) +static boolean CheckTitleScreen(boolean levelset_has_changed) { static boolean show_title_initial = TRUE; boolean show_titlescreen = FALSE; - /* needed to be able to skip title screen, if no image or message defined */ + // needed to be able to skip title screen, if no image or message defined InitializeTitleControls(show_title_initial); if (setup.show_titlescreen && (show_title_initial || levelset_has_changed)) show_titlescreen = TRUE; - /* show initial title images and messages only once at program start */ + // show initial title images and messages only once at program start show_title_initial = FALSE; return (show_titlescreen && num_title_screens > 0); } -void DrawMainMenu() +void DrawMainMenu(void) { static LevelDirTree *leveldir_last_valid = NULL; boolean levelset_has_changed = FALSE; @@ -1467,7 +1544,7 @@ void DrawMainMenu() FadeSetLeaveScreen(); - /* do not fade out here -- function may continue and fade on editor screen */ + // do not fade out here -- function may continue and fade on editor screen UnmapAllGadgets(); FadeMenuSoundsAndMusic(); @@ -1480,7 +1557,7 @@ void DrawMainMenu() GetPlayerConfig(); - /* needed if last screen was the playing screen, invoked from level editor */ + // needed if last screen was the playing screen, invoked from level editor if (level_editor_test_game) { CloseDoor(DOOR_CLOSE_ALL); @@ -1492,23 +1569,23 @@ void DrawMainMenu() return; } - /* needed if last screen was the setup screen and fullscreen state changed */ + // needed if last screen was the setup screen and fullscreen state changed // (moved to "execSetupGraphics()" to change fullscreen state directly) // ToggleFullscreenOrChangeWindowScalingIfNeeded(); - /* leveldir_current may be invalid (level group, parent link) */ + // leveldir_current may be invalid (level group, parent link) if (!validLevelSeries(leveldir_current)) leveldir_current = getFirstValidTreeInfoEntry(leveldir_last_valid); if (leveldir_current != leveldir_last_valid) levelset_has_changed = TRUE; - /* store valid level series information */ + // store valid level series information leveldir_last_valid = leveldir_current; - init_last = init; /* switch to new busy animation */ + init_last = init; // switch to new busy animation - /* needed if last screen (level choice) changed graphics, sounds or music */ + // needed if last screen (level choice) changed graphics, sounds or music ReloadCustomArtwork(0); if (CheckTitleScreen(levelset_has_changed)) @@ -1523,17 +1600,17 @@ void DrawMainMenu() if (redraw_mask & REDRAW_ALL) fade_mask = REDRAW_ALL; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; FadeOut(fade_mask); - /* needed if different viewport properties defined for menues */ + // needed if different viewport properties defined for menues ChangeViewportPropertiesIfNeeded(); SetDrawtoField(DRAW_TO_BACKBUFFER); - /* level_nr may have been set to value over handicap with level editor */ + // 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; @@ -1559,6 +1636,7 @@ void DrawMainMenu() DrawCursorAndText_Main(-1, FALSE, FALSE); DrawPreviewLevelInitial(); + DrawNetworkPlayers(); HandleMainMenu(0, 0, 0, 0, MB_MENU_INITIALIZE); @@ -1569,15 +1647,20 @@ void DrawMainMenu() PlayMenuSoundsAndMusic(); - /* create gadgets for main menu screen */ + // create gadgets for main menu screen FreeScreenGadgets(); CreateScreenGadgets(); - /* map gadgets for main menu screen */ + // may be required if audio buttons shown on tape and changed in setup menu + FreeGameButtons(); + CreateGameButtons(); + + // map gadgets for main menu screen MapTapeButtons(); MapScreenMenuGadgets(SCREEN_MASK_MAIN); + UpdateScreenMenuGadgets(SCREEN_MASK_MAIN_HAS_SOLUTION, hasSolutionTape()); - /* copy actual game door content to door double buffer for OpenDoor() */ + // copy actual game door content to door double buffer for OpenDoor() BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0); BlitBitmap(drawto, bitmap_db_door_2, VX, VY, VXSIZE, VYSIZE, 0, 0); @@ -1588,7 +1671,7 @@ void DrawMainMenu() FadeIn(fade_mask); FadeSetEnterMenu(); - /* update screen area with special editor door */ + // update screen area with special editor door redraw_mask |= REDRAW_ALL; BackToFront(); @@ -1597,25 +1680,20 @@ void DrawMainMenu() OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2); } -static void gotoTopLevelDir() +static void gotoTopLevelDir(void) { - /* move upwards until inside (but not above) top level directory */ + // move upwards until inside (but not above) top level directory while (leveldir_current->node_parent && !strEqual(leveldir_current->node_parent->subdir, STRING_TOP_DIRECTORY)) { - /* write a "path" into level tree for easy navigation to last level */ + // write a "path" into level tree for easy navigation to last level if (leveldir_current->node_parent->node_group->cl_first == -1) { int num_leveldirs = numTreeInfoInGroup(leveldir_current); int leveldir_pos = posTreeInfo(leveldir_current); - int num_page_entries; + int num_page_entries = MIN(num_leveldirs, NUM_MENU_ENTRIES_ON_SCREEN); int cl_first, cl_cursor; - if (num_leveldirs <= NUM_MENU_ENTRIES_ON_SCREEN) - num_page_entries = num_leveldirs; - else - num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN; - cl_first = MAX(0, leveldir_pos - num_page_entries + 1); cl_cursor = leveldir_pos - cl_first; @@ -1627,6 +1705,25 @@ static void gotoTopLevelDir() } } +static unsigned int getAutoDelayCounter(struct TitleFadingInfo *fi) +{ + boolean use_frame_counter = (fi->auto_delay_unit == AUTO_DELAY_UNIT_FRAMES); + + return (use_frame_counter ? video.frame_counter : Counter()); +} + +static boolean TitleAutoDelayReached(unsigned int *counter_var, + struct TitleFadingInfo *fi) +{ + return DelayReachedExt(counter_var, fi->auto_delay, getAutoDelayCounter(fi)); +} + +static void ResetTitleAutoDelay(unsigned int *counter_var, + struct TitleFadingInfo *fi) +{ + *counter_var = getAutoDelayCounter(fi); +} + void HandleTitleScreen(int mx, int my, int dx, int dy, int button) { static unsigned int title_delay = 0; @@ -1651,7 +1748,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) { FadeSetEnterScreen(); - /* use individual title fading instead of global "enter screen" fading */ + // use individual title fading instead of global "enter screen" fading fading = getTitleFading(tci); } @@ -1659,26 +1756,26 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) { if (num_title_screens == 0) { - /* switch game mode from title screen mode back to info screen mode */ + // switch game mode from title screen mode back to info screen mode SetGameStatus(GAME_MODE_INFO); - /* store that last screen was info screen, not main menu screen */ + // store that last screen was info screen, not main menu screen game_status_last_screen = GAME_MODE_INFO; DrawInfoScreen_NotAvailable("Title screen information:", "No title screen for this level set."); return; } - - FadeMenuSoundsAndMusic(); } + FadeMenuSoundsAndMusic(); + FadeOut(REDRAW_ALL); - /* title screens may have different window size */ + // title screens may have different window size ChangeViewportPropertiesIfNeeded(); - /* only required to update logic for redrawing global border */ + // only required to update logic for redrawing global border ClearField(); if (tci->is_image) @@ -1701,12 +1798,12 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) FadeIn(REDRAW_ALL); - DelayReached(&title_delay, 0); /* reset delay counter */ + ResetTitleAutoDelay(&title_delay, &fading); return; } - if (fading.auto_delay > 0 && DelayReached(&title_delay, fading.auto_delay)) + if (fading.auto_delay > 0 && TitleAutoDelayReached(&title_delay, &fading)) button = MB_MENU_CHOICE; if (button == MB_MENU_LEAVE) @@ -1764,7 +1861,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) FadeIn(REDRAW_ALL); - DelayReached(&title_delay, 0); /* reset delay counter */ + ResetTitleAutoDelay(&title_delay, &fading); } else { @@ -1778,7 +1875,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) { SetMouseCursor(CURSOR_DEFAULT); - /* force full menu screen redraw after displaying title screens */ + // force full menu screen redraw after displaying title screens redraw_mask = REDRAW_ALL; if (game_status_last_screen == GAME_MODE_INFO) @@ -1789,7 +1886,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) DrawInfoScreen(); } - else /* default: return to main menu */ + else // default: return to main menu { SetGameStatus(GAME_MODE_MAIN); @@ -1798,7 +1895,8 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) } } -void HandleMainMenu_SelectLevel(int step, int direction, int selected_level_nr) +static void HandleMainMenu_SelectLevel(int step, int direction, + int selected_level_nr) { int old_level_nr = level_nr; int new_level_nr; @@ -1815,7 +1913,7 @@ void HandleMainMenu_SelectLevel(int step, int direction, int selected_level_nr) if (setup.handicap && new_level_nr > leveldir_current->handicap_level) { - /* skipping levels is only allowed when trying to skip single 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)) { @@ -1828,7 +1926,7 @@ void HandleMainMenu_SelectLevel(int step, int direction, int selected_level_nr) if (new_level_nr != old_level_nr) { - struct MainControlInfo *mci= getMainControlInfo(MAIN_CONTROL_LEVEL_NUMBER); + struct MainControlInfo *mci = getMainControlInfo(MAIN_CONTROL_LEVEL_NUMBER); PlaySound(SND_MENU_ITEM_SELECTING); @@ -1847,9 +1945,10 @@ void HandleMainMenu_SelectLevel(int step, int direction, int selected_level_nr) SaveLevelSetup_SeriesInfo(); - /* needed because DrawPreviewLevelInitial() takes some time */ - BackToFront(); - /* SyncDisplay(); */ + UpdateScreenMenuGadgets(SCREEN_MASK_MAIN_HAS_SOLUTION, hasSolutionTape()); + + // force redraw of playfield area (may be reset at this point) + redraw_mask |= REDRAW_FIELD; } } @@ -1859,7 +1958,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) static boolean button_pressed_last = FALSE; boolean button_pressed = FALSE; int pos = choice; - int i; + int i = 0; // needed to prevent compiler warning due to bad code below if (button == MB_MENU_INITIALIZE) { @@ -1868,7 +1967,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) return; } - if (mx || my) /* mouse input */ + if (mx || my) // mouse input { pos = -1; @@ -1884,7 +1983,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) } } - /* check if level preview was clicked */ + // check if level preview was clicked if (insidePreviewRect(&preview, mx - SX, my - SY)) pos = MAIN_CONTROL_GAME; @@ -1905,7 +2004,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) PlaySound(SND_MENU_BUTTON_RELEASING); } } - else if (dx || dy) /* keyboard input */ + else if (dx || dy) // keyboard input { if (dx > 0 && (choice == MAIN_CONTROL_INFO || choice == MAIN_CONTROL_SETUP)) @@ -1956,9 +2055,23 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (pos == MAIN_CONTROL_NAME) { - SetGameStatus(GAME_MODE_PSEUDO_TYPENAME); + if ((mx || my) && + insideTextPosRect(main_controls[i].pos_text, mx - mSX, my - mSY)) + { + // special case: menu text "name/team" clicked -- toggle team mode + setup.team_mode = !setup.team_mode; + + InitializeMainControls(); + DrawCursorAndText_Main(choice, TRUE, FALSE); + + DrawPreviewPlayers(); + } + else + { + SetGameStatus(GAME_MODE_PSEUDO_TYPENAME); - HandleTypeName(strlen(setup.player_name), 0); + HandleTypeName(strlen(setup.player_name), 0); + } } else if (pos == MAIN_CONTROL_LEVELS) { @@ -1983,7 +2096,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) SetGameStatus(GAME_MODE_SCORES); - DrawHallOfFame(-1); + DrawHallOfFame(level_nr, -1); } else if (pos == MAIN_CONTROL_EDITOR) { @@ -2011,7 +2124,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) } else if (pos == MAIN_CONTROL_GAME) { - StartGameActions(options.network, setup.autorecord, level.random_seed); + StartGameActions(network.enabled, setup.autorecord, level.random_seed); } else if (pos == MAIN_CONTROL_SETUP) { @@ -2038,64 +2151,64 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) } -/* ========================================================================= */ -/* info screen functions */ -/* ========================================================================= */ +// ============================================================================ +// info screen functions +// ============================================================================ static struct TokenInfo *info_info; -static int num_info_info; /* number of info entries shown on screen */ -static int max_info_info; /* total number of info entries in list */ +static int num_info_info; // number of info entries shown on screen +static int max_info_info; // total number of info entries in list -static void execInfoTitleScreen() +static void execInfoTitleScreen(void) { info_mode = INFO_MODE_TITLE; DrawInfoScreen(); } -static void execInfoElements() +static void execInfoElements(void) { info_mode = INFO_MODE_ELEMENTS; DrawInfoScreen(); } -static void execInfoMusic() +static void execInfoMusic(void) { info_mode = INFO_MODE_MUSIC; DrawInfoScreen(); } -static void execInfoCredits() +static void execInfoCredits(void) { info_mode = INFO_MODE_CREDITS; DrawInfoScreen(); } -static void execInfoProgram() +static void execInfoProgram(void) { info_mode = INFO_MODE_PROGRAM; DrawInfoScreen(); } -static void execInfoVersion() +static void execInfoVersion(void) { info_mode = INFO_MODE_VERSION; DrawInfoScreen(); } -static void execInfoLevelSet() +static void execInfoLevelSet(void) { info_mode = INFO_MODE_LEVELSET; DrawInfoScreen(); } -static void execExitInfo() +static void execExitInfo(void) { SetGameStatus(GAME_MODE_MAIN); @@ -2123,9 +2236,11 @@ static int getMenuTextFont(int type) TYPE_YES_NO | TYPE_YES_NO_AUTO | TYPE_STRING | + TYPE_PLAYER | TYPE_ECS_AGA | TYPE_KEYTEXT | - TYPE_ENTER_LIST)) + TYPE_ENTER_LIST | + TYPE_TEXT_INPUT)) return FONT_MENU_2; else return FONT_MENU_1; @@ -2172,6 +2287,7 @@ static void DrawCursorAndText_Setup(int screen_pos, int menu_info_pos_raw, static char *window_size_text; static char *scaling_type_text; +static char *network_server_text; static void drawSetupValue(int, int); @@ -2191,7 +2307,7 @@ static void drawMenuInfoList(int first_entry, int num_page_entries, struct TokenInfo *si = &menu_info[menu_info_pos]; void *value_ptr = si->value; - /* set some entries to "unchangeable" according to other variables */ + // set some entries to "unchangeable" according to other variables if ((value_ptr == &setup.sound_simple && !audio.sound_available) || (value_ptr == &setup.sound_loops && !audio.loops_available) || (value_ptr == &setup.sound_music && !audio.music_available) || @@ -2209,13 +2325,32 @@ static void drawMenuInfoList(int first_entry, int num_page_entries, DrawCursorAndText_Menu(i, menu_info_pos, FALSE); + if (si->type & TYPE_STRING) + { + int gadget_id = -1; + + if (value_ptr == &network_server_text) + gadget_id = SCREEN_CTRL_ID_NETWORK_SERVER; + + if (gadget_id != -1) + { + struct GadgetInfo *gi = screen_gadget[gadget_id]; + int xpos = MENU_SCREEN_START_XPOS; + int ypos = MENU_SCREEN_START_YPOS + i; + int x = mSX + xpos * 32; + int y = mSY + ypos * 32; + + ModifyGadget(gi, GDI_X, x, GDI_Y, y, GDI_END); + } + } + if (si->type & TYPE_VALUE && menu_info == setup_info) drawSetupValue(i, menu_info_pos); } } -static void DrawInfoScreen_Main() +static void DrawInfoScreen_Main(void) { int fade_mask = REDRAW_FIELD; int i; @@ -2223,7 +2358,7 @@ static void DrawInfoScreen_Main() if (redraw_mask & REDRAW_ALL) fade_mask = REDRAW_ALL; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; UnmapAllGadgets(); @@ -2232,14 +2367,14 @@ static void DrawInfoScreen_Main() FreeScreenGadgets(); CreateScreenGadgets(); - /* (needed after displaying title screens which disable auto repeat) */ + // (needed after displaying title screens which disable auto repeat) KeyboardAutoRepeatOn(); FadeSetLeaveScreen(); FadeOut(fade_mask); - /* needed if different viewport properties defined for info screen */ + // needed if different viewport properties defined for info screen ChangeViewportPropertiesIfNeeded(); SetMainBackgroundImage(IMG_BACKGROUND_INFO); @@ -2275,8 +2410,9 @@ static void DrawInfoScreen_Main() static void changeSetupValue(int, int, int); -void HandleMenuScreen(int mx, int my, int dx, int dy, int button, - int mode, int num_page_entries, int max_page_entries) +static void HandleMenuScreen(int mx, int my, int dx, int dy, int button, + int mode, int num_page_entries, + int max_page_entries) { static int num_page_entries_all_last[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES]; static int choice_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES]; @@ -2284,8 +2420,8 @@ void HandleMenuScreen(int mx, int my, int dx, int dy, int button, int *num_page_entries_last = num_page_entries_all_last[game_status]; int *choice_store = choice_stores[game_status]; int *first_entry_store = first_entry_stores[game_status]; - int choice = choice_store[mode]; /* starts with 0 */ - int first_entry = first_entry_store[mode]; /* starts with 0 */ + int choice = choice_store[mode]; // starts with 0 + int first_entry = first_entry_store[mode]; // starts with 0 int x = 0; int y = choice - first_entry; int y_old = y; @@ -2308,7 +2444,7 @@ void HandleMenuScreen(int mx, int my, int dx, int dy, int button, num_page_entries_last[mode] = num_page_entries; } - /* advance to first valid menu entry */ + // advance to first valid menu entry while (choice < num_page_entries && menu_info[choice].type & TYPE_SKIP_ENTRY) choice++; @@ -2356,28 +2492,28 @@ void HandleMenuScreen(int mx, int my, int dx, int dy, int button, menu_callback_function(); - break; /* absolutely needed because function changes 'menu_info'! */ + break; // absolutely needed because function changes 'menu_info'! } } return; } - if (mx || my) /* mouse input */ + if (mx || my) // mouse input { x = (mx - mSX) / 32; y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS; } - else if (dx || dy) /* keyboard or scrollbar/scrollbutton input */ + else if (dx || dy) // keyboard or scrollbar/scrollbutton input { - /* move cursor instead of scrolling when already at start/end of list */ + // move cursor instead of scrolling when already at start/end of list if (dy == -1 * SCROLL_LINE && first_entry == 0) dy = -1; else if (dy == +1 * SCROLL_LINE && first_entry + num_page_entries == max_page_entries) dy = 1; - /* handle scrolling screen one line or page */ + // handle scrolling screen one line or page if (y + dy < 0 || y + dy > num_page_entries - 1) { @@ -2388,7 +2524,7 @@ void HandleMenuScreen(int mx, int my, int dx, int dy, int button, if (dy < 0 && first_entry > 0) { - /* scroll page/line up */ + // scroll page/line up first_entry -= step; if (first_entry < 0) @@ -2398,7 +2534,7 @@ void HandleMenuScreen(int mx, int my, int dx, int dy, int button, } else if (dy > 0 && first_entry + num_page_entries < max_page_entries) { - /* scroll page/line down */ + // scroll page/line down first_entry += step; if (first_entry + num_page_entries > max_page_entries) @@ -2454,13 +2590,14 @@ void HandleMenuScreen(int mx, int my, int dx, int dy, int button, if (menu_info[choice].type & menu_navigation_type || menu_info[choice].type & TYPE_BOOLEAN_STYLE || - menu_info[choice].type & TYPE_YES_NO_AUTO) + menu_info[choice].type & TYPE_YES_NO_AUTO || + menu_info[choice].type & TYPE_PLAYER) button = MB_MENU_CHOICE; } else if (dy) y += dy; - /* jump to next non-empty menu entry (up or down) */ + // jump to next non-empty menu entry (up or down) while (first_entry + y > 0 && first_entry + y < max_page_entries - 1 && menu_info[first_entry + y].type & TYPE_SKIP_ENTRY) @@ -2530,7 +2667,7 @@ void HandleMenuScreen(int mx, int my, int dx, int dy, int button, menu_callback_function(); - /* absolutely needed because function changes 'menu_info'! */ + // absolutely needed because function changes 'menu_info'! break; } } @@ -2542,16 +2679,21 @@ void HandleMenuScreen(int mx, int my, int dx, int dy, int button, { PlaySound(SND_MENU_ITEM_SELECTING); - /* when selecting key headline, execute function for key value change */ + // when selecting key headline, execute function for key value change if (menu_info[first_entry + y].type & TYPE_KEYTEXT && menu_info[first_entry + y + 1].type & TYPE_KEY) y++; - /* when selecting string value, execute function for list selection */ + // when selecting string value, execute function for list selection if (menu_info[first_entry + y].type & TYPE_STRING && y > 0 && menu_info[first_entry + y - 1].type & TYPE_ENTER_LIST) y--; + // when selecting string value, execute function for text input gadget + if (menu_info[first_entry + y].type & TYPE_STRING && y > 0 && + menu_info[first_entry + y - 1].type & TYPE_TEXT_INPUT) + y--; + if (menu_info[first_entry + y].type & TYPE_ENTER_OR_LEAVE) { void (*menu_callback_function)(void) = @@ -2561,6 +2703,13 @@ void HandleMenuScreen(int mx, int my, int dx, int dy, int button, menu_callback_function(); } + else if (menu_info[first_entry + y].type & TYPE_TEXT_INPUT) + { + void (*gadget_callback_function)(void) = + menu_info[first_entry + y].value; + + gadget_callback_function(); + } else if (menu_info[first_entry + y].type & TYPE_VALUE && menu_info == setup_info) { @@ -2769,22 +2918,22 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos) int max_lines_per_text = 2; char *text = NULL; - if (action != -1 && direction != -1) /* element.action.direction */ + if (action != -1 && direction != -1) // element.action.direction text = getHelpText(element, action, direction); - if (text == NULL && action != -1) /* element.action */ + if (text == NULL && action != -1) // element.action text = getHelpText(element, action, -1); - if (text == NULL && direction != -1) /* element.direction */ + if (text == NULL && direction != -1) // element.direction text = getHelpText(element, -1, direction); - if (text == NULL) /* base element */ + if (text == NULL) // base element text = getHelpText(element, -1, -1); - if (text == NULL) /* not found */ + if (text == NULL) // not found text = "No description available"; - if (strlen(text) <= max_chars_per_line) /* only one line of text */ + if (strlen(text) <= max_chars_per_line) // only one line of text ystart += getFontHeight(font_nr) / 2; DrawTextBuffer(xstart, ystart + ypos * ystep, text, font_nr, @@ -2792,7 +2941,7 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos) TRUE, FALSE, FALSE); } -void DrawInfoScreen_TitleScreen() +static void DrawInfoScreen_TitleScreen(void) { SetGameStatus(GAME_MODE_TITLE); @@ -2804,7 +2953,7 @@ void HandleInfoScreen_TitleScreen(int button) HandleTitleScreen(0, 0, 0, 0, button); } -void DrawInfoScreen_Elements() +static void DrawInfoScreen_Elements(void) { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS); @@ -2897,7 +3046,7 @@ void HandleInfoScreen_Elements(int button) } } -void DrawInfoScreen_Music() +static void DrawInfoScreen_Music(void) { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC); @@ -3003,7 +3152,12 @@ void HandleInfoScreen_Music(int button) } else { - PlayMusic(list->music); + int music = list->music; + + if (music_info[music].loop) + PlayMusicLoop(music); + else + PlayMusic(music); DrawTextSCentered(ystart, font_title, "The Game Background Music:"); } @@ -3303,7 +3457,7 @@ static void DrawInfoScreen_CreditsScreen(int screen_nr) "Press any key or button for next page"); } -void DrawInfoScreen_Credits() +static void DrawInfoScreen_Credits(void) { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_CREDITS); @@ -3373,7 +3527,7 @@ void HandleInfoScreen_Credits(int button) } } -void DrawInfoScreen_Program() +static void DrawInfoScreen_Program(void) { int font_title = MENU_INFO_FONT_TITLE; int font_head = MENU_INFO_FONT_HEAD; @@ -3458,7 +3612,7 @@ void HandleInfoScreen_Program(int button) } } -void DrawInfoScreen_Version() +static void DrawInfoScreen_Version(void) { int font_title = MENU_INFO_FONT_TITLE; int font_head = MENU_INFO_FONT_HEAD; @@ -3481,12 +3635,8 @@ void DrawInfoScreen_Version() SDL_version sdl_version_compiled; const SDL_version *sdl_version_linked; int driver_name_len = 10; -#if defined(TARGET_SDL2) SDL_version sdl_version_linked_ext; const char *driver_name = NULL; -#else - char driver_name[driver_name_len]; -#endif SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION); @@ -3537,12 +3687,8 @@ void DrawInfoScreen_Version() ystart += ystep_head; SDL_VERSION(&sdl_version_compiled); -#if defined(TARGET_SDL2) SDL_GetVersion(&sdl_version_linked_ext); sdl_version_linked = &sdl_version_linked_ext; -#else - sdl_version_linked = SDL_Linked_Version(); -#endif DrawTextF(xstart1, ystart, font_text, "SDL"); DrawTextF(xstart2, ystart, font_text, "%d.%d.%d", @@ -3602,22 +3748,14 @@ void DrawInfoScreen_Version() DrawTextF(xstart3, ystart, font_head, "Used"); ystart += ystep_head; -#if defined(TARGET_SDL2) driver_name = getStringCopyNStatic(SDL_GetVideoDriver(0), driver_name_len); -#else - SDL_VideoDriverName(driver_name, driver_name_len); -#endif DrawTextF(xstart1, ystart, font_text, "SDL_VideoDriver"); DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_videodriver); DrawTextF(xstart3, ystart, font_text, "%s", driver_name); ystart += ystep_line; -#if defined(TARGET_SDL2) driver_name = getStringCopyNStatic(SDL_GetAudioDriver(0), driver_name_len); -#else - SDL_AudioDriverName(driver_name, driver_name_len); -#endif DrawTextF(xstart1, ystart, font_text, "SDL_AudioDriver"); DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_audiodriver); @@ -3655,7 +3793,7 @@ void HandleInfoScreen_Version(int button) } } -void DrawInfoScreen_LevelSet() +static void DrawInfoScreen_LevelSet(void) { struct TitleMessageInfo *tmi = &readme; char *filename = getLevelSetInfoFilename(); @@ -3679,29 +3817,29 @@ void DrawInfoScreen_LevelSet() DrawTextSCentered(ystart, FONT_TEXT_1, title); - /* if x position set to "-1", automatically determine by playfield width */ + // if x position set to "-1", automatically determine by playfield width if (tmi->x == -1) tmi->x = SXSIZE / 2; - /* if y position set to "-1", use static default value */ + // if y position set to "-1", use static default value if (tmi->y == -1) tmi->y = 150; - /* if width set to "-1", automatically determine by playfield width */ + // if width set to "-1", automatically determine by playfield width if (tmi->width == -1) tmi->width = SXSIZE - 2 * TILEX; - /* if height set to "-1", automatically determine by playfield height */ + // if height set to "-1", automatically determine by playfield height if (tmi->height == -1) tmi->height = MENU_SCREEN_INFO_YBOTTOM - tmi->y - 10; - /* if chars set to "-1", automatically determine by text and font width */ + // if chars set to "-1", automatically determine by text and font width if (tmi->chars == -1) tmi->chars = tmi->width / getFontWidth(tmi->font); else tmi->width = tmi->chars * getFontWidth(tmi->font); - /* if lines set to "-1", automatically determine by text and font height */ + // if lines set to "-1", automatically determine by text and font height if (tmi->lines == -1) tmi->lines = tmi->height / getFontHeight(tmi->font); else @@ -3717,7 +3855,7 @@ void DrawInfoScreen_LevelSet() FadeIn(REDRAW_FIELD); } -void HandleInfoScreen_LevelSet(int button) +static void HandleInfoScreen_LevelSet(int button) { if (button == MB_MENU_LEAVE) { @@ -3743,7 +3881,7 @@ void HandleInfoScreen_LevelSet(int button) } } -static void DrawInfoScreen() +static void DrawInfoScreen(void) { if (info_mode == INFO_MODE_TITLE) DrawInfoScreen_TitleScreen(); @@ -3789,9 +3927,9 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button) } -/* ========================================================================= */ -/* type name functions */ -/* ========================================================================= */ +// ============================================================================ +// type name functions +// ============================================================================ void HandleTypeName(int newxpos, Key key) { @@ -3868,15 +4006,60 @@ void HandleTypeName(int newxpos, Key key) } -/* ========================================================================= */ -/* tree menu functions */ -/* ========================================================================= */ +// ============================================================================ +// tree menu functions +// ============================================================================ + +static int getAlignXOffsetFromTreeInfo(TreeInfo *ti) +{ + if (game_status != GAME_MODE_SETUP || + DRAW_MODE_SETUP(setup_mode) != SETUP_MODE_CHOOSE_OTHER) + return 0; + + int max_text_size = 0; + TreeInfo *node; + + for (node = getTreeInfoFirstGroupEntry(ti); node != NULL; node = node->next) + max_text_size = MAX(max_text_size, strlen(node->name)); + + int num_entries = numTreeInfoInGroup(ti); + boolean scrollbar_needed = (num_entries > NUM_MENU_ENTRIES_ON_SCREEN); + int text_width = max_text_size * getFontWidth(FONT_TEXT_1); + int button_width = SC_MENUBUTTON_XSIZE; + int scrollbar_xpos = SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset; + int screen_width = (scrollbar_needed ? scrollbar_xpos : SXSIZE); + int align = menu.list_setup[SETUP_MODE_CHOOSE_OTHER].align; + int x = ALIGNED_XPOS(0, screen_width, align) * -1; + int align_xoffset_raw = ALIGNED_XPOS(x, button_width + text_width, align); + int align_xoffset = MAX(0, align_xoffset_raw); + + return align_xoffset; +} + +static int getAlignYOffsetFromTreeInfo(TreeInfo *ti) +{ + if (game_status != GAME_MODE_SETUP || + DRAW_MODE_SETUP(setup_mode) != SETUP_MODE_CHOOSE_OTHER) + return 0; + + int num_entries = numTreeInfoInGroup(ti); + int num_page_entries = MIN(num_entries, NUM_MENU_ENTRIES_ON_SCREEN); + int font_height = getFontHeight(FONT_TEXT_1); + int text_height = font_height * num_page_entries; + int page_height = font_height * NUM_MENU_ENTRIES_ON_SCREEN; + int align = menu.list_setup[SETUP_MODE_CHOOSE_OTHER].valign; + int y = ALIGNED_YPOS(0, page_height, align) * -1; + int align_yoffset_raw = ALIGNED_YPOS(y, text_height, align); + int align_yoffset = MAX(0, align_yoffset_raw); + + return align_yoffset; +} static void DrawChooseTree(TreeInfo **ti_ptr) { int fade_mask = REDRAW_FIELD; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; if (strEqual((*ti_ptr)->subdir, STRING_TOP_DIRECTORY)) @@ -3895,7 +4078,7 @@ static void DrawChooseTree(TreeInfo **ti_ptr) FadeOut(fade_mask); - /* needed if different viewport properties defined for choosing level (set) */ + // needed if different viewport properties defined for choosing level (set) ChangeViewportPropertiesIfNeeded(); if (game_status == GAME_MODE_LEVELNR) @@ -3918,6 +4101,12 @@ static void DrawChooseTree(TreeInfo **ti_ptr) static void drawChooseTreeList(int first_entry, int num_page_entries, TreeInfo *ti) { + int num_entries = numTreeInfoInGroup(ti); + boolean scrollbar_needed = (num_entries > NUM_MENU_ENTRIES_ON_SCREEN); + int scrollbar_xpos = SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset; + int screen_width = (scrollbar_needed ? scrollbar_xpos : SXSIZE); + int font_nr = FONT_TEXT_1; + int font_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset; int i; char *title_string = NULL; int yoffset_sets = MENU_TITLE1_YPOS; @@ -3937,14 +4126,12 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, int entry_pos = first_entry + i; int xpos = MENU_SCREEN_START_XPOS; int ypos = MENU_SCREEN_START_YPOS + i; - int startx = mSX + xpos * 32; - int starty = mSY + ypos * 32; - int font_nr = FONT_TEXT_1; - int font_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset; + int startx = amSX + xpos * 32; + int starty = amSY + ypos * 32; int startx_text = startx + font_xoffset; - int startx_scrollbar = mSX + SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset; - int text_size = startx_scrollbar - startx_text; - int max_buffer_len = text_size / getFontWidth(font_nr); + int endx_text = amSX + screen_width; + int max_text_size = endx_text - startx_text; + int max_buffer_len = max_text_size / getFontWidth(font_nr); char buffer[max_buffer_len + 1]; node_first = getTreeInfoFirstGroupEntry(ti); @@ -3995,7 +4182,7 @@ static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti) node->levels, (node->levels > 1 ? "levels" : "level"), node->class_desc); - /* let BackToFront() redraw only what is needed */ + // let BackToFront() redraw only what is needed redraw_mask = last_redraw_mask; for (x = 0; x < SCR_FIELDX; x++) MarkTileDirty(x, 1); @@ -4009,22 +4196,20 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, int y = ti->cl_cursor; int step = (button == 1 ? 1 : button == 2 ? 5 : 10); int num_entries = numTreeInfoInGroup(ti); - int num_page_entries; + int num_page_entries = MIN(num_entries, NUM_MENU_ENTRIES_ON_SCREEN); boolean position_set_by_scrollbar = (dx == 999); - if (num_entries <= NUM_MENU_ENTRIES_ON_SCREEN) - num_page_entries = num_entries; - else - num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN; - if (button == MB_MENU_INITIALIZE) { int num_entries = numTreeInfoInGroup(ti); int entry_pos = posTreeInfo(ti); + align_xoffset = getAlignXOffsetFromTreeInfo(ti); + align_yoffset = getAlignYOffsetFromTreeInfo(ti); + if (ti->cl_first == -1) { - /* only on initialization */ + // only on initialization ti->cl_first = MAX(0, entry_pos - num_page_entries + 1); ti->cl_cursor = entry_pos - ti->cl_first; } @@ -4032,7 +4217,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, (num_entries > num_page_entries && num_entries - ti->cl_first < num_page_entries)) { - /* only after change of list size (by custom graphic configuration) */ + // only after change of list size (by custom graphic configuration) ti->cl_first = MAX(0, entry_pos - num_page_entries + 1); ti->cl_cursor = entry_pos - ti->cl_first; } @@ -4068,7 +4253,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, execSetupGame(); else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE || setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE || - setup_mode == SETUP_MODE_CHOOSE_RENDERING) + setup_mode == SETUP_MODE_CHOOSE_RENDERING || + setup_mode == SETUP_MODE_CHOOSE_VSYNC) execSetupGraphics(); else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE || setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS || @@ -4076,7 +4262,12 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, execSetupSound(); else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL || setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE || - setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE) + setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE || + setup_mode == SETUP_MODE_CHOOSE_TRANSPARENCY || + setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_0 || + setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_0 || + setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_1 || + setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_1) execSetupTouch(); else execSetupArtwork(); @@ -4098,21 +4289,21 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, return; } - if (mx || my) /* mouse input */ + if (mx || my) // mouse input { - x = (mx - mSX) / 32; - y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS; + x = (mx - amSX) / 32; + y = (my - amSY) / 32 - MENU_SCREEN_START_YPOS; } - else if (dx || dy) /* keyboard or scrollbar/scrollbutton input */ + else if (dx || dy) // keyboard or scrollbar/scrollbutton input { - /* move cursor instead of scrolling when already at start/end of list */ + // move cursor instead of scrolling when already at start/end of list if (dy == -1 * SCROLL_LINE && ti->cl_first == 0) dy = -1; else if (dy == +1 * SCROLL_LINE && ti->cl_first + num_page_entries == num_entries) dy = 1; - /* handle scrolling screen one line or page */ + // handle scrolling screen one line or page if (ti->cl_cursor + dy < 0 || ti->cl_cursor + dy > num_page_entries - 1) { @@ -4123,7 +4314,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, if (dy < 0 && ti->cl_first > 0) { - /* scroll page/line up */ + // scroll page/line up ti->cl_first -= step; if (ti->cl_first < 0) @@ -4133,7 +4324,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, } else if (dy > 0 && ti->cl_first + num_page_entries < num_entries) { - /* scroll page/line down */ + // scroll page/line down ti->cl_first += step; if (ti->cl_first + num_page_entries > num_entries) @@ -4155,7 +4346,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, return; } - /* handle moving cursor one line */ + // handle moving cursor one line y = ti->cl_cursor + dy; } @@ -4220,7 +4411,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, execSetupGame(); else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE || setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE || - setup_mode == SETUP_MODE_CHOOSE_RENDERING) + setup_mode == SETUP_MODE_CHOOSE_RENDERING || + setup_mode == SETUP_MODE_CHOOSE_VSYNC) execSetupGraphics(); else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE || setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS || @@ -4228,7 +4420,12 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, execSetupSound(); else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL || setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE || - setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE) + setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE || + setup_mode == SETUP_MODE_CHOOSE_TRANSPARENCY || + setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_0 || + setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_0 || + setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_1 || + setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_1) execSetupTouch(); else execSetupArtwork(); @@ -4286,7 +4483,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, execSetupGame(); else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE || setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE || - setup_mode == SETUP_MODE_CHOOSE_RENDERING) + setup_mode == SETUP_MODE_CHOOSE_RENDERING || + setup_mode == SETUP_MODE_CHOOSE_VSYNC) execSetupGraphics(); else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE || setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS || @@ -4294,7 +4492,12 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, execSetupSound(); else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL || setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE || - setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE) + setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE || + setup_mode == SETUP_MODE_CHOOSE_TRANSPARENCY || + setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_0 || + setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_0 || + setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_1 || + setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_1) execSetupTouch(); else execSetupArtwork(); @@ -4317,7 +4520,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, } } -void DrawChooseLevelSet() +void DrawChooseLevelSet(void) { FadeMenuSoundsAndMusic(); @@ -4331,7 +4534,7 @@ void HandleChooseLevelSet(int mx, int my, int dx, int dy, int button) HandleChooseTree(mx, my, dx, dy, button, &leveldir_current); } -void DrawChooseLevelNr() +void DrawChooseLevelNr(void) { int i; @@ -4347,10 +4550,10 @@ void DrawChooseLevelNr() for (i = leveldir_current->first_level; i <= leveldir_current->last_level;i++) { TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_LEVEL_NR); - char identifier[32], name[32]; + char identifier[32], name[64]; int value = i; - /* temporarily load level info to get level name */ + // temporarily load level info to get level name LoadLevelInfoOnly(i); ti->node_top = &level_number; @@ -4370,14 +4573,14 @@ void DrawChooseLevelNr() pushTreeInfo(&level_number, ti); } - /* sort level number values to start with lowest level number */ + // sort level number values to start with lowest level number sortTreeInfo(&level_number); - /* set current level number to current level number */ + // set current level number to current level number level_number_current = getTreeInfoFromIdentifier(level_number, i_to_a(level_nr)); - /* if that also fails, set current level number to first available level */ + // if that also fails, set current level number to first available level if (level_number_current == NULL) level_number_current = level_number; @@ -4391,20 +4594,20 @@ void HandleChooseLevelNr(int mx, int my, int dx, int dy, int button) HandleChooseTree(mx, my, dx, dy, button, &level_number_current); } -void DrawHallOfFame(int highlight_position) +void DrawHallOfFame(int level_nr, int highlight_position) { int fade_mask = REDRAW_FIELD; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; UnmapAllGadgets(); FadeMenuSoundsAndMusic(); - /* (this is needed when called from GameEnd() after winning a game) */ + // (this is needed when called from GameEnd() after winning a game) KeyboardAutoRepeatOn(); - /* (this is needed when called from GameEnd() after winning a game) */ + // (this is needed when called from GameEnd() after winning a game) SetDrawDeactivationMask(REDRAW_NONE); SetDrawBackgroundMask(REDRAW_FIELD); @@ -4417,21 +4620,22 @@ void DrawHallOfFame(int highlight_position) FadeOut(fade_mask); - /* needed if different viewport properties defined for scores */ + // needed if different viewport properties defined for scores ChangeViewportPropertiesIfNeeded(); PlayMenuSoundsAndMusic(); OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); - HandleHallOfFame(highlight_position, 0, 0, 0, MB_MENU_INITIALIZE); + HandleHallOfFame(level_nr, highlight_position, 0, 0, MB_MENU_INITIALIZE); DrawMaskedBorder(fade_mask); FadeIn(fade_mask); } -static void drawHallOfFameList(int first_entry, int highlight_position) +static void drawHallOfFameList(int level_nr, int first_entry, + int highlight_position) { int i, j; @@ -4474,20 +4678,23 @@ static void drawHallOfFameList(int first_entry, int highlight_position) void HandleHallOfFame(int mx, int my, int dx, int dy, int button) { + static int level_nr = 0; static int first_entry = 0; static int highlight_position = 0; int step = (button == 1 ? 1 : button == 2 ? 5 : 10); if (button == MB_MENU_INITIALIZE) { + level_nr = mx; first_entry = 0; - highlight_position = mx; - drawHallOfFameList(first_entry, highlight_position); + highlight_position = my; + + drawHallOfFameList(level_nr, first_entry, highlight_position); return; } - if (ABS(dy) == SCROLL_PAGE) /* handle scrolling one page */ + if (ABS(dy) == SCROLL_PAGE) // handle scrolling one page step = NUM_MENU_ENTRIES_ON_SCREEN - 1; if (dy < 0) @@ -4498,7 +4705,7 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) if (first_entry < 0) first_entry = 0; - drawHallOfFameList(first_entry, highlight_position); + drawHallOfFameList(level_nr, first_entry, highlight_position); } } else if (dy > 0) @@ -4509,28 +4716,29 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) if (first_entry + NUM_MENU_ENTRIES_ON_SCREEN > MAX_SCORE_ENTRIES) first_entry = MAX(0, MAX_SCORE_ENTRIES - NUM_MENU_ENTRIES_ON_SCREEN); - drawHallOfFameList(first_entry, highlight_position); + drawHallOfFameList(level_nr, first_entry, highlight_position); } } - else if (button == MB_MENU_LEAVE) - { - PlaySound(SND_MENU_ITEM_SELECTING); - - FadeSound(SND_BACKGROUND_SCORES); - - SetGameStatus(GAME_MODE_MAIN); - - DrawMainMenu(); - } - else if (button == MB_MENU_CHOICE) + else if (button == MB_MENU_LEAVE || button == MB_MENU_CHOICE) { PlaySound(SND_MENU_ITEM_SELECTING); FadeSound(SND_BACKGROUND_SCORES); - SetGameStatus(GAME_MODE_MAIN); + if (button == MB_MENU_CHOICE && + game_status_last_screen == GAME_MODE_PLAYING && + setup.auto_play_next_level && setup.increment_levels && + level_nr < leveldir_current->last_level && + !network_playing) + { + StartGameActions(network.enabled, setup.autorecord, level.random_seed); + } + else + { + SetGameStatus(GAME_MODE_MAIN); - DrawMainMenu(); + DrawMainMenu(); + } } if (game_status == GAME_MODE_SCORES) @@ -4538,20 +4746,22 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) } -/* ========================================================================= */ -/* setup screen functions */ -/* ========================================================================= */ +// ============================================================================ +// setup screen functions +// ============================================================================ static struct TokenInfo *setup_info; -static int num_setup_info; /* number of setup entries shown on screen */ -static int max_setup_info; /* total number of setup entries in list */ +static int num_setup_info; // number of setup entries shown on screen +static int max_setup_info; // total number of setup entries in list static char *window_size_text; static char *scaling_type_text; static char *rendering_mode_text; +static char *vsync_mode_text; static char *scroll_delay_text; static char *snapshot_mode_text; static char *game_speed_text; +static char *network_server_text; static char *graphics_set_name; static char *sounds_set_name; static char *music_set_name; @@ -4561,16 +4771,29 @@ static char *volume_music_text; static char *touch_controls_text; static char *move_distance_text; static char *drop_distance_text; +static char *transparency_text; +static char *grid_size_text[2][2]; -static void execSetupMain() +static void execSetupMain(void) { setup_mode = SETUP_MODE_MAIN; DrawSetupScreen(); } -static void execSetupGame_setGameSpeeds() +static void execSetupGame_setGameSpeeds(boolean update_value) { + if (setup.game_speed_extended) + { + game_speeds_list = game_speeds_list_extended; + game_speeds = game_speeds_extended; + } + else + { + game_speeds_list = game_speeds_list_normal; + game_speeds = game_speeds_normal; + } + if (game_speeds == NULL) { int i; @@ -4596,30 +4819,40 @@ static void execSetupGame_setGameSpeeds() pushTreeInfo(&game_speeds, ti); } - /* sort game speed values to start with slowest game speed */ + // sort game speed values to start with slowest game speed sortTreeInfo(&game_speeds); - /* set current game speed to configured game speed value */ + update_value = TRUE; + } + + if (update_value) + { + // set current game speed to configured game speed value game_speed_current = getTreeInfoFromIdentifier(game_speeds, i_to_a(setup.game_frame_delay)); - /* if that fails, set current game speed to reliable default value */ + // if that fails, set current game speed to reliable default value if (game_speed_current == NULL) game_speed_current = getTreeInfoFromIdentifier(game_speeds, i_to_a(GAME_FRAME_DELAY)); - /* if that also fails, set current game speed to first available speed */ + // if that also fails, set current game speed to first available speed if (game_speed_current == NULL) game_speed_current = game_speeds; + + if (setup.game_speed_extended) + game_speeds_extended = game_speeds; + else + game_speeds_normal = game_speeds; } setup.game_frame_delay = atoi(game_speed_current->identifier); - /* needed for displaying game speed text instead of identifier */ + // needed for displaying game speed text instead of identifier game_speed_text = game_speed_current->name; } -static void execSetupGame_setScrollDelays() +static void execSetupGame_setScrollDelays(void) { if (scroll_delays == NULL) { @@ -4646,30 +4879,30 @@ static void execSetupGame_setScrollDelays() pushTreeInfo(&scroll_delays, ti); } - /* sort scroll delay values to start with lowest scroll delay value */ + // sort scroll delay values to start with lowest scroll delay value sortTreeInfo(&scroll_delays); - /* set current scroll delay value to configured scroll delay value */ + // set current scroll delay value to configured scroll delay value scroll_delay_current = getTreeInfoFromIdentifier(scroll_delays,i_to_a(setup.scroll_delay_value)); - /* if that fails, set current scroll delay to reliable default value */ + // if that fails, set current scroll delay to reliable default value if (scroll_delay_current == NULL) scroll_delay_current = getTreeInfoFromIdentifier(scroll_delays, i_to_a(STD_SCROLL_DELAY)); - /* if that also fails, set current scroll delay to first available value */ + // if that also fails, set current scroll delay to first available value if (scroll_delay_current == NULL) scroll_delay_current = scroll_delays; } setup.scroll_delay_value = atoi(scroll_delay_current->identifier); - /* needed for displaying scroll delay text instead of identifier */ + // needed for displaying scroll delay text instead of identifier scroll_delay_text = scroll_delay_current->name; } -static void execSetupGame_setSnapshotModes() +static void execSetupGame_setSnapshotModes(void) { if (snapshot_modes == NULL) { @@ -4696,62 +4929,87 @@ static void execSetupGame_setSnapshotModes() pushTreeInfo(&snapshot_modes, ti); } - /* sort snapshot mode values to start with lowest snapshot mode value */ + // sort snapshot mode values to start with lowest snapshot mode value sortTreeInfo(&snapshot_modes); - /* set current snapshot mode value to configured snapshot mode value */ + // set current snapshot mode value to configured snapshot mode value snapshot_mode_current = getTreeInfoFromIdentifier(snapshot_modes, setup.engine_snapshot_mode); - /* if that fails, set current snapshot mode to reliable default value */ + // if that fails, set current snapshot mode to reliable default value if (snapshot_mode_current == NULL) snapshot_mode_current = getTreeInfoFromIdentifier(snapshot_modes, STR_SNAPSHOT_MODE_DEFAULT); - /* if that also fails, set current snapshot mode to first available value */ + // if that also fails, set current snapshot mode to first available value if (snapshot_mode_current == NULL) snapshot_mode_current = snapshot_modes; } setup.engine_snapshot_mode = snapshot_mode_current->identifier; - /* needed for displaying snapshot mode text instead of identifier */ + // needed for displaying snapshot mode text instead of identifier snapshot_mode_text = snapshot_mode_current->name; } -static void execSetupGame() +static void execSetupGame_setNetworkServerText(void) +{ + if (strEqual(setup.network_server_hostname, STR_NETWORK_AUTO_DETECT)) + { + strcpy(network_server_hostname, STR_NETWORK_AUTO_DETECT_SETUP); + } + else + { + strncpy(network_server_hostname, setup.network_server_hostname, + MAX_SETUP_TEXT_INPUT_LEN); + network_server_hostname[MAX_SETUP_TEXT_INPUT_LEN] = '\0'; + } + + // needed for displaying network server text instead of identifier + network_server_text = network_server_hostname; +} + +static void execSetupGame(void) { - execSetupGame_setGameSpeeds(); + boolean check_vsync_mode = (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED); + + execSetupGame_setGameSpeeds(FALSE); execSetupGame_setScrollDelays(); execSetupGame_setSnapshotModes(); + execSetupGame_setNetworkServerText(); + setup_mode = SETUP_MODE_GAME; DrawSetupScreen(); + + // check if vsync needs to be disabled for this game speed to work + if (check_vsync_mode) + DisableVsyncIfNeeded(); } -static void execSetupChooseGameSpeed() +static void execSetupChooseGameSpeed(void) { setup_mode = SETUP_MODE_CHOOSE_GAME_SPEED; DrawSetupScreen(); } -static void execSetupChooseScrollDelay() +static void execSetupChooseScrollDelay(void) { setup_mode = SETUP_MODE_CHOOSE_SCROLL_DELAY; DrawSetupScreen(); } -static void execSetupChooseSnapshotMode() +static void execSetupChooseSnapshotMode(void) { setup_mode = SETUP_MODE_CHOOSE_SNAPSHOT_MODE; DrawSetupScreen(); } -static void execSetupEditor() +static void execSetupEditor(void) { setup_mode = SETUP_MODE_EDITOR; @@ -4818,32 +5076,32 @@ static void execSetupGraphics_setWindowSizes(boolean update_list) pushTreeInfo(&window_sizes, ti); } - /* sort window size values to start with lowest window size value */ + // sort window size values to start with lowest window size value sortTreeInfo(&window_sizes); - /* set current window size value to configured window size value */ + // set current window size value to configured window size value window_size_current = getTreeInfoFromIdentifier(window_sizes, i_to_a(setup.window_scaling_percent)); - /* if that fails, set current window size to reliable default value */ + // if that fails, set current window size to reliable default value if (window_size_current == NULL) window_size_current = getTreeInfoFromIdentifier(window_sizes, i_to_a(STD_WINDOW_SCALING_PERCENT)); - /* if that also fails, set current window size to first available value */ + // if that also fails, set current window size to first available value if (window_size_current == NULL) window_size_current = window_sizes; } setup.window_scaling_percent = atoi(window_size_current->identifier); - /* needed for displaying window size text instead of identifier */ + // needed for displaying window size text instead of identifier window_size_text = window_size_current->name; } -static void execSetupGraphics_setScalingTypes() +static void execSetupGraphics_setScalingTypes(void) { if (scaling_types == NULL) { @@ -4870,30 +5128,30 @@ static void execSetupGraphics_setScalingTypes() pushTreeInfo(&scaling_types, ti); } - /* sort scaling type values to start with lowest scaling type value */ + // sort scaling type values to start with lowest scaling type value sortTreeInfo(&scaling_types); - /* set current scaling type value to configured scaling type value */ + // set current scaling type value to configured scaling type value scaling_type_current = getTreeInfoFromIdentifier(scaling_types, setup.window_scaling_quality); - /* if that fails, set current scaling type to reliable default value */ + // if that fails, set current scaling type to reliable default value if (scaling_type_current == NULL) scaling_type_current = getTreeInfoFromIdentifier(scaling_types, SCALING_QUALITY_DEFAULT); - /* if that also fails, set current scaling type to first available value */ + // if that also fails, set current scaling type to first available value if (scaling_type_current == NULL) scaling_type_current = scaling_types; } setup.window_scaling_quality = scaling_type_current->identifier; - /* needed for displaying scaling type text instead of identifier */ + // needed for displaying scaling type text instead of identifier scaling_type_text = scaling_type_current->name; } -static void execSetupGraphics_setRenderingModes() +static void execSetupGraphics_setRenderingModes(void) { if (rendering_modes == NULL) { @@ -4920,32 +5178,89 @@ static void execSetupGraphics_setRenderingModes() pushTreeInfo(&rendering_modes, ti); } - /* sort rendering mode values to start with lowest rendering mode value */ + // sort rendering mode values to start with lowest rendering mode value sortTreeInfo(&rendering_modes); - /* set current rendering mode value to configured rendering mode value */ + // set current rendering mode value to configured rendering mode value rendering_mode_current = getTreeInfoFromIdentifier(rendering_modes, setup.screen_rendering_mode); - /* if that fails, set current rendering mode to reliable default value */ + // if that fails, set current rendering mode to reliable default value if (rendering_mode_current == NULL) rendering_mode_current = getTreeInfoFromIdentifier(rendering_modes, STR_SPECIAL_RENDERING_DEFAULT); - /* if that also fails, set current rendering mode to first available one */ + // if that also fails, set current rendering mode to first available one if (rendering_mode_current == NULL) rendering_mode_current = rendering_modes; } setup.screen_rendering_mode = rendering_mode_current->identifier; - /* needed for displaying rendering mode text instead of identifier */ + // needed for displaying rendering mode text instead of identifier rendering_mode_text = rendering_mode_current->name; } -static void execSetupGraphics() +static void execSetupGraphics_setVsyncModes(boolean update_value) { + if (vsync_modes == NULL) + { + int i; + + for (i = 0; vsync_modes_list[i].value != NULL; i++) + { + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + char *value = vsync_modes_list[i].value; + char *text = vsync_modes_list[i].text; + + ti->node_top = &vsync_modes; + ti->sort_priority = i; + + sprintf(identifier, "%s", value); + sprintf(name, "%s", text); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, STR_SETUP_CHOOSE_VSYNC); + + pushTreeInfo(&vsync_modes, ti); + } + + // sort vsync mode values to start with lowest vsync mode value + sortTreeInfo(&vsync_modes); + + update_value = TRUE; + } + + if (update_value) + { + // set current vsync mode value to configured vsync mode value + vsync_mode_current = + getTreeInfoFromIdentifier(vsync_modes, setup.vsync_mode); + + // if that fails, set current vsync mode to reliable default value + if (vsync_mode_current == NULL) + vsync_mode_current = + getTreeInfoFromIdentifier(vsync_modes, STR_VSYNC_MODE_DEFAULT); + + // if that also fails, set current vsync mode to first available one + if (vsync_mode_current == NULL) + vsync_mode_current = vsync_modes; + } + + setup.vsync_mode = vsync_mode_current->identifier; + + // needed for displaying vsync mode text instead of identifier + vsync_mode_text = vsync_mode_current->name; +} + +static void execSetupGraphics(void) +{ + boolean check_game_speed = (setup_mode == SETUP_MODE_CHOOSE_VSYNC); + // update "setup.window_scaling_percent" from list selection // (in this case, window scaling was changed on setup screen) if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE) @@ -4957,12 +5272,16 @@ static void execSetupGraphics() execSetupGraphics_setScalingTypes(); execSetupGraphics_setRenderingModes(); + execSetupGraphics_setVsyncModes(FALSE); setup_mode = SETUP_MODE_GRAPHICS; DrawSetupScreen(); -#if defined(TARGET_SDL2) + // check if game speed is high enough for 60 Hz vsync to work + if (check_game_speed) + ModifyGameSpeedIfNeeded(); + // window scaling may have changed at this point ToggleFullscreenOrChangeWindowScalingIfNeeded(); @@ -4972,52 +5291,61 @@ static void execSetupGraphics() // screen rendering mode may have changed at this point SDLSetScreenRenderingMode(setup.screen_rendering_mode); -#endif + + // screen vsync mode may have changed at this point + SDLSetScreenVsyncMode(setup.vsync_mode); } -static void execSetupChooseWindowSize() +static void execSetupChooseWindowSize(void) { setup_mode = SETUP_MODE_CHOOSE_WINDOW_SIZE; DrawSetupScreen(); } -static void execSetupChooseScalingType() +static void execSetupChooseScalingType(void) { setup_mode = SETUP_MODE_CHOOSE_SCALING_TYPE; DrawSetupScreen(); } -static void execSetupChooseRenderingMode() +static void execSetupChooseRenderingMode(void) { setup_mode = SETUP_MODE_CHOOSE_RENDERING; DrawSetupScreen(); } -static void execSetupChooseVolumeSimple() +static void execSetupChooseVsyncMode(void) +{ + setup_mode = SETUP_MODE_CHOOSE_VSYNC; + + DrawSetupScreen(); +} + +static void execSetupChooseVolumeSimple(void) { setup_mode = SETUP_MODE_CHOOSE_VOLUME_SIMPLE; DrawSetupScreen(); } -static void execSetupChooseVolumeLoops() +static void execSetupChooseVolumeLoops(void) { setup_mode = SETUP_MODE_CHOOSE_VOLUME_LOOPS; DrawSetupScreen(); } -static void execSetupChooseVolumeMusic() +static void execSetupChooseVolumeMusic(void) { setup_mode = SETUP_MODE_CHOOSE_VOLUME_MUSIC; DrawSetupScreen(); } -static void execSetupSound() +static void execSetupSound(void) { if (volumes_simple == NULL) { @@ -5070,19 +5398,19 @@ static void execSetupSound() pushTreeInfo(&volumes_simple, ti); } - /* sort volume values to start with lowest volume value */ + // sort volume values to start with lowest volume value sortTreeInfo(&volumes_simple); - /* set current volume value to configured volume value */ + // set current volume value to configured volume value volume_simple_current = getTreeInfoFromIdentifier(volumes_simple,i_to_a(setup.volume_simple)); - /* if that fails, set current volume to reliable default value */ + // if that fails, set current volume to reliable default value if (volume_simple_current == NULL) volume_simple_current = getTreeInfoFromIdentifier(volumes_simple, i_to_a(100)); - /* if that also fails, set current volume to first available value */ + // if that also fails, set current volume to first available value if (volume_simple_current == NULL) volume_simple_current = volumes_simple; } @@ -5138,19 +5466,19 @@ static void execSetupSound() pushTreeInfo(&volumes_loops, ti); } - /* sort volume values to start with lowest volume value */ + // sort volume values to start with lowest volume value sortTreeInfo(&volumes_loops); - /* set current volume value to configured volume value */ + // set current volume value to configured volume value volume_loops_current = getTreeInfoFromIdentifier(volumes_loops,i_to_a(setup.volume_loops)); - /* if that fails, set current volume to reliable default value */ + // if that fails, set current volume to reliable default value if (volume_loops_current == NULL) volume_loops_current = getTreeInfoFromIdentifier(volumes_loops, i_to_a(100)); - /* if that also fails, set current volume to first available value */ + // if that also fails, set current volume to first available value if (volume_loops_current == NULL) volume_loops_current = volumes_loops; } @@ -5206,19 +5534,19 @@ static void execSetupSound() pushTreeInfo(&volumes_music, ti); } - /* sort volume values to start with lowest volume value */ + // sort volume values to start with lowest volume value sortTreeInfo(&volumes_music); - /* set current volume value to configured volume value */ + // set current volume value to configured volume value volume_music_current = getTreeInfoFromIdentifier(volumes_music,i_to_a(setup.volume_music)); - /* if that fails, set current volume to reliable default value */ + // if that fails, set current volume to reliable default value if (volume_music_current == NULL) volume_music_current = getTreeInfoFromIdentifier(volumes_music, i_to_a(100)); - /* if that also fails, set current volume to first available value */ + // if that also fails, set current volume to first available value if (volume_music_current == NULL) volume_music_current = volumes_music; } @@ -5227,7 +5555,7 @@ static void execSetupSound() setup.volume_loops = atoi(volume_loops_current->identifier); setup.volume_music = atoi(volume_music_current->identifier); - /* needed for displaying volume text instead of identifier */ + // needed for displaying volume text instead of identifier volume_simple_text = volume_simple_current->name; volume_loops_text = volume_loops_current->name; volume_music_text = volume_music_current->name; @@ -5237,82 +5565,119 @@ static void execSetupSound() DrawSetupScreen(); } -static void execSetupChooseTouchControls() +static void execSetupChooseTouchControls(void) { setup_mode = SETUP_MODE_CHOOSE_TOUCH_CONTROL; DrawSetupScreen(); } -static void execSetupChooseMoveDistance() +static void execSetupChooseMoveDistance(void) { setup_mode = SETUP_MODE_CHOOSE_MOVE_DISTANCE; DrawSetupScreen(); } -static void execSetupChooseDropDistance() +static void execSetupChooseDropDistance(void) { setup_mode = SETUP_MODE_CHOOSE_DROP_DISTANCE; DrawSetupScreen(); } -static void execSetupConfigureVirtualButtons() +static void execSetupChooseTransparency(void) { - ConfigureVirtualButtons(); + setup_mode = SETUP_MODE_CHOOSE_TRANSPARENCY; DrawSetupScreen(); } -static void execSetupTouch() +static void execSetupChooseGridXSize_0(void) { - if (touch_controls == NULL) - { - int i; + setup_mode = SETUP_MODE_CHOOSE_GRID_XSIZE_0; - for (i = 0; touch_controls_list[i].value != NULL; i++) - { - TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); - char identifier[32], name[32]; - char *value = touch_controls_list[i].value; - char *text = touch_controls_list[i].text; + DrawSetupScreen(); +} - ti->node_top = &touch_controls; - ti->sort_priority = i; +static void execSetupChooseGridYSize_0(void) +{ + setup_mode = SETUP_MODE_CHOOSE_GRID_YSIZE_0; - sprintf(identifier, "%s", value); - sprintf(name, "%s", text); + DrawSetupScreen(); +} - setString(&ti->identifier, identifier); - setString(&ti->name, name); - setString(&ti->name_sorting, name); - setString(&ti->infotext, STR_SETUP_CHOOSE_TOUCH_CONTROL); +static void execSetupChooseGridXSize_1(void) +{ + setup_mode = SETUP_MODE_CHOOSE_GRID_XSIZE_1; - pushTreeInfo(&touch_controls, ti); + DrawSetupScreen(); +} + +static void execSetupChooseGridYSize_1(void) +{ + setup_mode = SETUP_MODE_CHOOSE_GRID_YSIZE_1; + + DrawSetupScreen(); +} + +static void execSetupConfigureVirtualButtons(void) +{ + setup_mode = SETUP_MODE_CONFIG_VIRT_BUTTONS; + + ConfigureVirtualButtons(); + + setup_mode = SETUP_MODE_TOUCH; + + DrawSetupScreen(); +} + +static void execSetupTouch(void) +{ + int i, j, k; + + if (touch_controls == NULL) + { + for (i = 0; touch_controls_list[i].value != NULL; i++) + { + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + char *value = touch_controls_list[i].value; + char *text = touch_controls_list[i].text; + + ti->node_top = &touch_controls; + ti->sort_priority = i; + + sprintf(identifier, "%s", value); + sprintf(name, "%s", text); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, STR_SETUP_CHOOSE_TOUCH_CONTROL); + + pushTreeInfo(&touch_controls, ti); } - /* sort touch control values to start with lowest touch control value */ + // sort touch control values to start with lowest touch control value sortTreeInfo(&touch_controls); - /* set current touch control value to configured touch control value */ + // set current touch control value to configured touch control value touch_control_current = getTreeInfoFromIdentifier(touch_controls, setup.touch.control_type); - /* if that fails, set current touch control to reliable default value */ + // if that fails, set current touch control to reliable default value if (touch_control_current == NULL) touch_control_current = getTreeInfoFromIdentifier(touch_controls, TOUCH_CONTROL_DEFAULT); - /* if that also fails, set current touch control to first available value */ + // if that also fails, set current touch control to first available value if (touch_control_current == NULL) touch_control_current = touch_controls; } if (move_distances == NULL) { - int i; - for (i = 0; distances_list[i].value != -1; i++) { TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); @@ -5334,28 +5699,27 @@ static void execSetupTouch() pushTreeInfo(&move_distances, ti); } - /* sort distance values to start with lowest distance value */ + // sort distance values to start with lowest distance value sortTreeInfo(&move_distances); - /* set current distance value to configured distance value */ + // set current distance value to configured distance value move_distance_current = getTreeInfoFromIdentifier(move_distances, i_to_a(setup.touch.move_distance)); - /* if that fails, set current distance to reliable default value */ + // if that fails, set current distance to reliable default value if (move_distance_current == NULL) move_distance_current = - getTreeInfoFromIdentifier(move_distances, i_to_a(1)); + getTreeInfoFromIdentifier(move_distances, + i_to_a(TOUCH_MOVE_DISTANCE_DEFAULT)); - /* if that also fails, set current distance to first available value */ + // if that also fails, set current distance to first available value if (move_distance_current == NULL) move_distance_current = move_distances; } if (drop_distances == NULL) { - int i; - for (i = 0; distances_list[i].value != -1; i++) { TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); @@ -5377,39 +5741,159 @@ static void execSetupTouch() pushTreeInfo(&drop_distances, ti); } - /* sort distance values to start with lowest distance value */ + // sort distance values to start with lowest distance value sortTreeInfo(&drop_distances); - /* set current distance value to configured distance value */ + // set current distance value to configured distance value drop_distance_current = getTreeInfoFromIdentifier(drop_distances, i_to_a(setup.touch.drop_distance)); - /* if that fails, set current distance to reliable default value */ + // if that fails, set current distance to reliable default value if (drop_distance_current == NULL) drop_distance_current = - getTreeInfoFromIdentifier(drop_distances, i_to_a(1)); + getTreeInfoFromIdentifier(drop_distances, + i_to_a(TOUCH_DROP_DISTANCE_DEFAULT)); - /* if that also fails, set current distance to first available value */ + // if that also fails, set current distance to first available value if (drop_distance_current == NULL) drop_distance_current = drop_distances; } + if (transparencies == NULL) + { + for (i = 0; transparencies_list[i].value != -1; i++) + { + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + int value = transparencies_list[i].value; + char *text = transparencies_list[i].text; + + ti->node_top = &transparencies; + ti->sort_priority = value; + + sprintf(identifier, "%d", value); + sprintf(name, "%s", text); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, STR_SETUP_CHOOSE_TRANSPARENCY); + + pushTreeInfo(&transparencies, ti); + } + + // sort transparency values to start with lowest transparency value + sortTreeInfo(&transparencies); + + // set current transparency value to configured transparency value + transparency_current = + getTreeInfoFromIdentifier(transparencies, + i_to_a(setup.touch.transparency)); + + // if that fails, set current transparency to reliable default value + if (transparency_current == NULL) + transparency_current = + getTreeInfoFromIdentifier(transparencies, + i_to_a(TOUCH_TRANSPARENCY_DEFAULT)); + + // if that also fails, set current transparency to first available value + if (transparency_current == NULL) + transparency_current = transparencies; + } + + for (i = 0; i < 2; i++) + { + for (j = 0; j < 2; j++) + { + if (grid_sizes[i][j] == NULL) + { + for (k = 0; grid_sizes_list[k].value != -1; k++) + { + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + int value = grid_sizes_list[k].value; + char *text = grid_sizes_list[k].text; + + ti->node_top = &grid_sizes[i][j]; + ti->sort_priority = value; + + sprintf(identifier, "%d", value); + sprintf(name, "%s", text); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, + (i == 0 ? + (j == 0 ? + STR_SETUP_CHOOSE_GRID_XSIZE_0 : + STR_SETUP_CHOOSE_GRID_YSIZE_0) : + (j == 0 ? + STR_SETUP_CHOOSE_GRID_XSIZE_1 : + STR_SETUP_CHOOSE_GRID_YSIZE_1))); + + pushTreeInfo(&grid_sizes[i][j], ti); + } + + // sort grid size values to start with lowest grid size value + sortTreeInfo(&grid_sizes[i][j]); + + // set current grid size value to configured grid size value + grid_size_current[i][j] = + getTreeInfoFromIdentifier(grid_sizes[i][j], + i_to_a(j == 0 ? + setup.touch.grid_xsize[i] : + setup.touch.grid_ysize[i])); + + // if that fails, set current grid size to reliable default value + if (grid_size_current[i][j] == NULL) + grid_size_current[i][j] = + getTreeInfoFromIdentifier(grid_sizes[i][j], + i_to_a(j == 0 ? + DEFAULT_GRID_XSIZE(i) : + DEFAULT_GRID_YSIZE(i))); + + // if that also fails, set current grid size to first available value + if (grid_size_current[i][j] == NULL) + grid_size_current[i][j] = grid_sizes[i][j]; + } + } + } + setup.touch.control_type = touch_control_current->identifier; setup.touch.move_distance = atoi(move_distance_current->identifier); setup.touch.drop_distance = atoi(drop_distance_current->identifier); + setup.touch.transparency = atoi(transparency_current->identifier); + + for (i = 0; i < 2; i++) + { + setup.touch.grid_xsize[i] = atoi(grid_size_current[i][0]->identifier); + setup.touch.grid_ysize[i] = atoi(grid_size_current[i][1]->identifier); + + if (i == GRID_ACTIVE_NR()) + { + overlay.grid_xsize = setup.touch.grid_xsize[i]; + overlay.grid_ysize = setup.touch.grid_ysize[i]; + } + } - /* needed for displaying volume text instead of identifier */ + // needed for displaying value text instead of identifier touch_controls_text = touch_control_current->name; move_distance_text = move_distance_current->name; drop_distance_text = drop_distance_current->name; + transparency_text = transparency_current->name; + + for (i = 0; i < 2; i++) + for (j = 0; j < 2; j++) + grid_size_text[i][j] = grid_size_current[i][j]->name; setup_mode = SETUP_MODE_TOUCH; DrawSetupScreen(); } -static void execSetupArtwork() +static void execSetupArtwork(void) { #if 0 printf("::: '%s', '%s', '%s'\n", @@ -5422,10 +5906,10 @@ static void execSetupArtwork() setup.sounds_set = artwork.snd_current->identifier; setup.music_set = artwork.mus_current->identifier; - /* needed if last screen (setup choice) changed graphics, sounds or music */ + // needed if last screen (setup choice) changed graphics, sounds or music ReloadCustomArtwork(0); - /* needed for displaying artwork name instead of artwork identifier */ + // needed for displaying artwork name instead of artwork identifier graphics_set_name = artwork.gfx_current->name; sounds_set_name = artwork.snd_current->name; music_set_name = artwork.mus_current->name; @@ -5435,89 +5919,203 @@ static void execSetupArtwork() DrawSetupScreen(); } -static void execSetupChooseGraphics() +static void execSetupChooseGraphics(void) { setup_mode = SETUP_MODE_CHOOSE_GRAPHICS; DrawSetupScreen(); } -static void execSetupChooseSounds() +static void execSetupChooseSounds(void) { setup_mode = SETUP_MODE_CHOOSE_SOUNDS; DrawSetupScreen(); } -static void execSetupChooseMusic() +static void execSetupChooseMusic(void) { setup_mode = SETUP_MODE_CHOOSE_MUSIC; DrawSetupScreen(); } -static void execSetupInput() +static void execSetupInput(void) { setup_mode = SETUP_MODE_INPUT; DrawSetupScreen(); } -static void execSetupShortcuts() +static void execSetupShortcuts(void) { setup_mode = SETUP_MODE_SHORTCUTS; DrawSetupScreen(); } -static void execSetupShortcuts1() +static void execSetupShortcuts1(void) { setup_mode = SETUP_MODE_SHORTCUTS_1; DrawSetupScreen(); } -static void execSetupShortcuts2() +static void execSetupShortcuts2(void) { setup_mode = SETUP_MODE_SHORTCUTS_2; DrawSetupScreen(); } -static void execSetupShortcuts3() +static void execSetupShortcuts3(void) { setup_mode = SETUP_MODE_SHORTCUTS_3; DrawSetupScreen(); } -static void execSetupShortcuts4() +static void execSetupShortcuts4(void) { setup_mode = SETUP_MODE_SHORTCUTS_4; DrawSetupScreen(); } -static void execSetupShortcuts5() +static void execSetupShortcuts5(void) { setup_mode = SETUP_MODE_SHORTCUTS_5; DrawSetupScreen(); } -static void execExitSetup() +static void execExitSetup(void) { SetGameStatus(GAME_MODE_MAIN); DrawMainMenu(); } -static void execSaveAndExitSetup() +static void execSaveAndExitSetup(void) { SaveSetup(); execExitSetup(); } +static void execGadgetNetworkServer(void) +{ + int gadget_id = SCREEN_CTRL_ID_NETWORK_SERVER; + struct GadgetInfo *gi = screen_gadget[gadget_id]; + + if (strEqual(setup.network_server_hostname, STR_NETWORK_AUTO_DETECT)) + network_server_hostname[0] = '\0'; + + ModifyGadget(gi, GDI_TEXT_VALUE, network_server_hostname, GDI_END); + + MapGadget(gi); + + ClickOnGadget(gi, MB_LEFTBUTTON); +} + +static void ToggleNetworkModeIfNeeded(void) +{ + int font_title = FONT_TITLE_1; + int font_foot = FC_BLUE; + int ystart = mSY - SY + 16; + int ybottom = mSY - SY + SYSIZE - 20; + char *text = (setup.network_mode ? "Start Network" : "Stop Network"); + + if (setup.network_mode == network.enabled) + return; + + network.enabled = setup.network_mode; + + FadeOut(REDRAW_ALL); + + ClearField(); + + DrawTextSCentered(ystart, font_title, text); + + FadeIn(REDRAW_ALL); + + if (network.enabled) + InitNetworkServer(); + else + DisconnectFromNetworkServer(); + + DrawTextSCentered(ybottom, font_foot, + "Press any key or button for setup menu"); + + WaitForEventToContinue(); + + DrawSetupScreen(); +} + +static void ToggleGameSpeedsListIfNeeded(void) +{ + boolean using_game_speeds_extended = (game_speeds == game_speeds_extended); + + if (setup.game_speed_extended == using_game_speeds_extended) + return; + + // try to match similar values when changing game speeds list + if (setup.game_speed_extended) + setup.game_frame_delay = (setup.game_frame_delay == 15 ? 16 : + setup.game_frame_delay == 30 ? 29 : + setup.game_frame_delay); + else + setup.game_frame_delay = (setup.game_frame_delay == 14 ? 15 : + setup.game_frame_delay == 16 ? 15 : + setup.game_frame_delay >= 29 ? 30 : + setup.game_frame_delay <= 10 ? 10 : + setup.game_frame_delay); + + execSetupGame_setGameSpeeds(TRUE); + + DrawSetupScreen(); +} + +static void ModifyGameSpeedIfNeeded(void) +{ + if (strEqual(setup.vsync_mode, STR_VSYNC_MODE_OFF) || + setup.game_frame_delay <= MAX_VSYNC_FRAME_DELAY) + return; + + char message[100]; + char *game_speed_text = "Fast"; + int game_speed_value = 15; + + if (setup.game_speed_extended) + { + game_speed_text = "60 fps"; + game_speed_value = 16; + } + + sprintf(message, "Game speed set to %s for VSync to work!", game_speed_text); + + // set game speed to existing list value that is fast enough for vsync + setup.game_frame_delay = game_speed_value; + + execSetupGame_setGameSpeeds(TRUE); + + Request(message, REQ_CONFIRM); +} + +static void DisableVsyncIfNeeded(void) +{ + if (strEqual(setup.vsync_mode, STR_VSYNC_MODE_OFF) || + (setup.game_frame_delay >= MIN_VSYNC_FRAME_DELAY && + setup.game_frame_delay <= MAX_VSYNC_FRAME_DELAY)) + return; + + // disable vsync for the selected game speed to work + setup.vsync_mode = STR_VSYNC_MODE_OFF; + + execSetupGraphics_setVsyncModes(TRUE); + + Request("VSync disabled for this game speed to work!", REQ_CONFIRM); +} + static struct { void *value; @@ -5542,6 +6140,9 @@ static struct { &setup.screen_rendering_mode, execSetupChooseRenderingMode }, { &setup.screen_rendering_mode, &rendering_mode_text }, + { &setup.vsync_mode, execSetupChooseVsyncMode }, + { &setup.vsync_mode, &vsync_mode_text }, + { &setup.graphics_set, execSetupChooseGraphics }, { &setup.graphics_set, &graphics_set_name }, @@ -5569,10 +6170,36 @@ static struct { &setup.touch.drop_distance, execSetupChooseDropDistance }, { &setup.touch.drop_distance, &drop_distance_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_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_ysize[1], execSetupChooseGridYSize_1 }, + { &setup.touch.grid_ysize[1], &grid_size_text[1][1] }, + + { &setup.internal.menu_game, execSetupGame }, + { &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 } }; -void setHideRelatedSetupEntries() +void setHideRelatedSetupEntries(void) { int i; @@ -5601,14 +6228,22 @@ static struct TokenInfo setup_info_main[] = 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_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.skip_scores_after_game,"Skip Scores After Game:" }, + { TYPE_YES_NO, &setup.ask_on_game_over, "Ask on Game Over:" }, { TYPE_SWITCH, &setup.autorecord, "Auto-Record Tapes:" }, { 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, "" }, @@ -5658,7 +6293,7 @@ static struct TokenInfo setup_info_editor[] = static struct TokenInfo setup_info_graphics[] = { -#if defined(TARGET_SDL2) && !defined(PLATFORM_ANDROID) +#if !defined(PLATFORM_ANDROID) { TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" }, { TYPE_ENTER_LIST, execSetupChooseWindowSize, "Window Scaling:" }, { TYPE_STRING, &window_size_text, "" }, @@ -5671,6 +6306,8 @@ static struct TokenInfo setup_info_graphics[] = { 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:" }, @@ -5751,11 +6388,20 @@ static struct TokenInfo setup_info_touch[] = { 0, NULL, NULL } }; -static struct TokenInfo setup_info_touch_virtual_buttons[] = +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" }, @@ -5763,6 +6409,33 @@ static struct TokenInfo setup_info_touch_virtual_buttons[] = { 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 } +}; + +static struct TokenInfo *setup_info_touch_virtual_buttons[] = +{ + setup_info_touch_virtual_buttons_0, + setup_info_touch_virtual_buttons_1 +}; + static struct TokenInfo setup_info_touch_wipe_gestures[] = { { TYPE_ENTER_LIST, execSetupChooseTouchControls, "Touch Control Type:" }, @@ -5876,7 +6549,7 @@ static struct TokenInfo setup_info_shortcuts_5[] = { 0, NULL, NULL } }; -static Key getSetupKey() +static Key getSetupKey(void) { Key key = KSYM_UNDEFINED; boolean got_key_event = FALSE; @@ -5893,9 +6566,9 @@ static Key getSetupKey() { key = GetEventKey((KeyEvent *)&event, TRUE); - /* press 'Escape' or 'Enter' to keep the existing key binding */ + // press 'Escape' or 'Enter' to keep the existing key binding if (key == KSYM_Escape || key == KSYM_Return) - key = KSYM_UNDEFINED; /* keep old value */ + key = KSYM_UNDEFINED; // keep old value got_key_event = TRUE; } @@ -5932,6 +6605,8 @@ static int getSetupValueFont(int type, void *value) else if (type & TYPE_YES_NO_AUTO) return (*(int *)value == AUTO ? FONT_OPTION_ON : *(int *)value == FALSE ? FONT_OPTION_OFF : FONT_OPTION_ON); + else if (type & TYPE_PLAYER) + return FONT_VALUE_1; else return FONT_VALUE_1; } @@ -5958,10 +6633,12 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw) int ypos = MENU_SCREEN_START_YPOS + screen_pos; int startx = mSX + xpos * 32; int starty = mSY + ypos * 32; - int font_nr, font_nr_default, font_width_default; int type = si->type; void *value = si->value; char *value_string = getSetupValue(type, value); + int font_nr_default = getSetupValueFont(type, value); + int font_width_default = getFontWidth(font_nr_default); + int font_nr = font_nr_default; int i; if (value_string == NULL) @@ -5976,7 +6653,7 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw) } else if (type & TYPE_STRING) { - int max_value_len = (SCR_FIELDX - 2) * 2; + int max_value_len = (SXSIZE - 2 * TILEX) / font_width_default; xpos = MENU_SCREEN_START_XPOS; @@ -5987,13 +6664,15 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw) { xpos = menu_screen_value_xpos - 1; } + else if (type & TYPE_PLAYER) + { + int displayed_player_nr = *(int *)value + 1; + + value_string = getSetupValue(TYPE_INTEGER, (void *)&displayed_player_nr); + } startx = mSX + xpos * 32; starty = mSY + ypos * 32; - font_nr_default = getSetupValueFont(type, value); - font_width_default = getFontWidth(font_nr_default); - - font_nr = font_nr_default; // special check if right-side setup values moved left due to scrollbar if (scrollbar_needed && xpos > MENU_SCREEN_START_XPOS) @@ -6014,13 +6693,13 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw) } } - /* downward compatibility correction for Juergen Bonhagen's menu settings */ + // downward compatibility correction for Juergen Bonhagen's menu settings if (setup_mode != SETUP_MODE_INPUT) { int max_menu_text_length_big = (menu_screen_value_xpos - MENU_SCREEN_START_XPOS); int max_menu_text_length_medium = max_menu_text_length_big * 2; - int check_font_nr = FONT_OPTION_ON; /* known font that needs correction */ + int check_font_nr = FONT_OPTION_ON; // known font that needs correction int font1_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset; int font2_xoffset = getFontBitmapInfo(check_font_nr)->draw_xoffset; int text_startx = mSX + MENU_SCREEN_START_XPOS * 32; @@ -6037,8 +6716,8 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw) startx + font2_xoffset < text_startx + text_width + text_font_xoffset) correct_font_draw_xoffset = TRUE; - /* check if setup value would overlap with setup text when printed */ - /* (this can happen for extreme/wrong values for font draw offset) */ + // check if setup value would overlap with setup text when printed + // (this can happen for extreme/wrong values for font draw offset) if (correct_font_draw_xoffset) { font_draw_xoffset_old = getFontBitmapInfo(font_nr)->draw_xoffset; @@ -6057,6 +6736,22 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw) DrawText(startx, starty, value_string, font_nr); + if (type & TYPE_PLAYER) + { + struct FontBitmapInfo *font = getFontBitmapInfo(font_nr); + int player_nr = *(int *)value; + int xoff = font->draw_xoffset + getFontWidth(font_nr); + int yoff = font->draw_yoffset + (getFontHeight(font_nr) - TILEY) / 2; + int startx2 = startx + xoff; + int starty2 = starty + yoff; + + if (DrawingOnBackground(startx2, starty2)) + ClearRectangleOnBackground(drawto, startx2, starty2, TILEX, TILEY); + + DrawFixedGraphicThruMaskExt(drawto, startx2, starty2, + PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0); + } + if (font_draw_xoffset_modified) getFontBitmapInfo(font_nr)->draw_xoffset = font_draw_xoffset_old; } @@ -6091,12 +6786,31 @@ static void changeSetupValue(int screen_pos, int setup_info_pos_raw, int dx) if (key != KSYM_UNDEFINED) *(Key *)si->value = key; } + else if (si->type & TYPE_PLAYER) + { + int player_nr = *(int *)si->value; + + if (dx) + player_nr += dx; + else + player_nr = Request("Choose player", REQ_PLAYER) - 1; + + *(int *)si->value = MIN(MAX(0, player_nr), MAX_PLAYERS - 1); + } drawSetupValue(screen_pos, setup_info_pos_raw); // fullscreen state may have changed at this point if (si->value == &setup.fullscreen) ToggleFullscreenOrChangeWindowScalingIfNeeded(); + + // network mode may have changed at this point + if (si->value == &setup.network_mode) + ToggleNetworkModeIfNeeded(); + + // game speed list may have changed at this point + if (si->value == &setup.game_speed_extended) + ToggleGameSpeedsListIfNeeded(); } static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *setup_info_orig) @@ -6106,21 +6820,21 @@ static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *setup_info_orig) int list_pos = 0; int i; - /* determine maximum list size of target list */ + // determine maximum list size of target list while (setup_info_orig[list_size++].type != 0); - /* free, allocate and clear memory for target list */ + // free, allocate and clear memory for target list checked_free(setup_info_final); setup_info_final = checked_calloc(list_size * sizeof(struct TokenInfo)); - /* copy setup info list without setup entries marked as hidden */ + // copy setup info list without setup entries marked as hidden for (i = 0; setup_info_orig[i].type != 0; i++) { - /* skip setup entries configured to be hidden */ + // skip setup entries configured to be hidden if (hideSetupEntry(setup_info_orig[i].value)) continue; - /* skip skippable setup entries if screen is lower than usual */ + // skip skippable setup entries if screen is lower than usual if (SCR_FIELDY < SCR_FIELDY_DEFAULT && setup_info_orig[i].type == TYPE_SKIPPABLE) continue; @@ -6131,14 +6845,14 @@ static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *setup_info_orig) return setup_info_final; } -static void DrawSetupScreen_Generic() +static void DrawSetupScreen_Generic(void) { int fade_mask = REDRAW_FIELD; boolean redraw_all = FALSE; char *title_string = NULL; int i; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; UnmapAllGadgets(); @@ -6152,7 +6866,7 @@ static void DrawSetupScreen_Generic() FadeOut(fade_mask); - /* needed if different viewport properties defined for setup screen */ + // needed if different viewport properties defined for setup screen ChangeViewportPropertiesIfNeeded(); SetMainBackgroundImage(IMG_BACKGROUND_SETUP); @@ -6197,7 +6911,7 @@ static void DrawSetupScreen_Generic() title_string = STR_SETUP_TOUCH; if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS)) - setup_info = setup_info_touch_virtual_buttons; + setup_info = setup_info_touch_virtual_buttons[GRID_ACTIVE_NR()]; else if (strEqual(setup.touch.control_type, TOUCH_CONTROL_WIPE_GESTURES)) setup_info = setup_info_touch_wipe_gestures; } @@ -6232,7 +6946,7 @@ static void DrawSetupScreen_Generic() title_string = STR_SETUP_SHORTCUTS; } - /* use modified setup info without setup entries marked as hidden */ + // use modified setup info without setup entries marked as hidden setup_info = getSetupInfoFinal(setup_info); DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, title_string); @@ -6267,7 +6981,7 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) setup_mode, num_setup_info, max_setup_info); } -void DrawSetupScreen_Input() +static void DrawSetupScreen_Input(void) { int i; @@ -6291,11 +7005,11 @@ void DrawSetupScreen_Input() DrawCursorAndText_Setup(i, -1, FALSE); } - /* create gadgets for setup input menu screen */ + // create gadgets for setup input menu screen FreeScreenGadgets(); CreateScreenGadgets(); - /* map gadgets for setup input menu screen */ + // map gadgets for setup input menu screen MapScreenMenuGadgets(SCREEN_MASK_INPUT); HandleSetupScreen_Input(0, 0, 0, 0, MB_MENU_INITIALIZE); @@ -6421,7 +7135,7 @@ static void drawPlayerSetupInputInfo(int player_nr, boolean active) static int input_player_nr = 0; -void HandleSetupScreen_Input_Player(int step, int direction) +static void HandleSetupScreen_Input_Player(int step, int direction) { int old_player_nr = input_player_nr; int new_player_nr; @@ -6456,7 +7170,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) for (i = 0; setup_info_input[i].type != 0; i++) { - /* adjust menu structure according to skipped setup entries */ + // adjust menu structure according to skipped setup entries if (setup_info_input[i].type == TYPE_SKIPPABLE) { pos_empty2--; @@ -6467,7 +7181,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) if (button == MB_MENU_INITIALIZE) { - /* input setup menu may have changed size due to graphics configuration */ + // input setup menu may have changed size due to graphics configuration if (choice >= pos_empty1) choice = pos_end; @@ -6486,12 +7200,12 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) return; } - if (mx || my) /* mouse input */ + if (mx || my) // mouse input { x = (mx - mSX) / 32; y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS; } - else if (dx || dy) /* keyboard input */ + else if (dx || dy) // keyboard input { if (dx && choice == 0) x = (dx < 0 ? 10 : 12); @@ -6600,7 +7314,7 @@ static boolean CustomizeKeyboardMain(int player_nr) font_nr_new = FONT_VALUE_NARROW; } - /* read existing key bindings from player setup */ + // read existing key bindings from player setup custom_key = setup.input[player_nr].key; FadeSetEnterMenu(); @@ -6632,7 +7346,7 @@ static boolean CustomizeKeyboardMain(int player_nr) { Key key = GetEventKey((KeyEvent *)&event, FALSE); - /* press 'Escape' to abort and keep the old key bindings */ + // press 'Escape' to abort and keep the old key bindings if (key == KSYM_Escape) { FadeSkipNextFadeIn(); @@ -6642,18 +7356,18 @@ static boolean CustomizeKeyboardMain(int player_nr) break; } - /* press 'Enter' to keep the existing key binding */ + // press 'Enter' to keep the existing key binding if (key == KSYM_Return) key = *customize_step[step_nr].key; - /* check if key already used */ + // check if key already used for (i = 0; i < step_nr; i++) if (*customize_step[i].key == key) break; if (i < step_nr) break; - /* got new key binding */ + // got new key binding *customize_step[step_nr].key = key; DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32, " ", font_nr_new); @@ -6661,13 +7375,13 @@ static boolean CustomizeKeyboardMain(int player_nr) getKeyNameFromKey(key), font_nr_new); step_nr++; - /* un-highlight last query */ + // un-highlight last query DrawText(mSX, mSY + (2 + 2 * (step_nr - 1)) * 32, customize_step[step_nr - 1].text, FONT_MENU_1); DrawText(mSX, mSY + (2 + 2 * (step_nr - 1) + 1) * 32, "Key:", FONT_MENU_1); - /* all keys configured */ + // all keys configured if (step_nr == 6) { finished = TRUE; @@ -6676,7 +7390,7 @@ static boolean CustomizeKeyboardMain(int player_nr) break; } - /* query next key binding */ + // query next key binding DrawText(mSX, mSY + (2 + 2 * step_nr) * 32, customize_step[step_nr].text, FONT_INPUT_1_ACTIVE); DrawText(mSX, mSY + (2 + 2 * step_nr + 1) * 32, @@ -6700,7 +7414,7 @@ static boolean CustomizeKeyboardMain(int player_nr) BackToFront(); } - /* write new key bindings back to player setup, if successfully finished */ + // write new key bindings back to player setup, if successfully finished if (success) setup.input[player_nr].key = custom_key; @@ -6736,7 +7450,7 @@ void CustomizeKeyboard(int player_nr) DrawSetupScreen_Input(); } -/* game controller mapping generator by Gabriel Jacobo */ +// game controller mapping generator by Gabriel Jacobo #define MARKER_BUTTON 1 #define MARKER_AXIS_X 2 @@ -6744,7 +7458,6 @@ void CustomizeKeyboard(int player_nr) static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) { -#if defined(TARGET_SDL2) static boolean bitmaps_initialized = FALSE; boolean screen_initialized = FALSE; static Bitmap *controller, *button, *axis_x, *axis_y; @@ -6816,7 +7529,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) name = getFormattedJoystickName(SDL_JoystickName(joystick)); #if DEBUG_JOYSTICKS - /* print info about the joystick we are watching */ + // print info about the joystick we are watching Error(ERR_DEBUG, "watching joystick %d: (%s)\n", SDL_JoystickInstanceID(joystick), name); Error(ERR_DEBUG, "joystick has %d axes, %d hats, %d balls, and %d buttons\n", @@ -6824,16 +7537,16 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) SDL_JoystickNumBalls(joystick), SDL_JoystickNumButtons(joystick)); #endif - /* initialize mapping with GUID and name */ + // initialize mapping with GUID and name SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joystick), temp, sizeof(temp)); snprintf(mapping, sizeof(mapping), "%s,%s,platform:%s,", temp, name, SDL_GetPlatform()); - /* loop through all steps (buttons and axes), getting joystick events */ + // loop through all steps (buttons and axes), getting joystick events for (i = 0; i < SDL_arraysize(steps) && !done;) { - Bitmap *marker = button; /* initialize with reliable default value */ + Bitmap *marker = button; // initialize with reliable default value step = &steps[i]; strcpy(step->mapping, mapping); @@ -6964,8 +7677,8 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) break; case SDL_JOYHATMOTION: - /* ignore centering; we're probably just coming back - to the center from the previous item we set */ + // ignore centering; we're probably just coming back + // to the center from the previous item we set if (event.jhat.value == SDL_HAT_CENTERED) break; @@ -7010,7 +7723,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) case SDL_FINGERDOWN: case SDL_MOUSEBUTTONDOWN: - /* skip this step */ + // skip this step i++; next = TRUE; @@ -7022,14 +7735,14 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) { if (i == 0) { - /* leave screen */ + // leave screen success = FALSE; done = TRUE; break; } - /* undo this step */ + // undo this step prev_step = &steps[i - 1]; strcpy(mapping, prev_step->mapping); i--; @@ -7042,7 +7755,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) event.key.keysym.sym == KSYM_Return || event.key.keysym.sym == KSYM_Menu) { - /* skip this step */ + // skip this step i++; next = TRUE; @@ -7051,7 +7764,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) if (event.key.keysym.sym == KSYM_Escape) { - /* leave screen */ + // leave screen success = FALSE; done = TRUE; } @@ -7086,13 +7799,10 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) SaveSetup_AddGameControllerMapping(mapping); } - /* wait until the last pending event was removed from event queue */ + // wait until the last pending event was removed from event queue while (NextValidEvent(&event)); return success; -#else - return TRUE; -#endif } static int ConfigureJoystickMain(int player_nr) @@ -7175,7 +7885,7 @@ void ConfigureJoystick(int player_nr) DrawSetupScreen_Input(); } -boolean ConfigureVirtualButtonsMain() +static boolean ConfigureVirtualButtonsMain(void) { static char *customize_step_text[] = { @@ -7240,7 +7950,7 @@ boolean ConfigureVirtualButtonsMain() { Key key = GetEventKey((KeyEvent *)&event, FALSE); - /* press 'Escape' to abort and keep the old key bindings */ + // press 'Escape' to abort and keep the old key bindings if (key == KSYM_Escape) { for (x = 0; x < MAX_GRID_XSIZE; x++) @@ -7254,7 +7964,7 @@ boolean ConfigureVirtualButtonsMain() break; } - /* press 'Enter' to keep the existing key binding */ + // press 'Enter' to keep the existing key binding if (key == KSYM_Return || key == KSYM_Menu || key == KSYM_space) @@ -7280,7 +7990,7 @@ boolean ConfigureVirtualButtonsMain() break; } - /* all virtual buttons configured */ + // all virtual buttons configured if (step_nr == 6) { finished = TRUE; @@ -7295,7 +8005,7 @@ boolean ConfigureVirtualButtonsMain() overlay.grid_button_highlight = grid_button[step_nr]; - /* query next virtual button */ + // query next virtual button ClearField(); @@ -7351,7 +8061,6 @@ boolean ConfigureVirtualButtonsMain() } break; -#if defined(TARGET_SDL2) case SDL_WINDOWEVENT: HandleWindowEvent((WindowEvent *) &event); @@ -7374,7 +8083,6 @@ boolean ConfigureVirtualButtonsMain() case SDL_APP_DIDENTERFOREGROUND: HandlePauseResumeEvent((PauseResumeEvent *) &event); break; -#endif default: HandleOtherEvents(&event); @@ -7397,7 +8105,7 @@ boolean ConfigureVirtualButtonsMain() for (x = 0; x < MAX_GRID_XSIZE; x++) for (y = 0; y < MAX_GRID_YSIZE; y++) - overlay.grid_button_all[nr][x][y] = overlay.grid_button[x][y]; + setup.touch.grid_button[nr][x][y] = overlay.grid_button[x][y]; overlay.grid_button_highlight = CHAR_GRID_BUTTON_NONE; @@ -7406,7 +8114,7 @@ boolean ConfigureVirtualButtonsMain() return success; } -void ConfigureVirtualButtons() +void ConfigureVirtualButtons(void) { boolean success = ConfigureVirtualButtonsMain(); @@ -7433,8 +8141,11 @@ void ConfigureVirtualButtons() } } -void DrawSetupScreen() +void DrawSetupScreen(void) { + align_xoffset = 0; + align_yoffset = 0; + if (setup_mode == SETUP_MODE_INPUT) DrawSetupScreen_Input(); else if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED) @@ -7449,6 +8160,8 @@ void DrawSetupScreen() DrawChooseTree(&scaling_type_current); else if (setup_mode == SETUP_MODE_CHOOSE_RENDERING) DrawChooseTree(&rendering_mode_current); + else if (setup_mode == SETUP_MODE_CHOOSE_VSYNC) + DrawChooseTree(&vsync_mode_current); else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS) DrawChooseTree(&artwork.gfx_current); else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS) @@ -7467,13 +8180,23 @@ void DrawSetupScreen() DrawChooseTree(&move_distance_current); else if (setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE) DrawChooseTree(&drop_distance_current); + else if (setup_mode == SETUP_MODE_CHOOSE_TRANSPARENCY) + DrawChooseTree(&transparency_current); + else if (setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_0) + DrawChooseTree(&grid_size_current[0][0]); + else if (setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_0) + DrawChooseTree(&grid_size_current[0][1]); + else if (setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_1) + DrawChooseTree(&grid_size_current[1][0]); + else if (setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_1) + DrawChooseTree(&grid_size_current[1][1]); else DrawSetupScreen_Generic(); PlayMenuSoundsAndMusic(); } -void RedrawSetupScreenAfterFullscreenToggle() +void RedrawSetupScreenAfterFullscreenToggle(void) { if (setup_mode == SETUP_MODE_GRAPHICS || setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE) @@ -7485,6 +8208,24 @@ void RedrawSetupScreenAfterFullscreenToggle() } } +void RedrawSetupScreenAfterScreenRotation(int nr) +{ + int x, y; + + if (setup_mode == SETUP_MODE_TOUCH) + { + // update virtual button settings (depending on screen orientation) + DrawSetupScreen(); + } + else if (setup_mode == SETUP_MODE_CONFIG_VIRT_BUTTONS) + { + // save already configured virtual buttons + for (x = 0; x < MAX_GRID_XSIZE; x++) + for (y = 0; y < MAX_GRID_YSIZE; y++) + setup.touch.grid_button[nr][x][y] = overlay.grid_button[x][y]; + } +} + void HandleSetupScreen(int mx, int my, int dx, int dy, int button) { if (setup_mode == SETUP_MODE_INPUT) @@ -7501,6 +8242,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) HandleChooseTree(mx, my, dx, dy, button, &scaling_type_current); else if (setup_mode == SETUP_MODE_CHOOSE_RENDERING) HandleChooseTree(mx, my, dx, dy, button, &rendering_mode_current); + else if (setup_mode == SETUP_MODE_CHOOSE_VSYNC) + HandleChooseTree(mx, my, dx, dy, button, &vsync_mode_current); else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS) HandleChooseTree(mx, my, dx, dy, button, &artwork.gfx_current); else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS) @@ -7519,26 +8262,43 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) HandleChooseTree(mx, my, dx, dy, button, &move_distance_current); else if (setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE) HandleChooseTree(mx, my, dx, dy, button, &drop_distance_current); + else if (setup_mode == SETUP_MODE_CHOOSE_TRANSPARENCY) + HandleChooseTree(mx, my, dx, dy, button, &transparency_current); + else if (setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_0) + HandleChooseTree(mx, my, dx, dy, button, &grid_size_current[0][0]); + else if (setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_0) + HandleChooseTree(mx, my, dx, dy, button, &grid_size_current[0][1]); + else if (setup_mode == SETUP_MODE_CHOOSE_GRID_XSIZE_1) + HandleChooseTree(mx, my, dx, dy, button, &grid_size_current[1][0]); + else if (setup_mode == SETUP_MODE_CHOOSE_GRID_YSIZE_1) + HandleChooseTree(mx, my, dx, dy, button, &grid_size_current[1][1]); else HandleSetupScreen_Generic(mx, my, dx, dy, button); } -void HandleGameActions() +void HandleGameActions(void) { + if (setup.ask_on_game_over) + CheckGameOver(); + if (game.restart_game_message != NULL) + { RequestRestartGame(game.restart_game_message); + return; + } + if (game_status != GAME_MODE_PLAYING) return; - GameActions(); /* main game loop */ + GameActions(); // main game loop if (tape.auto_play && !tape.playing) - AutoPlayTape(); /* continue automatically playing next tape */ + AutoPlayTape(); // continue automatically playing next tape } -/* ---------- new screen button stuff -------------------------------------- */ +// ---------- new screen button stuff -------------------------------------- static void getScreenMenuButtonPos(int *x, int *y, int gadget_id) { @@ -7554,6 +8314,21 @@ static void getScreenMenuButtonPos(int *x, int *y, int gadget_id) *y = mSY + GDI_ACTIVE_POS(menu.main.button.next_level.y); break; + case SCREEN_CTRL_ID_FIRST_LEVEL: + *x = mSX + GDI_ACTIVE_POS(menu.main.button.first_level.x); + *y = mSY + GDI_ACTIVE_POS(menu.main.button.first_level.y); + break; + + case SCREEN_CTRL_ID_LAST_LEVEL: + *x = mSX + GDI_ACTIVE_POS(menu.main.button.last_level.x); + *y = mSY + GDI_ACTIVE_POS(menu.main.button.last_level.y); + break; + + case SCREEN_CTRL_ID_LEVEL_NUMBER: + *x = mSX + GDI_ACTIVE_POS(menu.main.button.level_number.x); + *y = mSY + GDI_ACTIVE_POS(menu.main.button.level_number.y); + break; + case SCREEN_CTRL_ID_PREV_PLAYER: *x = mSX + TILEX * 10; *y = mSY + TILEY * MENU_SCREEN_START_YPOS; @@ -7564,6 +8339,16 @@ static void getScreenMenuButtonPos(int *x, int *y, int gadget_id) *y = mSY + TILEY * MENU_SCREEN_START_YPOS; break; + case SCREEN_CTRL_ID_INSERT_SOLUTION: + *x = mSX + GDI_ACTIVE_POS(menu.main.button.insert_solution.x); + *y = mSY + GDI_ACTIVE_POS(menu.main.button.insert_solution.y); + break; + + case SCREEN_CTRL_ID_PLAY_SOLUTION: + *x = mSX + GDI_ACTIVE_POS(menu.main.button.play_solution.x); + *y = mSY + GDI_ACTIVE_POS(menu.main.button.play_solution.y); + break; + default: Error(ERR_EXIT, "unknown gadget ID %d", gadget_id); } @@ -7575,6 +8360,7 @@ static struct void (*get_gadget_position)(int *, int *, int); int gadget_id; int screen_mask; + unsigned int event_mask; char *infotext; } menubutton_info[NUM_SCREEN_MENUBUTTONS] = { @@ -7583,29 +8369,73 @@ static struct getScreenMenuButtonPos, SCREEN_CTRL_ID_PREV_LEVEL, SCREEN_MASK_MAIN, - "last level" + GD_EVENT_PRESSED | GD_EVENT_REPEATED, + "previous level" }, { IMG_MENU_BUTTON_NEXT_LEVEL, IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE, getScreenMenuButtonPos, SCREEN_CTRL_ID_NEXT_LEVEL, SCREEN_MASK_MAIN, + GD_EVENT_PRESSED | GD_EVENT_REPEATED, "next level" }, + { + IMG_MENU_BUTTON_FIRST_LEVEL, IMG_MENU_BUTTON_FIRST_LEVEL_ACTIVE, + getScreenMenuButtonPos, + SCREEN_CTRL_ID_FIRST_LEVEL, + SCREEN_MASK_MAIN, + GD_EVENT_RELEASED, + "first level" + }, + { + IMG_MENU_BUTTON_LAST_LEVEL, IMG_MENU_BUTTON_LAST_LEVEL_ACTIVE, + getScreenMenuButtonPos, + SCREEN_CTRL_ID_LAST_LEVEL, + SCREEN_MASK_MAIN, + GD_EVENT_RELEASED, + "last level" + }, + { + IMG_MENU_BUTTON_LEVEL_NUMBER, IMG_MENU_BUTTON_LEVEL_NUMBER_ACTIVE, + getScreenMenuButtonPos, + SCREEN_CTRL_ID_LEVEL_NUMBER, + SCREEN_MASK_MAIN, + GD_EVENT_RELEASED, + "level number" + }, { IMG_MENU_BUTTON_LEFT, IMG_MENU_BUTTON_LEFT_ACTIVE, getScreenMenuButtonPos, SCREEN_CTRL_ID_PREV_PLAYER, SCREEN_MASK_INPUT, - "last player" + GD_EVENT_PRESSED | GD_EVENT_REPEATED, + "previous player" }, { IMG_MENU_BUTTON_RIGHT, IMG_MENU_BUTTON_RIGHT_ACTIVE, getScreenMenuButtonPos, SCREEN_CTRL_ID_NEXT_PLAYER, SCREEN_MASK_INPUT, + GD_EVENT_PRESSED | GD_EVENT_REPEATED, "next player" }, + { + IMG_MENU_BUTTON_INSERT_SOLUTION, IMG_MENU_BUTTON_INSERT_SOLUTION_ACTIVE, + getScreenMenuButtonPos, + SCREEN_CTRL_ID_INSERT_SOLUTION, + SCREEN_MASK_MAIN_HAS_SOLUTION, + GD_EVENT_RELEASED, + "insert solution tape" + }, + { + IMG_MENU_BUTTON_PLAY_SOLUTION, IMG_MENU_BUTTON_PLAY_SOLUTION_ACTIVE, + getScreenMenuButtonPos, + SCREEN_CTRL_ID_PLAY_SOLUTION, + SCREEN_MASK_MAIN_HAS_SOLUTION, + GD_EVENT_RELEASED, + "play solution tape" + }, }; static struct @@ -7618,13 +8448,13 @@ static struct { { IMG_MENU_BUTTON_UP, IMG_MENU_BUTTON_UP_ACTIVE, - -1, -1, /* these values are not constant, but can change at runtime */ + -1, -1, // these values are not constant, but can change at runtime SCREEN_CTRL_ID_SCROLL_UP, "scroll up" }, { IMG_MENU_BUTTON_DOWN, IMG_MENU_BUTTON_DOWN_ACTIVE, - -1, -1, /* these values are not constant, but can change at runtime */ + -1, -1, // these values are not constant, but can change at runtime SCREEN_CTRL_ID_SCROLL_DOWN, "scroll down" } @@ -7642,15 +8472,35 @@ static struct { { IMG_MENU_SCROLLBAR, IMG_MENU_SCROLLBAR_ACTIVE, - -1, -1, /* these values are not constant, but can change at runtime */ - -1, -1, /* these values are not constant, but can change at runtime */ + -1, -1, // these values are not constant, but can change at runtime + -1, -1, // these values are not constant, but can change at runtime GD_TYPE_SCROLLBAR_VERTICAL, SCREEN_CTRL_ID_SCROLL_VERTICAL, "scroll level series vertically" } }; -static void CreateScreenMenubuttons() +static struct +{ + int graphic; + int gadget_id; + int x, y; + int size; + char *value; + char *infotext; +} textinput_info[NUM_SCREEN_TEXTINPUT] = +{ + { + IMG_SETUP_INPUT_TEXT, + SCREEN_CTRL_ID_NETWORK_SERVER, + -1, -1, // these values are not constant, but can change at runtime + MAX_SETUP_TEXT_INPUT_LEN, + network_server_hostname, + "Network Server Hostname / IP" + }, +}; + +static void CreateScreenMenubuttons(void) { struct GadgetInfo *gi; unsigned int event_mask; @@ -7664,12 +8514,12 @@ static void CreateScreenMenubuttons() int gd_x1, gd_x2, gd_y1, gd_y2; int id = menubutton_info[i].gadget_id; - event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED; + event_mask = menubutton_info[i].event_mask; menubutton_info[i].get_gadget_position(&x, &y, id); - width = SC_MENUBUTTON_XSIZE; - height = SC_MENUBUTTON_YSIZE; + width = graphic_info[menubutton_info[i].gfx_pressed].width; + height = graphic_info[menubutton_info[i].gfx_pressed].height; gfx_unpressed = menubutton_info[i].gfx_unpressed; gfx_pressed = menubutton_info[i].gfx_pressed; @@ -7682,6 +8532,7 @@ static void CreateScreenMenubuttons() gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, + GDI_IMAGE_ID, gfx_unpressed, GDI_INFO_TEXT, menubutton_info[i].infotext, GDI_X, x, GDI_Y, y, @@ -7703,13 +8554,13 @@ static void CreateScreenMenubuttons() } } -static void CreateScreenScrollbuttons() +static void CreateScreenScrollbuttons(void) { struct GadgetInfo *gi; unsigned int event_mask; int i; - /* these values are not constant, but can change at runtime */ + // these values are not constant, but can change at runtime scrollbutton_info[0].x = SC_SCROLL_UP_XPOS; scrollbutton_info[0].y = SC_SCROLL_UP_YPOS; scrollbutton_info[1].x = SC_SCROLL_DOWN_XPOS; @@ -7730,7 +8581,7 @@ static void CreateScreenScrollbuttons() width = SC_SCROLLBUTTON_XSIZE; height = SC_SCROLLBUTTON_YSIZE; - /* correct scrollbar position if placed outside menu (playfield) area */ + // correct scrollbar position if placed outside menu (playfield) area if (x > SX + SC_SCROLL_UP_XPOS) x = SX + SC_SCROLL_UP_XPOS; @@ -7749,6 +8600,7 @@ static void CreateScreenScrollbuttons() gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, + GDI_IMAGE_ID, gfx_unpressed, GDI_INFO_TEXT, scrollbutton_info[i].infotext, GDI_X, x, GDI_Y, y, @@ -7770,11 +8622,11 @@ static void CreateScreenScrollbuttons() } } -static void CreateScreenScrollbars() +static void CreateScreenScrollbars(void) { int i; - /* these values are not constant, but can change at runtime */ + // these values are not constant, but can change at runtime scrollbar_info[0].x = SC_SCROLL_VERTICAL_XPOS; scrollbar_info[0].y = SC_SCROLL_VERTICAL_YPOS; scrollbar_info[0].width = SC_SCROLL_VERTICAL_XSIZE; @@ -7799,7 +8651,7 @@ static void CreateScreenScrollbars() width = scrollbar_info[i].width; height = scrollbar_info[i].height; - /* correct scrollbar position if placed outside menu (playfield) area */ + // correct scrollbar position if placed outside menu (playfield) area if (x > SX + SC_SCROLL_VERTICAL_XPOS) x = SX + SC_SCROLL_VERTICAL_XPOS; @@ -7821,6 +8673,7 @@ static void CreateScreenScrollbars() gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, + GDI_IMAGE_ID, gfx_unpressed, GDI_INFO_TEXT, scrollbar_info[i].infotext, GDI_X, x, GDI_Y, y, @@ -7850,15 +8703,63 @@ static void CreateScreenScrollbars() } } -void CreateScreenGadgets() +static void CreateScreenTextInputGadgets(void) +{ + int i; + + for (i = 0; i < NUM_SCREEN_TEXTINPUT; i++) + { + int graphic = textinput_info[i].graphic; + struct GraphicInfo *gd = &graphic_info[graphic]; + int gd_x1 = gd->src_x; + int gd_y1 = gd->src_y; + int gd_x2 = gd->src_x + gd->active_xoffset; + int gd_y2 = gd->src_y + gd->active_yoffset; + struct GadgetInfo *gi; + unsigned int event_mask; + int id = textinput_info[i].gadget_id; + int x = textinput_info[i].x; + int y = textinput_info[i].y; + + event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING; + + gi = CreateGadget(GDI_CUSTOM_ID, id, + GDI_CUSTOM_TYPE_ID, i, + GDI_INFO_TEXT, textinput_info[i].infotext, + GDI_X, SX + x, + GDI_Y, SY + y, + GDI_TYPE, GD_TYPE_TEXT_INPUT_ALPHANUMERIC, + GDI_TEXT_VALUE, textinput_info[i].value, + GDI_TEXT_SIZE, textinput_info[i].size, + GDI_TEXT_FONT, getSetupValueFont(TYPE_STRING, NULL), + GDI_TEXT_FONT_ACTIVE, FONT_TEXT_1, + GDI_DESIGN_UNPRESSED, gd->bitmap, gd_x1, gd_y1, + GDI_DESIGN_PRESSED, gd->bitmap, gd_x2, gd_y2, + GDI_BORDER_SIZE, gd->border_size, gd->border_size, + GDI_DESIGN_WIDTH, gd->width, + GDI_EVENT_MASK, event_mask, + GDI_CALLBACK_ACTION, HandleScreenGadgets, + GDI_CALLBACK_ACTION_ALWAYS, TRUE, + GDI_END); + + if (gi == NULL) + Error(ERR_EXIT, "cannot create gadget"); + + screen_gadget[id] = gi; + } +} + +void CreateScreenGadgets(void) { CreateScreenMenubuttons(); CreateScreenScrollbuttons(); CreateScreenScrollbars(); + + CreateScreenTextInputGadgets(); } -void FreeScreenGadgets() +void FreeScreenGadgets(void) { int i; @@ -7875,6 +8776,33 @@ void MapScreenMenuGadgets(int screen_mask) MapGadget(screen_gadget[menubutton_info[i].gadget_id]); } +static void UnmapScreenMenuGadgets(int screen_mask) +{ + int i; + + for (i = 0; i < NUM_SCREEN_MENUBUTTONS; i++) + { + if (screen_mask & menubutton_info[i].screen_mask) + { + UnmapGadget(screen_gadget[menubutton_info[i].gadget_id]); + + if (screen_mask & SCREEN_MASK_MAIN_HAS_SOLUTION) + DrawBackground(screen_gadget[menubutton_info[i].gadget_id]->x, + screen_gadget[menubutton_info[i].gadget_id]->y, + screen_gadget[menubutton_info[i].gadget_id]->width, + screen_gadget[menubutton_info[i].gadget_id]->height); + } + } +} + +void UpdateScreenMenuGadgets(int screen_mask, boolean map_gadgets) +{ + if (map_gadgets) + MapScreenMenuGadgets(screen_mask); + else + UnmapScreenMenuGadgets(screen_mask); +} + void MapScreenGadgets(int num_entries) { int i; @@ -7898,7 +8826,9 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) { int id = gi->custom_id; int button = gi->event.button; - int step = (button == 1 ? 1 : button == 2 ? 5 : 10); + int step = (button == MB_LEFTBUTTON ? 1 : + button == MB_MIDDLEBUTTON ? 5 : + button == MB_RIGHTBUTTON ? 10 : 1); switch (id) { @@ -7910,6 +8840,20 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) HandleMainMenu_SelectLevel(step, +1, NO_DIRECT_LEVEL_SELECT); break; + case SCREEN_CTRL_ID_FIRST_LEVEL: + HandleMainMenu_SelectLevel(MAX_LEVELS, -1, NO_DIRECT_LEVEL_SELECT); + break; + + case SCREEN_CTRL_ID_LAST_LEVEL: + HandleMainMenu_SelectLevel(MAX_LEVELS, +1, NO_DIRECT_LEVEL_SELECT); + break; + + case SCREEN_CTRL_ID_LEVEL_NUMBER: + CloseDoor(DOOR_CLOSE_2); + SetGameStatus(GAME_MODE_LEVELNR); + DrawChooseLevelNr(); + break; + case SCREEN_CTRL_ID_PREV_PLAYER: HandleSetupScreen_Input_Player(step, -1); break; @@ -7918,6 +8862,14 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) HandleSetupScreen_Input_Player(step, +1); break; + case SCREEN_CTRL_ID_INSERT_SOLUTION: + InsertSolutionTape(); + break; + + case SCREEN_CTRL_ID_PLAY_SOLUTION: + PlaySolutionTape(); + break; + case SCREEN_CTRL_ID_SCROLL_UP: if (game_status == GAME_MODE_LEVELS) HandleChooseLevelSet(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); @@ -7951,7 +8903,147 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) HandleInfoScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE); break; + case SCREEN_CTRL_ID_NETWORK_SERVER: + { + if (!strEqual(gi->textinput.value, "")) + { + setString(&setup.network_server_hostname, gi->textinput.value); + + network.server_host = setup.network_server_hostname; + } + else + { + setString(&setup.network_server_hostname, STR_NETWORK_AUTO_DETECT); + + network.server_host = NULL; + } + + if (strEqual(network.server_host, STR_NETWORK_AUTO_DETECT)) + network.server_host = NULL; + + execSetupGame_setNetworkServerText(); + + DrawSetupScreen(); + + break; + } + default: break; } } + +void DumpScreenIdentifiers(void) +{ + int i; + + Print("Active screen elements on current screen:\n"); + + for (i = 0; main_controls[i].nr != -1; i++) + { + struct MainControlInfo *mci = &main_controls[i]; + + if (mci->button_graphic != -1) + { + char *token = getTokenFromImageID(mci->button_graphic); + + Print("- '%s'\n", token); + } + } + + Print("Done.\n"); +} + +boolean DoScreenAction(int image_id) +{ + int i; + + if (game_status != GAME_MODE_MAIN) + return FALSE; + + for (i = 0; main_controls[i].nr != -1; i++) + { + struct MainControlInfo *mci = &main_controls[i]; + struct MenuPosInfo *pos = mci->pos_button; + + if (mci->button_graphic == image_id) + { + int x = mSX + pos->x; + int y = mSY + pos->y; + + HandleMainMenu(x, y, 0, 0, MB_MENU_CHOICE); + + return TRUE; + } + } + + return FALSE; +} + +void DrawScreenAfterAddingSet(char *tree_subdir_new, int tree_type) +{ + // get tree info node of newly added level or artwork set + TreeInfo *tree_node_first = TREE_FIRST_NODE(tree_type); + TreeInfo *tree_node_new = getTreeInfoFromIdentifier(tree_node_first, + tree_subdir_new); + if (tree_node_new == NULL) // should not happen + return; + + // if request dialog is active, do nothing + if (game.request_active) + return; + + if (game_status == GAME_MODE_MAIN && + tree_type == TREE_TYPE_LEVEL_DIR) + { + // when adding new level set in main menu, select it as current level set + + // change current level set to newly added level set from zip file + leveldir_current = tree_node_new; + + // change current level number to first level of newly added level set + level_nr = leveldir_current->first_level; + + // redraw screen to reflect changed level set + DrawMainMenu(); + + // save this level set and level number as last selected level set + SaveLevelSetup_LastSeries(); + SaveLevelSetup_SeriesInfo(); + } + else if (game_status == GAME_MODE_LEVELS && + tree_type == TREE_TYPE_LEVEL_DIR) + { + // when adding new level set in level set menu, set cursor and update screen + + leveldir_current = tree_node_new; + + DrawChooseTree(&leveldir_current); + } + else if (game_status == GAME_MODE_SETUP) + { + // when adding new artwork set in setup menu, set cursor and update screen + + if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS && + tree_type == TREE_TYPE_GRAPHICS_DIR) + { + artwork.gfx_current = tree_node_new; + + DrawChooseTree(&artwork.gfx_current); + } + else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS && + tree_type == TREE_TYPE_SOUNDS_DIR) + { + artwork.snd_current = tree_node_new; + + DrawChooseTree(&artwork.snd_current); + } + else if (setup_mode == SETUP_MODE_CHOOSE_MUSIC && + tree_type == TREE_TYPE_MUSIC_DIR) + { + artwork.mus_current = tree_node_new; + + DrawChooseTree(&artwork.mus_current); + } + } +}