X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=39650b5cf6a4f9aa32acd0fb999518ccbd6815c1;hp=3c12d6b5df34b14d528fd4d61f8c7a828e64bfd7;hb=668d05fbdb883eb630700f4df445f77abe599498;hpb=17c7213a32d3a0e4c84727937f2ed79028461798 diff --git a/src/screens.c b/src/screens.c index 3c12d6b5..39650b5c 100644 --- a/src/screens.c +++ b/src/screens.c @@ -4,7 +4,7 @@ // (c) 1995-2014 by Artsoft Entertainment // Holger Schemel // info@artsoft.org -// http://www.artsoft.org/ +// https://www.artsoft.org/ // ---------------------------------------------------------------------------- // 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,59 +39,61 @@ #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 -#define SETUP_MODE_GRAPHICS 3 -#define SETUP_MODE_SOUND 4 -#define SETUP_MODE_ARTWORK 5 -#define SETUP_MODE_INPUT 6 -#define SETUP_MODE_TOUCH 7 -#define SETUP_MODE_SHORTCUTS 8 -#define SETUP_MODE_SHORTCUTS_1 9 -#define SETUP_MODE_SHORTCUTS_2 10 -#define SETUP_MODE_SHORTCUTS_3 11 -#define SETUP_MODE_SHORTCUTS_4 12 -#define SETUP_MODE_SHORTCUTS_5 13 - -/* 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) */ -#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_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 SETUP_MODE_ENGINES 2 +#define SETUP_MODE_EDITOR 3 +#define SETUP_MODE_GRAPHICS 4 +#define SETUP_MODE_SOUND 5 +#define SETUP_MODE_ARTWORK 6 +#define SETUP_MODE_INPUT 7 +#define SETUP_MODE_TOUCH 8 +#define SETUP_MODE_SHORTCUTS 9 +#define SETUP_MODE_SHORTCUTS_1 10 +#define SETUP_MODE_SHORTCUTS_2 11 +#define SETUP_MODE_SHORTCUTS_3 12 +#define SETUP_MODE_SHORTCUTS_4 13 +#define SETUP_MODE_SHORTCUTS_5 14 + +// sub-screens on the setup screen (generic) +#define SETUP_MODE_CHOOSE_ARTWORK 15 +#define SETUP_MODE_CHOOSE_OTHER 16 + +// sub-screens on the setup screen (specific) +#define SETUP_MODE_CHOOSE_GAME_SPEED 17 +#define SETUP_MODE_CHOOSE_SCROLL_DELAY 18 +#define SETUP_MODE_CHOOSE_SNAPSHOT_MODE 19 +#define SETUP_MODE_CHOOSE_WINDOW_SIZE 20 +#define SETUP_MODE_CHOOSE_SCALING_TYPE 21 +#define SETUP_MODE_CHOOSE_RENDERING 22 +#define SETUP_MODE_CHOOSE_VSYNC 23 +#define SETUP_MODE_CHOOSE_GRAPHICS 24 +#define SETUP_MODE_CHOOSE_SOUNDS 25 +#define SETUP_MODE_CHOOSE_MUSIC 26 +#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE 27 +#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 28 +#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 29 +#define SETUP_MODE_CHOOSE_TOUCH_CONTROL 30 +#define SETUP_MODE_CHOOSE_MOVE_DISTANCE 31 +#define SETUP_MODE_CHOOSE_DROP_DISTANCE 32 +#define SETUP_MODE_CHOOSE_TRANSPARENCY 33 +#define SETUP_MODE_CHOOSE_GRID_XSIZE_0 34 +#define SETUP_MODE_CHOOSE_GRID_YSIZE_0 35 +#define SETUP_MODE_CHOOSE_GRID_XSIZE_1 36 +#define SETUP_MODE_CHOOSE_GRID_YSIZE_1 37 +#define SETUP_MODE_CONFIG_VIRT_BUTTONS 38 + +#define MAX_SETUP_MODES 39 #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_ENGINES "Game Engines" #define STR_SETUP_EDITOR "Editor" #define STR_SETUP_GRAPHICS "Graphics" #define STR_SETUP_SOUND "Sound & Music" @@ -121,7 +123,11 @@ #define STR_SETUP_CHOOSE_GRID_XSIZE_1 "Horiz. Buttons" #define STR_SETUP_CHOOSE_GRID_YSIZE_1 "Vert. Buttons" -/* for input setup functions */ +// other screen text constants +#define STR_CHOOSE_TREE_EDIT "Edit" +#define MENU_CHOOSE_TREE_FONT(x) (FONT_TEXT_1 + (x)) + +// for input setup functions #define SETUPINPUT_SCREEN_POS_START 0 #define SETUPINPUT_SCREEN_POS_EMPTY1 3 #define SETUPINPUT_SCREEN_POS_EMPTY2 12 @@ -132,10 +138,11 @@ #define MAX_SETUP_TEXT_INPUT_LEN 28 -/* for various menu stuff */ +// for various menu stuff #define MENU_SCREEN_START_XPOS 1 #define MENU_SCREEN_START_YPOS 2 #define MENU_SCREEN_VALUE_XPOS (SCR_FIELDX - 3) +#define MENU_SCREEN_TEXT2_XPOS (SCR_FIELDX - 2) #define MENU_SCREEN_MAX_XPOS (SCR_FIELDX - 1) #define MENU_TITLE1_YPOS 8 #define MENU_TITLE2_YPOS 46 @@ -171,21 +178,29 @@ #define MAX_MENU_TEXT_LENGTH_BIG 13 #define MAX_MENU_TEXT_LENGTH_MEDIUM (MAX_MENU_TEXT_LENGTH_BIG * 2) -/* screen gadget 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_INSERT_SOLUTION 4 -#define SCREEN_CTRL_ID_PLAY_SOLUTION 5 -#define SCREEN_CTRL_ID_SCROLL_UP 6 -#define SCREEN_CTRL_ID_SCROLL_DOWN 7 -#define SCREEN_CTRL_ID_SCROLL_VERTICAL 8 -#define SCREEN_CTRL_ID_NETWORK_SERVER 9 - -#define NUM_SCREEN_GADGETS 10 - -#define NUM_SCREEN_MENUBUTTONS 6 +#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_SWITCH_ECS_AGA 9 +#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE 10 +#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE 11 +#define SCREEN_CTRL_ID_TOUCH_PREV_PAGE2 12 +#define SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2 13 +#define SCREEN_CTRL_ID_SCROLL_UP 14 +#define SCREEN_CTRL_ID_SCROLL_DOWN 15 +#define SCREEN_CTRL_ID_SCROLL_VERTICAL 16 +#define SCREEN_CTRL_ID_NETWORK_SERVER 17 + +#define NUM_SCREEN_GADGETS 18 + +#define NUM_SCREEN_MENUBUTTONS 14 #define NUM_SCREEN_SCROLLBUTTONS 2 #define NUM_SCREEN_SCROLLBARS 1 #define NUM_SCREEN_TEXTINPUT 1 @@ -193,8 +208,10 @@ #define SCREEN_MASK_MAIN (1 << 0) #define SCREEN_MASK_MAIN_HAS_SOLUTION (1 << 1) #define SCREEN_MASK_INPUT (1 << 2) +#define SCREEN_MASK_TOUCH (1 << 3) +#define SCREEN_MASK_TOUCH2 (1 << 4) -/* 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 @@ -221,7 +238,7 @@ #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); @@ -229,16 +246,19 @@ static void CustomizeKeyboard(int); static void ConfigureJoystick(int); static void ConfigureVirtualButtons(void); static void execSetupGame(void); +static void execSetupEngines(void); static void execSetupGraphics(void); static void execSetupSound(void); static void execSetupTouch(void); static void execSetupArtwork(void); static void HandleChooseTree(int, int, int, int, int, TreeInfo **); +static void DrawChoosePlayerName(void); static void DrawChooseLevelSet(void); static void DrawChooseLevelNr(void); static void DrawInfoScreen(void); static void DrawSetupScreen(void); +static void DrawTypeName(void); static void DrawInfoScreen_NotAvailable(char *, char *); static void DrawInfoScreen_HelpAnim(int, int, boolean); @@ -255,6 +275,7 @@ static void ModifyGameSpeedIfNeeded(void); static void DisableVsyncIfNeeded(void); static void MapScreenMenuGadgets(int); +static void UnmapScreenMenuGadgets(int); static void MapScreenGadgets(int); static void MapScreenTreeGadgets(TreeInfo *); @@ -312,6 +333,9 @@ 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 *player_name = NULL; +static TreeInfo *player_name_current = NULL; + static TreeInfo *level_number = NULL; static TreeInfo *level_number_current = NULL; @@ -520,12 +544,17 @@ static struct ValueTextInfo grid_sizes_list[] = { -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) + GAME_MODE_MAIN : \ + (s) == GAME_MODE_PSEUDO_TYPENAMES ? \ + GAME_MODE_NAMES : GAME_MODE_DEFAULT) -/* (there are no draw offset definitions needed for INFO_MODE_TITLE) */ +// (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) @@ -576,6 +605,9 @@ static struct ValueTextInfo grid_sizes_list[] = #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) @@ -584,7 +616,7 @@ static struct ValueTextInfo grid_sizes_list[] = 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) @@ -605,7 +637,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 @@ -660,6 +692,8 @@ static char *main_text_title_1 = NULL; static char *main_text_title_2 = NULL; static char *main_text_title_3 = NULL; +extern char debug_xsn_mode[]; + struct MainControlInfo { int nr; @@ -724,36 +758,33 @@ 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, - &menu.main.button.first_level, IMG_MENU_BUTTON_FIRST_LEVEL, + NULL, -1, &menu.main.text.first_level, &main_text_first_level, NULL, NULL, }, { MAIN_CONTROL_LAST_LEVEL, - &menu.main.button.last_level, IMG_MENU_BUTTON_LAST_LEVEL, + NULL, -1, &menu.main.text.last_level, &main_text_last_level, NULL, NULL, }, { MAIN_CONTROL_LEVEL_NUMBER, - &menu.main.button.level_number, IMG_MENU_BUTTON_LEVEL_NUMBER, + NULL, -1, &menu.main.text.level_number, &main_text_level_number, NULL, NULL, }, @@ -911,10 +942,10 @@ static int getTitleSound(struct TitleControlInfo *tci) int sound_local = base + nr; #if 0 - printf("::: %d, %d, %d: %d ['%s'], %d ['%s']\n", - nr, initial, is_image, - sound_global, getSoundListEntry(sound_global)->filename, - sound_local, getSoundListEntry(sound_local)->filename); + Debug("screens:getTitleSound", "%d, %d, %d: %d ['%s'], %d ['%s']", + nr, initial, is_image, + sound_global, getSoundListEntry(sound_global)->filename, + sound_local, getSoundListEntry(sound_local)->filename); #endif if (!strEqual(getSoundListEntry(sound_local)->filename, UNDEFINED_FILENAME)) @@ -941,10 +972,10 @@ static int getTitleMusic(struct TitleControlInfo *tci) int music_local = base + nr; #if 0 - printf("::: %d, %d, %d: %d ['%s'], %d ['%s']\n", - nr, initial, is_image, - music_global, getMusicListEntry(music_global)->filename, - music_local, getMusicListEntry(music_local)->filename); + Debug("screens:getTitleMusic", "%d, %d, %d: %d ['%s'], %d ['%s']", + nr, initial, is_image, + music_global, getMusicListEntry(music_global)->filename, + music_local, getMusicListEntry(music_local)->filename); #endif if (!strEqual(getMusicListEntry(music_local)->filename, UNDEFINED_FILENAME)) @@ -982,6 +1013,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; } @@ -1013,7 +1045,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++; } @@ -1047,18 +1079,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; } @@ -1077,7 +1109,7 @@ static void InitializeMainControls(void) 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, @@ -1096,7 +1128,7 @@ static void InitializeMainControls(void) 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]; @@ -1132,15 +1164,15 @@ static void InitializeMainControls(void) 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 text size -- needed for text alignment */ + // calculate text size -- needed for text alignment boolean calculate_text_size = (text != NULL); if (pos_text->width == -1 || calculate_text_size) @@ -1158,7 +1190,7 @@ static void InitializeMainControls(void) } } - 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)) { @@ -1240,7 +1272,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); @@ -1253,7 +1285,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); @@ -1308,10 +1340,11 @@ static boolean insideTextPosRect(struct TextPosInfo *rect, int x, int y) int rect_y = ALIGNED_TEXT_YPOS(rect); #if 0 - printf("::: insideTextPosRect: (%d, %d), (%d, %d) [%d, %d] (%d, %d) => %d\n", - x, y, rect_x, rect_y, rect->x, rect->y, rect->width, rect->height, - (x >= rect_x && x < rect_x + rect->width && - y >= rect_y && y < rect_y + rect->height)); + Debug("screens:insideTextPosRect", + "(%d, %d), (%d, %d) [%d, %d] (%d, %d) => %d", + x, y, rect_x, rect_y, rect->x, rect->y, rect->width, rect->height, + (x >= rect_x && x < rect_x + rect->width && + y >= rect_y && y < rect_y + rect->height)); #endif return (x >= rect_x && x < rect_x + rect->width && @@ -1352,11 +1385,11 @@ 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); } @@ -1364,8 +1397,8 @@ static void clearMenuListArea(void) 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) { @@ -1402,6 +1435,40 @@ static void drawChooseTreeCursor(int ypos, boolean active) drawCursorExt(0, ypos, active, -1); } +static int getChooseTreeEditFont(boolean active) +{ + return (active ? FONT_MENU_2_ACTIVE : FONT_MENU_2); +} + +static int getChooseTreeEditXPos(int pos) +{ + boolean has_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->mapped; + int xoffset = (has_scrollbar ? -1 : 0); + int xpos = MENU_SCREEN_TEXT2_XPOS + xoffset; + int sx = amSX + xpos * TILEX; + int font_nr = getChooseTreeEditFont(FALSE); + int width = getTextWidth(STR_CHOOSE_TREE_EDIT, font_nr); + + return (pos == POS_RIGHT ? sx + width - 1 : sx); +} + +static int getChooseTreeEditYPos(int ypos_raw) +{ + int ypos = MENU_SCREEN_START_YPOS + ypos_raw; + int sy = amSY + ypos * TILEY; + + return sy; +} + +static void drawChooseTreeEdit(int ypos_raw, boolean active) +{ + int sx = getChooseTreeEditXPos(POS_LEFT); + int sy = getChooseTreeEditYPos(ypos_raw); + int font_nr = getChooseTreeEditFont(active); + + DrawText(sx, sy, STR_CHOOSE_TREE_EDIT, font_nr); +} + static void DrawHeadline(void) { DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, main_text_title_1); @@ -1423,19 +1490,19 @@ static 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; @@ -1460,34 +1527,34 @@ static 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); @@ -1515,13 +1582,13 @@ 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); @@ -1537,7 +1604,7 @@ void DrawMainMenu(void) 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(); @@ -1550,7 +1617,7 @@ void DrawMainMenu(void) 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); @@ -1562,23 +1629,19 @@ void DrawMainMenu(void) return; } - /* 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)) @@ -1593,17 +1656,17 @@ void DrawMainMenu(void) 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; @@ -1640,20 +1703,20 @@ void DrawMainMenu(void) PlayMenuSoundsAndMusic(); - /* create gadgets for main menu screen */ + // create gadgets for main menu screen FreeScreenGadgets(); CreateScreenGadgets(); - /* may be required if audio buttons shown on tape and changed in setup menu */ + // may be required if audio buttons shown on tape and changed in setup menu FreeGameButtons(); CreateGameButtons(); - /* map gadgets for main menu screen */ + // 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); @@ -1664,7 +1727,7 @@ void DrawMainMenu(void) FadeIn(fade_mask); FadeSetEnterMenu(); - /* update screen area with special editor door */ + // update screen area with special editor door redraw_mask |= REDRAW_ALL; BackToFront(); @@ -1675,23 +1738,18 @@ void DrawMainMenu(void) 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 leveldir_pos = getPosFromTreeInfo(leveldir_current); + 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; @@ -1703,6 +1761,25 @@ static void gotoTopLevelDir(void) } } +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; @@ -1727,7 +1804,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); } @@ -1735,26 +1812,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) @@ -1777,12 +1854,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) @@ -1840,7 +1917,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 { @@ -1854,7 +1931,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) @@ -1865,7 +1942,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); @@ -1892,7 +1969,7 @@ static void HandleMainMenu_SelectLevel(int step, int direction, if (setup.handicap && new_level_nr > leveldir_current->handicap_level) { - /* skipping levels is only allowed when trying to skip single level */ + // 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)) { @@ -1905,7 +1982,7 @@ static void HandleMainMenu_SelectLevel(int step, int direction, 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); @@ -1926,9 +2003,8 @@ static void HandleMainMenu_SelectLevel(int step, int direction, UpdateScreenMenuGadgets(SCREEN_MASK_MAIN_HAS_SOLUTION, hasSolutionTape()); - /* needed because DrawPreviewLevelInitial() takes some time */ - BackToFront(); - /* SyncDisplay(); */ + // force redraw of playfield area (may be reset at this point) + redraw_mask |= REDRAW_FIELD; } } @@ -1938,7 +2014,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) { @@ -1947,7 +2023,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; @@ -1963,7 +2039,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; @@ -1984,7 +2060,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)) @@ -2035,9 +2111,34 @@ 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 + { + if (setup.multiple_users) + { + CloseDoor(DOOR_CLOSE_2); - HandleTypeName(strlen(setup.player_name), 0); + SetGameStatus(GAME_MODE_NAMES); + + DrawChoosePlayerName(); + } + else + { + SetGameStatus(GAME_MODE_PSEUDO_TYPENAME); + + DrawTypeName(); + } + } } else if (pos == MAIN_CONTROL_LEVELS) { @@ -2067,10 +2168,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) else if (pos == MAIN_CONTROL_EDITOR) { if (leveldir_current->readonly && - !strEqual(setup.player_name, "Artsoft")) - Request("This level is read only!", REQ_CONFIRM); + setup.editor.show_read_only_warning) + Request("This level is read-only!", REQ_CONFIRM | REQ_STAY_OPEN); - CloseDoor(DOOR_CLOSE_2); + CloseDoor(DOOR_CLOSE_ALL); SetGameStatus(GAME_MODE_EDITOR); @@ -2117,13 +2218,13 @@ 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(void) { @@ -2273,7 +2374,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) || @@ -2324,7 +2425,7 @@ static void DrawInfoScreen_Main(void) if (redraw_mask & REDRAW_ALL) fade_mask = REDRAW_ALL; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; UnmapAllGadgets(); @@ -2333,14 +2434,14 @@ static void DrawInfoScreen_Main(void) 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); @@ -2383,11 +2484,14 @@ static void HandleMenuScreen(int mx, int my, int dx, int dy, int button, 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]; static int first_entry_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES]; + boolean has_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->mapped; + int mx_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x; + int mx_right_border = (has_scrollbar ? mx_scrollbar : SX + SXSIZE); int *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; @@ -2410,7 +2514,7 @@ static 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++; @@ -2458,28 +2562,28 @@ static 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) { @@ -2490,7 +2594,7 @@ static 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) @@ -2500,7 +2604,7 @@ static 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) @@ -2563,7 +2667,7 @@ static void HandleMenuScreen(int mx, int my, int dx, int dy, int button, 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) @@ -2604,7 +2708,7 @@ static void HandleMenuScreen(int mx, int my, int dx, int dy, int button, if (!anyScrollbarGadgetActive() && IN_VIS_MENU(x, y) && - mx < screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x && + mx < mx_right_border && y >= 0 && y < num_page_entries) { if (button) @@ -2633,7 +2737,7 @@ static 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; } } @@ -2645,17 +2749,17 @@ static 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 */ + // 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--; @@ -2884,22 +2988,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, @@ -3601,12 +3705,8 @@ static void DrawInfoScreen_Version(void) 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); @@ -3640,7 +3740,9 @@ static void DrawInfoScreen_Version(void) } DrawTextF(xstart1, ystart, font_head, "Platform"); - DrawTextF(xstart2, ystart, font_text, PLATFORM_STRING); + DrawTextF(xstart2, ystart, font_text, "%s (%s)", + PLATFORM_STRING, + PLATFORM_XX_BIT_STRING); ystart += ystep_line; DrawTextF(xstart1, ystart, font_head, "Target"); @@ -3649,6 +3751,10 @@ static void DrawInfoScreen_Version(void) DrawTextF(xstart1, ystart, font_head, "Source date"); DrawTextF(xstart2, ystart, font_text, getSourceDateString()); + ystart += ystep_line; + + DrawTextF(xstart1, ystart, font_head, "Commit hash"); + DrawTextF(xstart2, ystart, font_text, getSourceHashString()); ystart += ystep_para; DrawTextF(xstart1, ystart, font_head, "Library"); @@ -3657,12 +3763,8 @@ static void DrawInfoScreen_Version(void) 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", @@ -3722,24 +3824,26 @@ static void DrawInfoScreen_Version(void) 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 + driver_name = + getStringCopyNStatic(SDLGetRendererName(), driver_name_len); + + DrawTextF(xstart1, ystart, font_text, "Render Driver"); + DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_renderdriver); + DrawTextF(xstart3, ystart, font_text, "%s", driver_name); + ystart += ystep_line; + + driver_name = + getStringCopyNStatic(SDL_GetCurrentVideoDriver(), driver_name_len); - DrawTextF(xstart1, ystart, font_text, "SDL_VideoDriver"); + DrawTextF(xstart1, ystart, font_text, "Video Driver"); 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 + driver_name = + getStringCopyNStatic(SDL_GetCurrentAudioDriver(), driver_name_len); - DrawTextF(xstart1, ystart, font_text, "SDL_AudioDriver"); + DrawTextF(xstart1, ystart, font_text, "Audio Driver"); DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_audiodriver); DrawTextF(xstart3, ystart, font_text, "%s", driver_name); @@ -3799,29 +3903,29 @@ static void DrawInfoScreen_LevelSet(void) 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 @@ -3909,94 +4013,340 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button) } -/* ========================================================================= */ -/* type name functions */ -/* ========================================================================= */ +// ============================================================================ +// type name functions +// ============================================================================ + +static TreeInfo *type_name_node = NULL; +static char type_name_last[MAX_PLAYER_NAME_LEN + 1] = { 0 }; +static int type_name_nr = 0; + +static int getPlayerNameColor(char *name) +{ + return (strEqual(name, EMPTY_PLAYER_NAME) ? FC_BLUE : FC_RED); +} -void HandleTypeName(int newxpos, Key key) +static void drawTypeNameText(char *name, struct TextPosInfo *pos, + boolean active) +{ + char text[MAX_PLAYER_NAME_LEN + 2] = { 0 }; + boolean multiple_users = (game_status == GAME_MODE_PSEUDO_TYPENAMES); + int sx = (multiple_users ? amSX + pos->x : mSX + ALIGNED_TEXT_XPOS(pos)); + int sy = (multiple_users ? amSY + pos->y : mSY + ALIGNED_TEXT_YPOS(pos)); + int font_nr = (active ? FONT_ACTIVE(pos->font) : pos->font); + int font_width = getFontWidth(font_nr); + + DrawBackgroundForFont(sx, sy, pos->width, pos->height, font_nr); + + sprintf(text, "%s%c", name, (active ? '_' : '\0')); + + pos->width = strlen(text) * font_width; + sx = (multiple_users ? amSX + pos->x : mSX + ALIGNED_TEXT_XPOS(pos)); + + DrawText(sx, sy, text, font_nr); +} + +static void getTypeNameValues(char *name, struct TextPosInfo *pos, int *xpos) { - static char last_player_name[MAX_PLAYER_NAME_LEN + 1]; struct MainControlInfo *mci = getMainControlInfo(MAIN_CONTROL_NAME); - struct TextPosInfo *pos = mci->pos_input; - int startx = mSX + ALIGNED_TEXT_XPOS(pos); - int starty = mSY + ALIGNED_TEXT_YPOS(pos); - static int xpos = 0; - int font_nr = pos->font; - int font_active_nr = FONT_ACTIVE(font_nr); - int font_width = getFontWidth(font_active_nr); - char key_char = getValidConfigValueChar(getCharFromKey(key)); - boolean is_valid_key_char = (key_char != 0 && (key_char != ' ' || xpos > 0)); - boolean is_active = TRUE; - DrawBackgroundForFont(startx,starty, pos->width, pos->height, font_active_nr); + *pos = *mci->pos_input; - if (newxpos) + if (game_status == GAME_MODE_PSEUDO_TYPENAMES) { - strcpy(last_player_name, setup.player_name); + TreeInfo *ti = player_name_current; + int first_entry = ti->cl_first; + int entry_pos = first_entry + ti->cl_cursor; + TreeInfo *node_first = getTreeInfoFirstGroupEntry(ti); + int xpos = MENU_SCREEN_START_XPOS; + int ypos = MENU_SCREEN_START_YPOS + ti->cl_cursor; - xpos = newxpos; + type_name_node = getTreeInfoFromPos(node_first, entry_pos); + type_name_nr = entry_pos; - StartTextInput(startx, starty, pos->width, pos->height); + strcpy(name, type_name_node->name); + + pos->x = xpos * 32; + pos->y = ypos * 32; + pos->width = MAX_PLAYER_NAME_LEN * 32; } - else if (is_valid_key_char && xpos < MAX_PLAYER_NAME_LEN) + else { - setup.player_name[xpos] = key_char; - setup.player_name[xpos + 1] = 0; + type_name_nr = user.nr; - xpos++; + strcpy(name, setup.player_name); } - else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0) + + strcpy(type_name_last, name); + + if (strEqual(name, EMPTY_PLAYER_NAME)) + strcpy(name, ""); + + *xpos = strlen(name); +} + +static void setTypeNameValues_Name(char *name, struct TextPosInfo *pos) +{ + // change name of edited user in global list of user names + setString(&global.user_names[type_name_nr], name); + + if (game_status == GAME_MODE_PSEUDO_TYPENAMES) { - xpos--; + TreeInfo *node = type_name_node; - setup.player_name[xpos] = 0; + // change name of edited user in local menu tree structure + setString(&node->name, name); + setString(&node->name_sorting, name); + + node->color = getPlayerNameColor(name); + pos->font = MENU_CHOOSE_TREE_FONT(node->color); } - else if (key == KSYM_Return && xpos > 0) +} + +static void setTypeNameValues(char *name, struct TextPosInfo *pos, + boolean changed) +{ + boolean reset_setup = strEqual(name, ""); + boolean remove_user = strEqual(name, EMPTY_PLAYER_NAME); + boolean create_user = strEqual(type_name_last, EMPTY_PLAYER_NAME); + + if (!changed) + strcpy(name, type_name_last); + + if (strEqual(name, "")) + strcpy(name, EMPTY_PLAYER_NAME); + + setTypeNameValues_Name(name, pos); + + // if player name not changed, no further action required + if (strEqual(name, type_name_last)) + return; + + // redraw player name before (possibly) opening request dialogs + drawTypeNameText(name, pos, FALSE); + + int last_user_nr = user.nr; + + if (game_status == GAME_MODE_PSEUDO_TYPENAMES) { + // save setup of currently active user (may differ from edited user) SaveSetup(); - is_active = FALSE; + // temporarily change active user to edited user + user.nr = type_name_nr; - SetGameStatus(GAME_MODE_MAIN); + // load setup of edited user (unless creating user with current setup) + if (!create_user || + !Request("Use current setup values for the new player?", REQ_ASK)) + LoadSetup(); } - else if (key == KSYM_Escape) + + char *setup_filename = getSetupFilename(); + boolean setup_exists = fileExists(setup_filename); + + // change name of edited user in setup structure + strcpy(setup.player_name, name); + + // save setup of edited user + SaveSetup(); + + if (game_status == GAME_MODE_PSEUDO_TYPENAMES || reset_setup) { - strcpy(setup.player_name, last_player_name); + if (reset_setup) + { + if (Request("Reset setup values for this player?", REQ_ASK)) + { + // remove setup config file + unlink(setup_filename); - is_active = FALSE; + // set player name to default player name + LoadSetup(); - SetGameStatus(GAME_MODE_MAIN); + // update player name used by name typing functions + strcpy(name, setup.player_name); + + setTypeNameValues_Name(name, pos); + } + } + else if (remove_user && type_name_nr != 0) + { + if (Request("Remove settings and tapes for deleted player?", REQ_ASK)) + { + char *user_dir = getUserGameDataDir(); + char *user_dir_removed = + getStringCat3WithSeparator(user_dir, "REMOVED", + getCurrentTimestamp(), "."); + + if (rename(user_dir, user_dir_removed) != 0) + Request("Removing settings and tapes failed!", REQ_CONFIRM); + + checked_free(user_dir_removed); + } + } + else if (create_user && type_name_nr != 0 && !setup_exists) + { + if (Request("Create empty level set for the new player?", REQ_ASK)) + { + char *levelset_subdir = getNewUserLevelSubdir(); + + if (CreateUserLevelSet(levelset_subdir, name, name, 100, FALSE)) + { + AddUserLevelSetToLevelInfo(levelset_subdir); + + LevelDirTree *leveldir_current_last = leveldir_current; + + leveldir_current = getTreeInfoFromIdentifier(leveldir_first, + levelset_subdir); + + // set level number of newly created level set to default value + LoadLevelSetup_SeriesInfo(); + + // set newly created level set as current level set for new user + SaveLevelSetup_LastSeries(); + SaveLevelSetup_SeriesInfo(); + + leveldir_current = leveldir_current_last; + } + else + { + Request("Creating new level set failed!", REQ_CONFIRM); + } + } + } + + // restore currently active user + user.nr = last_user_nr; + + // restore setup of currently active user + LoadSetup(); + + // restore last level set of currently active user + LoadLevelSetup_LastSeries(); + LoadLevelSetup_SeriesInfo(); } +} - if (is_active) +static void HandleTypeNameExt(boolean initialize, Key key) +{ + static struct TextPosInfo pos_name = { 0 }; + static char name[MAX_PLAYER_NAME_LEN + 1] = { 0 }; + static int xpos = 0; + struct TextPosInfo *pos = &pos_name; + char key_char = getValidConfigValueChar(getCharFromKey(key)); + boolean is_valid_key_char = (key_char != 0 && (key_char != ' ' || xpos > 0)); + boolean active = TRUE; + + if (initialize) { - pos->width = (strlen(setup.player_name) + 1) * font_width; - startx = mSX + ALIGNED_TEXT_XPOS(pos); + getTypeNameValues(name, pos, &xpos); + + int sx = mSX + ALIGNED_TEXT_XPOS(pos); + int sy = mSY + ALIGNED_TEXT_YPOS(pos); - DrawText(startx, starty, setup.player_name, font_active_nr); - DrawText(startx + xpos * font_width, starty, "_", font_active_nr); + StartTextInput(sx, sy, pos->width, pos->height); } - else + else if (is_valid_key_char && xpos < MAX_PLAYER_NAME_LEN) { - pos->width = strlen(setup.player_name) * font_width; - startx = mSX + ALIGNED_TEXT_XPOS(pos); + name[xpos] = key_char; + name[xpos + 1] = 0; - DrawText(startx, starty, setup.player_name, font_nr); + xpos++; + } + else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0) + { + xpos--; + + name[xpos] = 0; + } + else if (key == KSYM_Return || key == KSYM_Escape) + { + boolean changed = (key == KSYM_Return); StopTextInput(); + + setTypeNameValues(name, pos, changed); + + active = FALSE; + } + + drawTypeNameText(name, pos, active); + + if (!active) + { + SetGameStatus(game_status_last_screen); + + if (game_status == GAME_MODE_MAIN) + InitializeMainControls(); } } +static void DrawTypeName(void) +{ + HandleTypeNameExt(TRUE, 0); +} + +void HandleTypeName(Key key) +{ + HandleTypeNameExt(FALSE, key); +} + + +// ============================================================================ +// 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 font_nr = MENU_CHOOSE_TREE_FONT(FC_RED); + int text_width = max_text_size * getFontWidth(font_nr); + 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_nr = MENU_CHOOSE_TREE_FONT(FC_RED); + int font_height = getFontHeight(font_nr); + 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); -/* ========================================================================= */ -/* tree menu functions */ -/* ========================================================================= */ + 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)) @@ -4015,10 +4365,12 @@ 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) + if (game_status == GAME_MODE_NAMES) + SetMainBackgroundImage(IMG_BACKGROUND_NAMES); + else if (game_status == GAME_MODE_LEVELNR) SetMainBackgroundImage(IMG_BACKGROUND_LEVELNR); else if (game_status == GAME_MODE_LEVELS) SetMainBackgroundImage(IMG_BACKGROUND_LEVELS); @@ -4027,8 +4379,8 @@ static void DrawChooseTree(TreeInfo **ti_ptr) OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); - HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr); MapScreenTreeGadgets(*ti_ptr); + HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr); DrawMaskedBorder(fade_mask); @@ -4038,6 +4390,10 @@ 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 i; char *title_string = NULL; int yoffset_sets = MENU_TITLE1_YPOS; @@ -4055,25 +4411,26 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, { TreeInfo *node, *node_first; int entry_pos = first_entry + i; + + node_first = getTreeInfoFirstGroupEntry(ti); + node = getTreeInfoFromPos(node_first, entry_pos); + + int font_nr = MENU_CHOOSE_TREE_FONT(node->color); + int font_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset; 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); - node = getTreeInfoFromPos(node_first, entry_pos); - strncpy(buffer, node->name, max_buffer_len); buffer[max_buffer_len] = '\0'; - DrawText(startx, starty, buffer, font_nr + node->color); + DrawText(startx, starty, buffer, font_nr); if (node->parent_link) initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU); @@ -4081,6 +4438,9 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); else initCursor(i, IMG_MENU_BUTTON); + + if (game_status == GAME_MODE_NAMES) + drawChooseTreeEdit(i, FALSE); } redraw_mask |= REDRAW_FIELD; @@ -4115,7 +4475,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); @@ -4125,26 +4485,29 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, TreeInfo **ti_ptr) { TreeInfo *ti = *ti_ptr; + boolean has_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->mapped; + int mx_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x; + int mx_right_border = (has_scrollbar ? mx_scrollbar : SX + SXSIZE); + int sx1_edit_name = getChooseTreeEditXPos(POS_LEFT); + int sx2_edit_name = getChooseTreeEditXPos(POS_RIGHT); int x = 0; 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); + int entry_pos = getPosFromTreeInfo(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; } @@ -4152,7 +4515,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; } @@ -4224,21 +4587,24 @@ 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; + + if (game_status == GAME_MODE_NAMES) + drawChooseTreeEdit(ti->cl_cursor, FALSE); } - 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) { @@ -4249,7 +4615,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) @@ -4259,7 +4625,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) @@ -4281,7 +4647,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; } @@ -4321,11 +4687,17 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, if (!anyScrollbarGadgetActive() && IN_VIS_MENU(x, y) && - mx < screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x && + mx < mx_right_border && y >= 0 && y < num_page_entries) { if (button) { + if (game_status == GAME_MODE_NAMES) + { + if (mx >= sx1_edit_name && mx <= sx2_edit_name) + drawChooseTreeEdit(y, TRUE); + } + if (y != ti->cl_cursor) { PlaySound(SND_MENU_ITEM_ACTIVATING); @@ -4445,14 +4817,101 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, HandleMainMenu_SelectLevel(0, 0, new_level_nr); } + else if (game_status == GAME_MODE_NAMES) + { + if (mx >= sx1_edit_name && mx <= sx2_edit_name) + { + SetGameStatus(GAME_MODE_PSEUDO_TYPENAMES); + + DrawTypeName(); + + return; + } + + // change active user to selected user + user.nr = entry_pos; + + // save number of new active user + SaveUserSetup(); + + // load setup of new active user + LoadSetup(); + + // load last level set of new active user + LoadLevelSetup_LastSeries(); + LoadLevelSetup_SeriesInfo(); + + TapeErase(); + + ToggleFullscreenIfNeeded(); + ChangeWindowScalingIfNeeded(); + + ChangeCurrentArtworkIfNeeded(ARTWORK_TYPE_GRAPHICS); + ChangeCurrentArtworkIfNeeded(ARTWORK_TYPE_SOUNDS); + ChangeCurrentArtworkIfNeeded(ARTWORK_TYPE_MUSIC); + } SetGameStatus(GAME_MODE_MAIN); - DrawMainMenu(); - } - } - } - } + DrawMainMenu(); + } + } + } + } +} + +void DrawChoosePlayerName(void) +{ + int i; + + FadeMenuSoundsAndMusic(); + + if (player_name != NULL) + { + freeTreeInfo(player_name); + + player_name = NULL; + } + + for (i = 0; i < MAX_PLAYER_NAMES; i++) + { + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_PLAYER_NAME); + char identifier[32], name[MAX_PLAYER_NAME_LEN + 1]; + int value = i; + + ti->node_top = &player_name; + ti->sort_priority = 10000 + value; + ti->color = getPlayerNameColor(global.user_names[i]); + + snprintf(identifier, sizeof(identifier), "%d", value); + snprintf(name, sizeof(name), "%s", global.user_names[i]); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + + pushTreeInfo(&player_name, ti); + } + + // sort player entries by player number + sortTreeInfo(&player_name); + + // set current player entry to selected player entry + player_name_current = + getTreeInfoFromIdentifier(player_name, i_to_a(user.nr)); + + // if that fails, set current player name to first available name + if (player_name_current == NULL) + player_name_current = player_name; + + DrawChooseTree(&player_name_current); + + PlayMenuSoundsAndMusic(); +} + +void HandleChoosePlayerName(int mx, int my, int dx, int dy, int button) +{ + HandleChooseTree(mx, my, dx, dy, button, &player_name_current); } void DrawChooseLevelSet(void) @@ -4485,10 +4944,10 @@ void DrawChooseLevelNr(void) 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; @@ -4508,14 +4967,14 @@ void DrawChooseLevelNr(void) 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; @@ -4533,16 +4992,16 @@ 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); @@ -4555,7 +5014,7 @@ void DrawHallOfFame(int level_nr, int highlight_position) FadeOut(fade_mask); - /* needed if different viewport properties defined for scores */ + // needed if different viewport properties defined for scores ChangeViewportPropertiesIfNeeded(); PlayMenuSoundsAndMusic(); @@ -4621,15 +5080,21 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) if (button == MB_MENU_INITIALIZE) { level_nr = mx; - first_entry = 0; highlight_position = my; + first_entry = highlight_position - (NUM_MENU_ENTRIES_ON_SCREEN + 1) / 2 + 1; + + if (first_entry < 0) + first_entry = 0; + else if (first_entry + NUM_MENU_ENTRIES_ON_SCREEN > MAX_SCORE_ENTRIES) + first_entry = MAX(0, MAX_SCORE_ENTRIES - NUM_MENU_ENTRIES_ON_SCREEN); + 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) @@ -4660,7 +5125,8 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) FadeSound(SND_BACKGROUND_SCORES); - if (game_status_last_screen == GAME_MODE_PLAYING && + 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) @@ -4680,13 +5146,13 @@ 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; @@ -4753,7 +5219,7 @@ static void execSetupGame_setGameSpeeds(boolean update_value) 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); update_value = TRUE; @@ -4761,16 +5227,16 @@ static void execSetupGame_setGameSpeeds(boolean update_value) if (update_value) { - /* set current game speed to configured game speed 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; @@ -4782,7 +5248,7 @@ static void execSetupGame_setGameSpeeds(boolean update_value) 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; } @@ -4813,26 +5279,26 @@ static void execSetupGame_setScrollDelays(void) 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; } @@ -4863,26 +5329,26 @@ static void execSetupGame_setSnapshotModes(void) 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; } @@ -4899,7 +5365,7 @@ static void execSetupGame_setNetworkServerText(void) network_server_hostname[MAX_SETUP_TEXT_INPUT_LEN] = '\0'; } - /* needed for displaying network server text instead of identifier */ + // needed for displaying network server text instead of identifier network_server_text = network_server_hostname; } @@ -4943,6 +5409,13 @@ static void execSetupChooseSnapshotMode(void) DrawSetupScreen(); } +static void execSetupEngines(void) +{ + setup_mode = SETUP_MODE_ENGINES; + + DrawSetupScreen(); +} + static void execSetupEditor(void) { setup_mode = SETUP_MODE_EDITOR; @@ -5010,28 +5483,28 @@ 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; } @@ -5062,26 +5535,26 @@ static void execSetupGraphics_setScalingTypes(void) 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; } @@ -5112,27 +5585,27 @@ static void execSetupGraphics_setRenderingModes(void) 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; } @@ -5163,7 +5636,7 @@ static void execSetupGraphics_setVsyncModes(boolean update_value) pushTreeInfo(&vsync_modes, ti); } - /* sort vsync mode values to start with lowest vsync mode value */ + // sort vsync mode values to start with lowest vsync mode value sortTreeInfo(&vsync_modes); update_value = TRUE; @@ -5171,23 +5644,23 @@ static void execSetupGraphics_setVsyncModes(boolean update_value) if (update_value) { - /* set current vsync mode value to configured vsync mode 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 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 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 */ + // needed for displaying vsync mode text instead of identifier vsync_mode_text = vsync_mode_current->name; } @@ -5200,13 +5673,21 @@ static void execSetupGraphics(void) if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE) execSetupGraphics_setWindowSizes(FALSE); + // update "setup.vsync_mode" from list selection + // (in this case, vsync mode was changed on setup screen) + if (setup_mode == SETUP_MODE_CHOOSE_VSYNC) + execSetupGraphics_setVsyncModes(FALSE); + // update list selection from "setup.window_scaling_percent" // (window scaling may have changed by resizing the window) execSetupGraphics_setWindowSizes(TRUE); + // update list selection from "setup.vsync_mode" + // (vsync_mode may have changed by re-creating the renderer) + execSetupGraphics_setVsyncModes(TRUE); + execSetupGraphics_setScalingTypes(); execSetupGraphics_setRenderingModes(); - execSetupGraphics_setVsyncModes(FALSE); setup_mode = SETUP_MODE_GRAPHICS; @@ -5216,9 +5697,8 @@ static void execSetupGraphics(void) if (check_game_speed) ModifyGameSpeedIfNeeded(); -#if defined(TARGET_SDL2) // window scaling may have changed at this point - ToggleFullscreenOrChangeWindowScalingIfNeeded(); + ChangeWindowScalingIfNeeded(); // window scaling quality may have changed at this point if (!strEqual(setup.window_scaling_quality, video.window_scaling_quality)) @@ -5227,9 +5707,23 @@ static void execSetupGraphics(void) // screen rendering mode may have changed at this point SDLSetScreenRenderingMode(setup.screen_rendering_mode); + int setup_vsync_mode = VSYNC_MODE_STR_TO_INT(setup.vsync_mode); + int video_vsync_mode = video.vsync_mode; + // screen vsync mode may have changed at this point - SDLSetScreenVsyncMode(setup.vsync_mode); -#endif + ChangeVsyncModeIfNeeded(); + + // check if setting vsync mode to selected value failed + if (setup_vsync_mode != video_vsync_mode && + setup_vsync_mode != video.vsync_mode) + { + // changing vsync mode to selected value failed -- reset displayed value + execSetupGraphics_setVsyncModes(TRUE); + + Request("Setting VSync failed!", REQ_CONFIRM); + + DrawSetupScreen(); + } } static void execSetupChooseWindowSize(void) @@ -5334,19 +5828,19 @@ static void execSetupSound(void) 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; } @@ -5402,19 +5896,19 @@ static void execSetupSound(void) 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; } @@ -5470,19 +5964,19 @@ static void execSetupSound(void) 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; } @@ -5491,7 +5985,7 @@ static void execSetupSound(void) 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; @@ -5595,19 +6089,19 @@ static void execSetupTouch(void) 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; } @@ -5635,21 +6129,21 @@ static void execSetupTouch(void) 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(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; } @@ -5677,21 +6171,21 @@ static void execSetupTouch(void) 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(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; } @@ -5719,21 +6213,21 @@ static void execSetupTouch(void) pushTreeInfo(&transparencies, ti); } - /* sort transparency values to start with lowest transparency value */ + // sort transparency values to start with lowest transparency value sortTreeInfo(&transparencies); - /* set current transparency value to configured transparency value */ + // 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 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 that also fails, set current transparency to first available value if (transparency_current == NULL) transparency_current = transparencies; } @@ -5772,17 +6266,17 @@ static void execSetupTouch(void) pushTreeInfo(&grid_sizes[i][j], ti); } - /* sort grid size values to start with lowest grid size value */ + // 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 */ + // 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 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], @@ -5790,7 +6284,7 @@ static void execSetupTouch(void) DEFAULT_GRID_XSIZE(i) : DEFAULT_GRID_YSIZE(i))); - /* if that also fails, set current grid size to first available value */ + // 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]; } @@ -5814,7 +6308,7 @@ static void execSetupTouch(void) } } - /* needed for displaying value 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; @@ -5832,20 +6326,20 @@ static void execSetupTouch(void) static void execSetupArtwork(void) { #if 0 - printf("::: '%s', '%s', '%s'\n", - artwork.gfx_current->subdir, - artwork.gfx_current->fullpath, - artwork.gfx_current->basepath); + Debug("screens:execSetupArtwork", "'%s', '%s', '%s'", + artwork.gfx_current->subdir, + artwork.gfx_current->fullpath, + artwork.gfx_current->basepath); #endif setup.graphics_set = artwork.gfx_current->identifier; 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; @@ -5994,7 +6488,7 @@ static void ToggleGameSpeedsListIfNeeded(void) if (setup.game_speed_extended == using_game_speeds_extended) return; - /* try to match similar values when changing game speeds list */ + // 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 : @@ -6029,7 +6523,7 @@ static void ModifyGameSpeedIfNeeded(void) 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 */ + // set game speed to existing list value that is fast enough for vsync setup.game_frame_delay = game_speed_value; execSetupGame_setGameSpeeds(TRUE); @@ -6044,7 +6538,7 @@ static void DisableVsyncIfNeeded(void) setup.game_frame_delay <= MAX_VSYNC_FRAME_DELAY)) return; - /* disable vsync for the selected game speed to work */ + // disable vsync for the selected game speed to work setup.vsync_mode = STR_VSYNC_MODE_OFF; execSetupGraphics_setVsyncModes(TRUE); @@ -6121,6 +6615,18 @@ static struct { &setup.touch.grid_ysize[1], execSetupChooseGridYSize_1 }, { &setup.touch.grid_ysize[1], &grid_size_text[1][1] }, + { &setup.internal.menu_game, execSetupGame }, + { &setup.internal.menu_engines, execSetupEngines }, + { &setup.internal.menu_editor, execSetupEditor }, + { &setup.internal.menu_graphics, execSetupGraphics }, + { &setup.internal.menu_sound, execSetupSound }, + { &setup.internal.menu_artwork, execSetupArtwork }, + { &setup.internal.menu_input, execSetupInput }, + { &setup.internal.menu_touch, execSetupTouch }, + { &setup.internal.menu_shortcuts, execSetupShortcuts }, + { &setup.internal.menu_exit, execExitSetup }, + { &setup.internal.menu_save_and_exit, execSaveAndExitSetup }, + { NULL, NULL } }; @@ -6136,6 +6642,7 @@ void setHideRelatedSetupEntries(void) static struct TokenInfo setup_info_main[] = { { TYPE_ENTER_MENU, execSetupGame, STR_SETUP_GAME }, + { TYPE_ENTER_MENU, execSetupEngines, STR_SETUP_ENGINES }, { TYPE_ENTER_MENU, execSetupEditor, STR_SETUP_EDITOR }, { TYPE_ENTER_MENU, execSetupGraphics, STR_SETUP_GRAPHICS }, { TYPE_ENTER_MENU, execSetupSound, STR_SETUP_SOUND }, @@ -6157,6 +6664,7 @@ static struct TokenInfo setup_info_game[] = { TYPE_PLAYER, &setup.network_player_nr,"Preferred Network Player:" }, { TYPE_TEXT_INPUT, execGadgetNetworkServer, "Network Server Hostname:" }, { TYPE_STRING, &network_server_text, "" }, + { TYPE_SWITCH, &setup.multiple_users, "Multiple Users/Teams:" }, { TYPE_YES_NO, &setup.input_on_focus, "Only Move Focussed Player:" }, { TYPE_SWITCH, &setup.time_limit, "Time Limit:" }, { TYPE_SWITCH, &setup.handicap, "Handicap:" }, @@ -6182,6 +6690,22 @@ static struct TokenInfo setup_info_game[] = { 0, NULL, NULL } }; +static struct TokenInfo setup_info_engines[] = +{ + { TYPE_HEADLINE, NULL, "Emerald Mine" }, + { TYPE_SWITCH, &setup.forced_scroll_delay, "Scroll Delay:" }, + { TYPE_ECS_AGA, &setup.prefer_aga_graphics, "Amiga Graphics Chipset:" }, + { TYPE_SWITCH, &setup.prefer_lowpass_sounds,"Low-Pass Filter Sounds:" }, + { TYPE_SWITCH, &setup.prefer_extra_panel_items,"Show Dynamite and Keys:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_HEADLINE, NULL, "Supaplex" }, + { TYPE_SWITCH, &setup.sp_show_border_elements, "Border Elements:" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + + { 0, NULL, NULL } +}; + static struct TokenInfo setup_info_editor[] = { #if 0 @@ -6211,6 +6735,8 @@ static struct TokenInfo setup_info_editor[] = #endif { TYPE_SWITCH, &setup.editor.show_element_token, "Show element token:" }, { TYPE_EMPTY, NULL, "" }, + { TYPE_SWITCH, &setup.editor.show_read_only_warning, "Show read-only warning:" }, + { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Back" }, { 0, NULL, NULL } @@ -6218,7 +6744,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, "" }, @@ -6238,9 +6764,8 @@ static struct TokenInfo setup_info_graphics[] = { TYPE_SWITCH, &setup.quick_doors, "Quick Menu Doors:" }, { TYPE_SWITCH, &setup.show_titlescreen,"Show Title Screens:" }, { TYPE_SWITCH, &setup.toons, "Show Menu Animations:" }, - { TYPE_ECS_AGA, &setup.prefer_aga_graphics,"EMC graphics preference:" }, - { TYPE_SWITCH, &setup.sp_show_border_elements,"Supaplex Border Elements:" }, { TYPE_SWITCH, &setup.small_game_graphics, "Small Game Graphics:" }, + { TYPE_YES_NO_AUTO, &setup.debug.xsn_mode, debug_xsn_mode }, { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Back" }, @@ -6491,9 +7016,9 @@ static Key getSetupKey(void) { 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; } @@ -6611,6 +7136,10 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw) if (startx + font_xoffset < text_startx + text_width + text_font_xoffset) { + // when using narrow font, left-shifting text "auto" not needed + if (type & TYPE_YES_NO_AUTO) + xpos += 1; + xpos += 1; startx = mSX + xpos * 32; @@ -6618,13 +7147,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; @@ -6641,8 +7170,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; @@ -6727,7 +7256,7 @@ static void changeSetupValue(int screen_pos, int setup_info_pos_raw, int dx) // fullscreen state may have changed at this point if (si->value == &setup.fullscreen) - ToggleFullscreenOrChangeWindowScalingIfNeeded(); + ToggleFullscreenIfNeeded(); // network mode may have changed at this point if (si->value == &setup.network_mode) @@ -6745,21 +7274,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; @@ -6777,7 +7306,7 @@ static void DrawSetupScreen_Generic(void) char *title_string = NULL; int i; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; UnmapAllGadgets(); @@ -6791,7 +7320,7 @@ static void DrawSetupScreen_Generic(void) 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); @@ -6810,6 +7339,11 @@ static void DrawSetupScreen_Generic(void) setup_info = setup_info_game; title_string = STR_SETUP_GAME; } + else if (setup_mode == SETUP_MODE_ENGINES) + { + setup_info = setup_info_engines; + title_string = STR_SETUP_ENGINES; + } else if (setup_mode == SETUP_MODE_EDITOR) { setup_info = setup_info_editor; @@ -6871,7 +7405,7 @@ static void DrawSetupScreen_Generic(void) 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); @@ -6930,11 +7464,11 @@ static void DrawSetupScreen_Input(void) 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); @@ -7095,7 +7629,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--; @@ -7106,7 +7640,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; @@ -7125,12 +7659,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); @@ -7239,7 +7773,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(); @@ -7271,7 +7805,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(); @@ -7281,18 +7815,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); @@ -7300,13 +7834,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; @@ -7315,7 +7849,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, @@ -7339,7 +7873,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; @@ -7375,7 +7909,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 @@ -7383,7 +7917,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; @@ -7393,7 +7926,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) Event event; int alpha = 200, alpha_step = -1; int alpha_ticks = 0; - char mapping[4096], temp[4096]; + char mapping[4096], temp[256]; int font_name = MENU_SETUP_FONT_TITLE; int font_info = MENU_SETUP_FONT_TEXT; int spacing_name = menu.line_spacing_setup[SETUP_MODE_INPUT]; @@ -7455,24 +7988,24 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) name = getFormattedJoystickName(SDL_JoystickName(joystick)); #if DEBUG_JOYSTICKS - /* print info about the joystick we are watching */ - Error(ERR_DEBUG, "watching joystick %d: (%s)\n", + // print info about the joystick we are watching + Debug("joystick", "watching joystick %d: (%s)", SDL_JoystickInstanceID(joystick), name); - Error(ERR_DEBUG, "joystick has %d axes, %d hats, %d balls, and %d buttons\n", + Debug("joystick", "joystick has %d axes, %d hats, %d balls, and %d buttons", SDL_JoystickNumAxes(joystick), SDL_JoystickNumHats(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); @@ -7603,8 +8136,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; @@ -7649,7 +8182,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) case SDL_FINGERDOWN: case SDL_MOUSEBUTTONDOWN: - /* skip this step */ + // skip this step i++; next = TRUE; @@ -7661,14 +8194,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--; @@ -7681,7 +8214,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; @@ -7690,7 +8223,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) if (event.key.keysym.sym == KSYM_Escape) { - /* leave screen */ + // leave screen success = FALSE; done = TRUE; } @@ -7715,7 +8248,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) if (success) { #if DEBUG_JOYSTICKS - Error(ERR_DEBUG, "New game controller mapping:\n\n%s\n\n", mapping); + Debug("joystick", "New game controller mapping:\n\n%s\n\n", mapping); #endif // activate mapping for this game @@ -7725,13 +8258,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) @@ -7814,6 +8344,22 @@ void ConfigureJoystick(int player_nr) DrawSetupScreen_Input(); } +static void MapScreenMenuGadgets_OverlayTouchButtons(int y) +{ + if (y < video.screen_height / 3) + { + // remap touch gadgets to access upper part of the screen + UnmapScreenMenuGadgets(SCREEN_MASK_TOUCH); + MapScreenMenuGadgets(SCREEN_MASK_TOUCH2); + } + else if (y > 2 * video.screen_height / 3) + { + // remap touch gadgets to access lower part of the screen + MapScreenMenuGadgets(SCREEN_MASK_TOUCH); + UnmapScreenMenuGadgets(SCREEN_MASK_TOUCH2); + } +} + static boolean ConfigureVirtualButtonsMain(void) { static char *customize_step_text[] = @@ -7834,6 +8380,13 @@ static boolean ConfigureVirtualButtonsMain(void) CHAR_GRID_BUTTON_SNAP, CHAR_GRID_BUTTON_DROP }; + enum + { + ACTION_NONE, + ACTION_ESCAPE, + ACTION_BACK, + ACTION_NEXT + }; int font_nr = FONT_INPUT_1_ACTIVE; int font_height = getFontHeight(font_nr); int ypos1 = SYSIZE / 2 - font_height * 2; @@ -7854,6 +8407,8 @@ static boolean ConfigureVirtualButtonsMain(void) overlay.grid_button_highlight = grid_button[step_nr]; + UnmapAllGadgets(); + FadeSetEnterMenu(); FadeOut(REDRAW_FIELD); @@ -7867,86 +8422,45 @@ static boolean ConfigureVirtualButtonsMain(void) SetOverlayShowGrid(TRUE); + // map gadgets for setup touch buttons menu screen + MapScreenMenuGadgets(SCREEN_MASK_TOUCH); + while (!finished) { Event event; while (NextValidEvent(&event)) { + int action = ACTION_NONE; + + // ---------- handle events and set the resulting action ---------- + switch (event.type) { + case EVENT_USER: + { + UserEvent *user = (UserEvent *)&event; + int id = user->value1; + + action = (id == SCREEN_CTRL_ID_TOUCH_PREV_PAGE || + id == SCREEN_CTRL_ID_TOUCH_PREV_PAGE2 ? ACTION_BACK : + id == SCREEN_CTRL_ID_TOUCH_NEXT_PAGE || + id == SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2 ? ACTION_NEXT : + ACTION_NONE); + } + break; + case EVENT_KEYPRESS: { Key key = GetEventKey((KeyEvent *)&event, FALSE); - /* press 'Escape' to abort and keep the old key bindings */ - if (key == KSYM_Escape) - { - for (x = 0; x < MAX_GRID_XSIZE; x++) - for (y = 0; y < MAX_GRID_YSIZE; y++) - overlay.grid_button[x][y] = grid_button_old[x][y]; - - FadeSkipNextFadeIn(); - - finished = TRUE; - - break; - } - - /* press 'Enter' to keep the existing key binding */ - if (key == KSYM_Return || -#if defined(TARGET_SDL2) - key == KSYM_Menu || -#endif - key == KSYM_space) - { - step_nr++; - } - else if (key == KSYM_BackSpace -#if defined(TARGET_SDL2) - || - key == KSYM_Back -#endif - ) - { - if (step_nr == 0) - { - FadeSkipNextFadeIn(); - - finished = TRUE; - - break; - } - - step_nr--; - } - else - { - break; - } - - /* all virtual buttons configured */ - if (step_nr == 6) - { - finished = TRUE; - success = TRUE; - - break; - } - - for (x = 0; x < MAX_GRID_XSIZE; x++) - for (y = 0; y < MAX_GRID_YSIZE; y++) - grid_button_tmp[x][y] = overlay.grid_button[x][y]; - - overlay.grid_button_highlight = grid_button[step_nr]; - - /* query next virtual button */ - - ClearField(); - - DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Virtual Buttons"); - DrawTextSCentered(ypos1, font_nr, "Select tiles to"); - DrawTextSCentered(ypos2, font_nr, customize_step_text[step_nr]); + action = (key == KSYM_Escape ? ACTION_ESCAPE : + key == KSYM_BackSpace || + key == KSYM_Back ? ACTION_BACK : + key == KSYM_Return || + key == KSYM_Menu || + key == KSYM_space ? ACTION_NEXT : + ACTION_NONE); } break; @@ -7959,6 +8473,19 @@ static boolean ConfigureVirtualButtonsMain(void) { ButtonEvent *button = (ButtonEvent *)&event; + motion_status = FALSE; + + if (button->type == EVENT_BUTTONPRESS) + button_status = button->button; + else + button_status = MB_RELEASED; + + if (HandleGadgets(button->x, button->y, button_status)) + { + // do not handle this button event anymore + break; + } + button->x += video.screen_xoffset; button->y += video.screen_yoffset; @@ -7967,18 +8494,14 @@ static boolean ConfigureVirtualButtonsMain(void) if (button->type == EVENT_BUTTONPRESS) { - button_status = button->button; - grid_button_draw = (overlay.grid_button[x][y] != grid_button[step_nr] ? grid_button[step_nr] : CHAR_GRID_BUTTON_NONE); set_grid_button = TRUE; } - else - { - button_status = MB_RELEASED; - } + + MapScreenMenuGadgets_OverlayTouchButtons(button->y); } break; @@ -7986,6 +8509,14 @@ static boolean ConfigureVirtualButtonsMain(void) { MotionEvent *motion = (MotionEvent *)&event; + motion_status = TRUE; + + if (HandleGadgets(motion->x, motion->y, button_status)) + { + // do not handle this button event anymore + break; + } + motion->x += video.screen_xoffset; motion->y += video.screen_yoffset; @@ -7993,10 +8524,11 @@ static boolean ConfigureVirtualButtonsMain(void) y = motion->y * overlay.grid_ysize / video.screen_height; set_grid_button = TRUE; + + MapScreenMenuGadgets_OverlayTouchButtons(motion->y); } break; -#if defined(TARGET_SDL2) case SDL_WINDOWEVENT: HandleWindowEvent((WindowEvent *) &event); @@ -8019,13 +8551,70 @@ static boolean ConfigureVirtualButtonsMain(void) case SDL_APP_DIDENTERFOREGROUND: HandlePauseResumeEvent((PauseResumeEvent *) &event); break; -#endif default: HandleOtherEvents(&event); break; } + // ---------- perform action set by handling events ---------- + + if (action == ACTION_ESCAPE) + { + // abort and restore the old key bindings + + for (x = 0; x < MAX_GRID_XSIZE; x++) + for (y = 0; y < MAX_GRID_YSIZE; y++) + overlay.grid_button[x][y] = grid_button_old[x][y]; + + FadeSkipNextFadeIn(); + + finished = TRUE; + } + else if (action == ACTION_BACK) + { + // keep the configured key bindings and go to previous page + + step_nr--; + + if (step_nr < 0) + { + FadeSkipNextFadeIn(); + + finished = TRUE; + } + } + else if (action == ACTION_NEXT) + { + // keep the configured key bindings and go to next page + + step_nr++; + + // all virtual buttons configured + if (step_nr == 6) + { + finished = TRUE; + success = TRUE; + } + } + + if (action != ACTION_NONE && !finished) + { + for (x = 0; x < MAX_GRID_XSIZE; x++) + for (y = 0; y < MAX_GRID_YSIZE; y++) + grid_button_tmp[x][y] = overlay.grid_button[x][y]; + + overlay.grid_button_highlight = grid_button[step_nr]; + + // configure next virtual button + + ClearField(); + + DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Virtual Buttons"); + DrawTextSCentered(ypos1, font_nr, "Select tiles to"); + DrawTextSCentered(ypos2, font_nr, customize_step_text[step_nr]); + } + if (set_grid_button) { overlay.grid_button[x][y] = @@ -8055,6 +8644,9 @@ void ConfigureVirtualButtons(void) { boolean success = ConfigureVirtualButtonsMain(); + UnmapScreenMenuGadgets(SCREEN_MASK_TOUCH | + SCREEN_MASK_TOUCH2); + if (success) { int font_nr = FONT_TITLE_1; @@ -8080,6 +8672,9 @@ void ConfigureVirtualButtons(void) 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) @@ -8225,104 +8820,138 @@ void HandleGameActions(void) 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 */ + AutoPlayTapes(); // continue automatically playing next tape } -/* ---------- new screen button stuff -------------------------------------- */ - -static void getScreenMenuButtonPos(int *x, int *y, int gadget_id) -{ - switch (gadget_id) - { - case SCREEN_CTRL_ID_PREV_LEVEL: - *x = mSX + GDI_ACTIVE_POS(menu.main.button.prev_level.x); - *y = mSY + GDI_ACTIVE_POS(menu.main.button.prev_level.y); - break; - - case SCREEN_CTRL_ID_NEXT_LEVEL: - *x = mSX + GDI_ACTIVE_POS(menu.main.button.next_level.x); - *y = mSY + GDI_ACTIVE_POS(menu.main.button.next_level.y); - break; - - case SCREEN_CTRL_ID_PREV_PLAYER: - *x = mSX + TILEX * 10; - *y = mSY + TILEY * MENU_SCREEN_START_YPOS; - break; - - case SCREEN_CTRL_ID_NEXT_PLAYER: - *x = mSX + TILEX * 12; - *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); - } -} +// ---------- new screen button stuff -------------------------------------- static struct { int gfx_unpressed, gfx_pressed; - void (*get_gadget_position)(int *, int *, int); + struct MenuPosInfo *pos; + boolean *check_value; int gadget_id; int screen_mask; + unsigned int event_mask; + boolean is_touch_button; char *infotext; } menubutton_info[NUM_SCREEN_MENUBUTTONS] = { { IMG_MENU_BUTTON_PREV_LEVEL, IMG_MENU_BUTTON_PREV_LEVEL_ACTIVE, - getScreenMenuButtonPos, + &menu.main.button.prev_level, NULL, SCREEN_CTRL_ID_PREV_LEVEL, SCREEN_MASK_MAIN, - "last level" + GD_EVENT_PRESSED | GD_EVENT_REPEATED, + FALSE, "previous level" }, { IMG_MENU_BUTTON_NEXT_LEVEL, IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE, - getScreenMenuButtonPos, + &menu.main.button.next_level, NULL, SCREEN_CTRL_ID_NEXT_LEVEL, SCREEN_MASK_MAIN, - "next level" + GD_EVENT_PRESSED | GD_EVENT_REPEATED, + FALSE, "next level" + }, + { + IMG_MENU_BUTTON_FIRST_LEVEL, IMG_MENU_BUTTON_FIRST_LEVEL_ACTIVE, + &menu.main.button.first_level, NULL, + SCREEN_CTRL_ID_FIRST_LEVEL, + SCREEN_MASK_MAIN, + GD_EVENT_RELEASED, + FALSE, "first level" + }, + { + IMG_MENU_BUTTON_LAST_LEVEL, IMG_MENU_BUTTON_LAST_LEVEL_ACTIVE, + &menu.main.button.last_level, NULL, + SCREEN_CTRL_ID_LAST_LEVEL, + SCREEN_MASK_MAIN, + GD_EVENT_RELEASED, + FALSE, "last level" + }, + { + IMG_MENU_BUTTON_LEVEL_NUMBER, IMG_MENU_BUTTON_LEVEL_NUMBER_ACTIVE, + &menu.main.button.level_number, NULL, + SCREEN_CTRL_ID_LEVEL_NUMBER, + SCREEN_MASK_MAIN, + GD_EVENT_RELEASED, + FALSE, "level number" }, { IMG_MENU_BUTTON_LEFT, IMG_MENU_BUTTON_LEFT_ACTIVE, - getScreenMenuButtonPos, + &menu.setup.button.prev_player, NULL, SCREEN_CTRL_ID_PREV_PLAYER, SCREEN_MASK_INPUT, - "last player" + GD_EVENT_PRESSED | GD_EVENT_REPEATED, + FALSE, "previous player" }, { IMG_MENU_BUTTON_RIGHT, IMG_MENU_BUTTON_RIGHT_ACTIVE, - getScreenMenuButtonPos, + &menu.setup.button.next_player, NULL, SCREEN_CTRL_ID_NEXT_PLAYER, SCREEN_MASK_INPUT, - "next player" + GD_EVENT_PRESSED | GD_EVENT_REPEATED, + FALSE, "next player" }, { IMG_MENU_BUTTON_INSERT_SOLUTION, IMG_MENU_BUTTON_INSERT_SOLUTION_ACTIVE, - getScreenMenuButtonPos, + &menu.main.button.insert_solution, NULL, SCREEN_CTRL_ID_INSERT_SOLUTION, SCREEN_MASK_MAIN_HAS_SOLUTION, - "insert solution tape" + GD_EVENT_RELEASED, + FALSE, "insert solution tape" }, { IMG_MENU_BUTTON_PLAY_SOLUTION, IMG_MENU_BUTTON_PLAY_SOLUTION_ACTIVE, - getScreenMenuButtonPos, + &menu.main.button.play_solution, NULL, SCREEN_CTRL_ID_PLAY_SOLUTION, SCREEN_MASK_MAIN_HAS_SOLUTION, - "play solution tape" + GD_EVENT_RELEASED, + FALSE, "play solution tape" + }, + { + IMG_MENU_BUTTON_SWITCH_ECS_AGA, IMG_MENU_BUTTON_SWITCH_ECS_AGA_ACTIVE, + &menu.main.button.switch_ecs_aga, &setup.prefer_aga_graphics, + SCREEN_CTRL_ID_SWITCH_ECS_AGA, + SCREEN_MASK_MAIN, + GD_EVENT_RELEASED | GD_EVENT_OFF_BORDERS, + FALSE, "switch ECS/AGA chipset" + }, + { + IMG_MENU_BUTTON_TOUCH_BACK, IMG_MENU_BUTTON_TOUCH_BACK, + &menu.setup.button.touch_back, NULL, + SCREEN_CTRL_ID_TOUCH_PREV_PAGE, + SCREEN_MASK_TOUCH, + GD_EVENT_RELEASED, + TRUE, "previous page" + }, + { + IMG_MENU_BUTTON_TOUCH_NEXT, IMG_MENU_BUTTON_TOUCH_NEXT, + &menu.setup.button.touch_next, NULL, + SCREEN_CTRL_ID_TOUCH_NEXT_PAGE, + SCREEN_MASK_TOUCH, + GD_EVENT_RELEASED, + TRUE, "next page" + }, + { + IMG_MENU_BUTTON_TOUCH_BACK2, IMG_MENU_BUTTON_TOUCH_BACK2, + &menu.setup.button.touch_back2, NULL, + SCREEN_CTRL_ID_TOUCH_PREV_PAGE2, + SCREEN_MASK_TOUCH2, + GD_EVENT_RELEASED, + TRUE, "previous page" + }, + { + IMG_MENU_BUTTON_TOUCH_NEXT2, IMG_MENU_BUTTON_TOUCH_NEXT2, + &menu.setup.button.touch_next2, NULL, + SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2, + SCREEN_MASK_TOUCH2, + GD_EVENT_RELEASED, + TRUE, "next page" }, }; @@ -8336,13 +8965,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" } @@ -8360,8 +8989,8 @@ 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" @@ -8381,7 +9010,7 @@ static struct { IMG_SETUP_INPUT_TEXT, SCREEN_CTRL_ID_NETWORK_SERVER, - -1, -1, /* these values are not constant, but can change at runtime */ + -1, -1, // these values are not constant, but can change at runtime MAX_SETUP_TEXT_INPUT_LEN, network_server_hostname, "Network Server Hostname / IP" @@ -8396,29 +9025,25 @@ static void CreateScreenMenubuttons(void) for (i = 0; i < NUM_SCREEN_MENUBUTTONS; i++) { + struct MenuPosInfo *pos = menubutton_info[i].pos; + boolean is_touch_button = menubutton_info[i].is_touch_button; + boolean is_check_button = menubutton_info[i].check_value != NULL; Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed; int gfx_unpressed, gfx_pressed; int x, y, width, height; int gd_x1, gd_x2, gd_y1, gd_y2; + int gd_x1a, gd_x2a, gd_y1a, gd_y2a; int id = menubutton_info[i].gadget_id; + int type = GD_TYPE_NORMAL_BUTTON; + boolean checked = FALSE; - if (menubutton_info[i].screen_mask == SCREEN_MASK_MAIN_HAS_SOLUTION) - event_mask = GD_EVENT_RELEASED; - else - event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED; + event_mask = menubutton_info[i].event_mask; - menubutton_info[i].get_gadget_position(&x, &y, id); + x = (is_touch_button ? pos->x : mSX + GDI_ACTIVE_POS(pos->x)); + y = (is_touch_button ? pos->y : mSY + GDI_ACTIVE_POS(pos->y)); - if (menubutton_info[i].screen_mask == SCREEN_MASK_MAIN_HAS_SOLUTION) - { - width = graphic_info[menubutton_info[i].gfx_pressed].width; - height = graphic_info[menubutton_info[i].gfx_pressed].height; - } - else - { - 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; @@ -8428,6 +9053,27 @@ static void CreateScreenMenubuttons(void) gd_y1 = graphic_info[gfx_unpressed].src_y; gd_x2 = graphic_info[gfx_pressed].src_x; gd_y2 = graphic_info[gfx_pressed].src_y; + gd_x1a = gd_x1; + gd_y1a = gd_y1; + gd_x2a = gd_x2; + gd_y2a = gd_y2; + + if (is_touch_button) + { + gd_x2 += graphic_info[gfx_pressed].pressed_xoffset; + gd_y2 += graphic_info[gfx_pressed].pressed_yoffset; + } + + if (is_check_button) + { + gd_x1a += graphic_info[gfx_unpressed].active_xoffset; + gd_y1a += graphic_info[gfx_unpressed].active_yoffset; + gd_x2a += graphic_info[gfx_pressed].active_xoffset; + gd_y2a += graphic_info[gfx_pressed].active_yoffset; + + type = GD_TYPE_CHECK_BUTTON; + checked = *menubutton_info[i].check_value; + } gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, @@ -8437,17 +9083,21 @@ static void CreateScreenMenubuttons(void) GDI_Y, y, GDI_WIDTH, width, GDI_HEIGHT, height, - GDI_TYPE, GD_TYPE_NORMAL_BUTTON, + GDI_TYPE, type, GDI_STATE, GD_BUTTON_UNPRESSED, + GDI_CHECKED, checked, GDI_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1, gd_y1, GDI_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2, gd_y2, + GDI_ALT_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1a, gd_y1a, + GDI_ALT_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2a, gd_y2a, GDI_DIRECT_DRAW, FALSE, + GDI_OVERLAY_TOUCH_BUTTON, is_touch_button, GDI_EVENT_MASK, event_mask, GDI_CALLBACK_ACTION, HandleScreenGadgets, GDI_END); if (gi == NULL) - Error(ERR_EXIT, "cannot create gadget"); + Fail("cannot create gadget"); screen_gadget[id] = gi; } @@ -8459,7 +9109,7 @@ static void CreateScreenScrollbuttons(void) 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; @@ -8480,7 +9130,7 @@ static void CreateScreenScrollbuttons(void) 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; @@ -8515,7 +9165,7 @@ static void CreateScreenScrollbuttons(void) GDI_END); if (gi == NULL) - Error(ERR_EXIT, "cannot create gadget"); + Fail("cannot create gadget"); screen_gadget[id] = gi; } @@ -8525,7 +9175,7 @@ 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; @@ -8550,7 +9200,7 @@ static void CreateScreenScrollbars(void) 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; @@ -8596,7 +9246,7 @@ static void CreateScreenScrollbars(void) GDI_END); if (gi == NULL) - Error(ERR_EXIT, "cannot create gadget"); + Fail("cannot create gadget"); screen_gadget[id] = gi; } @@ -8642,7 +9292,7 @@ static void CreateScreenTextInputGadgets(void) GDI_END); if (gi == NULL) - Error(ERR_EXIT, "cannot create gadget"); + Fail("cannot create gadget"); screen_gadget[id] = gi; } @@ -8666,7 +9316,7 @@ void FreeScreenGadgets(void) FreeGadget(screen_gadget[i]); } -void MapScreenMenuGadgets(int screen_mask) +static void MapScreenMenuGadgets(int screen_mask) { int i; @@ -8694,7 +9344,7 @@ static void UnmapScreenMenuGadgets(int screen_mask) } } -void UpdateScreenMenuGadgets(int screen_mask, boolean map_gadgets) +static void UpdateScreenMenuGadgets(int screen_mask, boolean map_gadgets) { if (map_gadgets) MapScreenMenuGadgets(screen_mask); @@ -8702,7 +9352,7 @@ void UpdateScreenMenuGadgets(int screen_mask, boolean map_gadgets) UnmapScreenMenuGadgets(screen_mask); } -void MapScreenGadgets(int num_entries) +static void MapScreenGadgets(int num_entries) { int i; @@ -8716,7 +9366,7 @@ void MapScreenGadgets(int num_entries) MapGadget(screen_gadget[scrollbar_info[i].gadget_id]); } -void MapScreenTreeGadgets(TreeInfo *ti) +static void MapScreenTreeGadgets(TreeInfo *ti) { MapScreenGadgets(numTreeInfoInGroup(ti)); } @@ -8739,6 +9389,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; @@ -8755,8 +9419,22 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) PlaySolutionTape(); break; + case SCREEN_CTRL_ID_SWITCH_ECS_AGA: + setup.prefer_aga_graphics = !setup.prefer_aga_graphics; + DrawMainMenu(); + break; + + case SCREEN_CTRL_ID_TOUCH_PREV_PAGE: + case SCREEN_CTRL_ID_TOUCH_NEXT_PAGE: + case SCREEN_CTRL_ID_TOUCH_PREV_PAGE2: + case SCREEN_CTRL_ID_TOUCH_NEXT_PAGE2: + PushUserEvent(USEREVENT_GADGET_PRESSED, id, 0); + break; + case SCREEN_CTRL_ID_SCROLL_UP: - if (game_status == GAME_MODE_LEVELS) + if (game_status == GAME_MODE_NAMES) + HandleChoosePlayerName(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); + else if (game_status == GAME_MODE_LEVELS) HandleChooseLevelSet(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); else if (game_status == GAME_MODE_LEVELNR) HandleChooseLevelNr(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); @@ -8767,7 +9445,9 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) break; case SCREEN_CTRL_ID_SCROLL_DOWN: - if (game_status == GAME_MODE_LEVELS) + if (game_status == GAME_MODE_NAMES) + HandleChoosePlayerName(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); + else if (game_status == GAME_MODE_LEVELS) HandleChooseLevelSet(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); else if (game_status == GAME_MODE_LEVELNR) HandleChooseLevelNr(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); @@ -8778,7 +9458,9 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) break; case SCREEN_CTRL_ID_SCROLL_VERTICAL: - if (game_status == GAME_MODE_LEVELS) + if (game_status == GAME_MODE_NAMES) + HandleChoosePlayerName(0,0,999,gi->event.item_position,MB_MENU_INITIALIZE); + else if (game_status == GAME_MODE_LEVELS) HandleChooseLevelSet(0,0,999,gi->event.item_position,MB_MENU_INITIALIZE); else if (game_status == GAME_MODE_LEVELNR) HandleChooseLevelNr(0,0,999,gi->event.item_position,MB_MENU_INITIALIZE); @@ -8864,3 +9546,71 @@ boolean DoScreenAction(int image_id) 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); + } + } +}