X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=2067ee28f8592e08bfe4136b27de1bdeba03f7c9;hp=43198fa8a2d5138fdd78c631588cd19802985b79;hb=b275388df382d188bdce63b9e68783cb7139fc11;hpb=6e9813476a7d45f1f6fba23357e10b3aff33c0c2 diff --git a/src/screens.c b/src/screens.c index 43198fa8..2067ee28 100644 --- a/src/screens.c +++ b/src/screens.c @@ -27,7 +27,7 @@ #define DEBUG_JOYSTICKS 0 -/* screens on the info screen */ +// screens on the info screen #define INFO_MODE_MAIN 0 #define INFO_MODE_TITLE 1 #define INFO_MODE_ELEMENTS 2 @@ -39,9 +39,9 @@ #define MAX_INFO_MODES 8 -/* screens on the setup screen */ -/* (must match GFX_SPECIAL_ARG_SETUP_* values as defined in src/main.h) */ -/* (should also match corresponding entries in src/conf_gfx.c) */ +// screens on the setup screen +// (must match GFX_SPECIAL_ARG_SETUP_* values as defined in src/main.h) +// (should also match corresponding entries in src/conf_gfx.c) #define SETUP_MODE_MAIN 0 #define SETUP_MODE_GAME 1 #define SETUP_MODE_EDITOR 2 @@ -57,11 +57,11 @@ #define SETUP_MODE_SHORTCUTS_4 12 #define SETUP_MODE_SHORTCUTS_5 13 -/* sub-screens on the setup screen (generic) */ +// sub-screens on the setup screen (generic) #define SETUP_MODE_CHOOSE_ARTWORK 14 #define SETUP_MODE_CHOOSE_OTHER 15 -/* sub-screens on the setup screen (specific) */ +// sub-screens on the setup screen (specific) #define SETUP_MODE_CHOOSE_GAME_SPEED 16 #define SETUP_MODE_CHOOSE_SCROLL_DELAY 17 #define SETUP_MODE_CHOOSE_SNAPSHOT_MODE 18 @@ -89,7 +89,7 @@ #define MAX_MENU_MODES MAX(MAX_INFO_MODES, MAX_SETUP_MODES) -/* setup screen titles */ +// setup screen titles #define STR_SETUP_MAIN "Setup" #define STR_SETUP_GAME "Game & Menu" #define STR_SETUP_EDITOR "Editor" @@ -121,7 +121,7 @@ #define STR_SETUP_CHOOSE_GRID_XSIZE_1 "Horiz. Buttons" #define STR_SETUP_CHOOSE_GRID_YSIZE_1 "Vert. Buttons" -/* for input setup functions */ +// for input setup functions #define SETUPINPUT_SCREEN_POS_START 0 #define SETUPINPUT_SCREEN_POS_EMPTY1 3 #define SETUPINPUT_SCREEN_POS_EMPTY2 12 @@ -132,7 +132,7 @@ #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) @@ -171,21 +171,24 @@ #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_SCROLL_UP 9 +#define SCREEN_CTRL_ID_SCROLL_DOWN 10 +#define SCREEN_CTRL_ID_SCROLL_VERTICAL 11 +#define SCREEN_CTRL_ID_NETWORK_SERVER 12 + +#define NUM_SCREEN_GADGETS 13 + +#define NUM_SCREEN_MENUBUTTONS 9 #define NUM_SCREEN_SCROLLBUTTONS 2 #define NUM_SCREEN_SCROLLBARS 1 #define NUM_SCREEN_TEXTINPUT 1 @@ -194,7 +197,7 @@ #define SCREEN_MASK_MAIN_HAS_SOLUTION (1 << 1) #define SCREEN_MASK_INPUT (1 << 2) -/* graphic position and size values for buttons and scrollbars */ +// graphic position and size values for buttons and scrollbars #define SC_MENUBUTTON_XSIZE TILEX #define SC_MENUBUTTON_YSIZE TILEY @@ -221,7 +224,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); @@ -251,6 +254,9 @@ static void HandleInfoScreen_Credits(int); static void HandleInfoScreen_Program(int); static void HandleInfoScreen_Version(int); +static void ModifyGameSpeedIfNeeded(void); +static void DisableVsyncIfNeeded(void); + static void MapScreenMenuGadgets(int); static void MapScreenGadgets(int); static void MapScreenTreeGadgets(TreeInfo *); @@ -280,6 +286,8 @@ static TreeInfo *scroll_delay_current = NULL; static TreeInfo *snapshot_modes = NULL; static TreeInfo *snapshot_mode_current = NULL; +static TreeInfo *game_speeds_normal = NULL; +static TreeInfo *game_speeds_extended = NULL; static TreeInfo *game_speeds = NULL; static TreeInfo *game_speed_current = NULL; @@ -310,11 +318,7 @@ static TreeInfo *grid_size_current[2][2] = { { NULL, NULL }, { NULL, NULL } }; static TreeInfo *level_number = NULL; static TreeInfo *level_number_current = NULL; -static struct -{ - int value; - char *text; -} window_sizes_list[] = +static struct ValueTextInfo window_sizes_list[] = { { 50, "50 %" }, { 80, "80 %" }, @@ -332,11 +336,7 @@ static struct { -1, NULL }, }; -static struct -{ - char *value; - char *text; -} scaling_types_list[] = +static struct StringValueTextInfo scaling_types_list[] = { { SCALING_QUALITY_NEAREST, "Off" }, { SCALING_QUALITY_LINEAR, "Linear" }, @@ -345,11 +345,7 @@ static struct { NULL, NULL }, }; -static struct -{ - char *value; - char *text; -} rendering_modes_list[] = +static struct StringValueTextInfo rendering_modes_list[] = { { STR_SPECIAL_RENDERING_OFF, "Off (May show artifacts, fast)" }, { STR_SPECIAL_RENDERING_BITMAP, "Bitmap/Texture mode (slower)" }, @@ -362,11 +358,7 @@ static struct { NULL, NULL }, }; -static struct -{ - char *value; - char *text; -} vsync_modes_list[] = +static struct StringValueTextInfo vsync_modes_list[] = { { STR_VSYNC_MODE_OFF, "Off" }, { STR_VSYNC_MODE_NORMAL, "Normal" }, @@ -375,42 +367,40 @@ static struct { NULL, NULL }, }; -static struct +static struct ValueTextInfo game_speeds_list_normal[] = { - int value; - char *text; -} game_speeds_list[] = -{ -#if 1 { 30, "Very Slow" }, { 25, "Slow" }, { 20, "Normal" }, { 15, "Fast" }, { 10, "Very Fast" }, -#else - { 1000, "1/1s (Extremely Slow)" }, - { 500, "1/2s" }, - { 200, "1/5s" }, - { 100, "1/10s" }, - { 50, "1/20s" }, - { 29, "1/35s (Original Supaplex)" }, - { 25, "1/40s" }, - { 20, "1/50s (Normal Speed)" }, - { 14, "1/70s (Maximum Supaplex)" }, - { 10, "1/100s" }, - { 5, "1/200s" }, - { 2, "1/500s" }, - { 1, "1/1000s (Extremely Fast)" }, -#endif { -1, NULL }, }; -static struct -{ - int value; - char *text; -} scroll_delays_list[] = +static struct ValueTextInfo game_speeds_list_extended[] = +{ + { 1000, "1 fps (Extremely Slow)" }, + { 500, "2 fps" }, + { 200, "5 fps" }, + { 100, "10 fps" }, + { 50, "20 fps" }, + { 29, "35 fps (Original Supaplex)" }, + { 25, "40 fps" }, + { 20, "50 fps (=== Normal Speed ===)" }, + { 16, "60 fps (60 Hz VSync Speed)" }, + { 14, "70 fps (Maximum Supaplex)" }, + { 10, "100 fps" }, + { 5, "200 fps" }, + { 2, "500 fps" }, + { 1, "1000 fps (Extremely Fast)" }, + + { -1, NULL }, +}; + +static struct ValueTextInfo *game_speeds_list; + +static struct ValueTextInfo scroll_delays_list[] = { { 0, "0 Tiles (No Scroll Delay)" }, { 1, "1 Tile" }, @@ -425,11 +415,7 @@ static struct { -1, NULL }, }; -static struct -{ - char *value; - char *text; -} snapshot_modes_list[] = +static struct StringValueTextInfo snapshot_modes_list[] = { { STR_SNAPSHOT_MODE_OFF, "Off" }, { STR_SNAPSHOT_MODE_EVERY_STEP, "Every Step" }, @@ -439,11 +425,7 @@ static struct { NULL, NULL }, }; -static struct -{ - int value; - char *text; -} volumes_list[] = +static struct ValueTextInfo volumes_list[] = { { 0, "0 %" }, { 1, "1 %" }, @@ -463,11 +445,7 @@ static struct { -1, NULL }, }; -static struct -{ - char *value; - char *text; -} touch_controls_list[] = +static struct StringValueTextInfo touch_controls_list[] = { { TOUCH_CONTROL_OFF, "Off" }, { TOUCH_CONTROL_VIRTUAL_BUTTONS, "Virtual Buttons" }, @@ -477,11 +455,7 @@ static struct { NULL, NULL }, }; -static struct -{ - int value; - char *text; -} distances_list[] = +static struct ValueTextInfo distances_list[] = { { 1, "1 %" }, { 2, "2 %" }, @@ -496,11 +470,7 @@ static struct { -1, NULL }, }; -static struct -{ - int value; - char *text; -} transparencies_list[] = +static struct ValueTextInfo transparencies_list[] = { { 0, "0 % (Opaque)" }, { 10, "10 %" }, @@ -517,11 +487,7 @@ static struct { -1, NULL }, }; -static struct -{ - int value; - char *text; -} grid_sizes_list[] = +static struct ValueTextInfo grid_sizes_list[] = { { 3, "3" }, { 4, "4" }, @@ -562,7 +528,7 @@ static struct (s) == GAME_MODE_PSEUDO_TYPENAME ? \ GAME_MODE_MAIN : GAME_MODE_DEFAULT) -/* (there are no draw offset definitions needed for INFO_MODE_TITLE) */ +// (there are no draw offset definitions needed for INFO_MODE_TITLE) #define DRAW_MODE_INFO(i) ((i) >= INFO_MODE_TITLE && \ (i) <= INFO_MODE_LEVELSET ? (i) : \ INFO_MODE_MAIN) @@ -621,7 +587,7 @@ static struct NUM_MENU_ENTRIES_ON_SCREEN) -/* title display and control definitions */ +// title display and control definitions #define MAX_NUM_TITLE_SCREENS (2 * MAX_NUM_TITLE_IMAGES + \ 2 * MAX_NUM_TITLE_MESSAGES) @@ -642,7 +608,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 @@ -761,36 +727,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, }, @@ -1050,7 +1013,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++; } @@ -1084,18 +1047,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; } @@ -1114,7 +1077,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, @@ -1133,7 +1096,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]; @@ -1169,15 +1132,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) @@ -1195,7 +1158,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)) { @@ -1277,7 +1240,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); @@ -1290,7 +1253,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); @@ -1389,11 +1352,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); } @@ -1460,19 +1423,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; @@ -1497,34 +1460,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); @@ -1552,13 +1515,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); @@ -1574,7 +1537,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(); @@ -1587,7 +1550,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); @@ -1599,23 +1562,23 @@ void DrawMainMenu(void) return; } - /* needed if last screen was the setup screen and fullscreen state changed */ + // needed if last screen was the setup screen and fullscreen state changed // (moved to "execSetupGraphics()" to change fullscreen state directly) // ToggleFullscreenOrChangeWindowScalingIfNeeded(); - /* leveldir_current may be invalid (level group, parent link) */ + // leveldir_current may be invalid (level group, parent link) if (!validLevelSeries(leveldir_current)) leveldir_current = getFirstValidTreeInfoEntry(leveldir_last_valid); if (leveldir_current != leveldir_last_valid) levelset_has_changed = TRUE; - /* store valid level series information */ + // store valid level series information leveldir_last_valid = leveldir_current; - init_last = init; /* switch to new busy animation */ + init_last = init; // switch to new busy animation - /* needed if last screen (level choice) changed graphics, sounds or music */ + // needed if last screen (level choice) changed graphics, sounds or music ReloadCustomArtwork(0); if (CheckTitleScreen(levelset_has_changed)) @@ -1630,17 +1593,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; @@ -1677,20 +1640,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); @@ -1701,7 +1664,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(); @@ -1712,11 +1675,11 @@ 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); @@ -1764,7 +1727,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); } @@ -1772,10 +1735,10 @@ 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:", @@ -1788,10 +1751,10 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) 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) @@ -1814,7 +1777,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) FadeIn(REDRAW_ALL); - DelayReached(&title_delay, 0); /* reset delay counter */ + DelayReached(&title_delay, 0); // reset delay counter return; } @@ -1877,7 +1840,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) FadeIn(REDRAW_ALL); - DelayReached(&title_delay, 0); /* reset delay counter */ + DelayReached(&title_delay, 0); // reset delay counter } else { @@ -1891,7 +1854,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) @@ -1902,7 +1865,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); @@ -1929,7 +1892,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)) { @@ -1963,9 +1926,9 @@ static void HandleMainMenu_SelectLevel(int step, int direction, UpdateScreenMenuGadgets(SCREEN_MASK_MAIN_HAS_SOLUTION, hasSolutionTape()); - /* needed because DrawPreviewLevelInitial() takes some time */ + // needed because DrawPreviewLevelInitial() takes some time BackToFront(); - /* SyncDisplay(); */ + // SyncDisplay(); } } @@ -1984,7 +1947,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; @@ -2000,7 +1963,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; @@ -2021,7 +1984,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)) @@ -2072,9 +2035,23 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (pos == MAIN_CONTROL_NAME) { - SetGameStatus(GAME_MODE_PSEUDO_TYPENAME); + if ((mx || my) && + insideTextPosRect(main_controls[i].pos_text, mx - mSX, my - mSY)) + { + // special case: menu text "name/team" clicked -- toggle team mode + setup.team_mode = !setup.team_mode; + + InitializeMainControls(); + DrawCursorAndText_Main(choice, TRUE, FALSE); + + DrawPreviewPlayers(); + } + else + { + SetGameStatus(GAME_MODE_PSEUDO_TYPENAME); - HandleTypeName(strlen(setup.player_name), 0); + HandleTypeName(strlen(setup.player_name), 0); + } } else if (pos == MAIN_CONTROL_LEVELS) { @@ -2154,13 +2131,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) { @@ -2310,7 +2287,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) || @@ -2361,7 +2338,7 @@ static void DrawInfoScreen_Main(void) if (redraw_mask & REDRAW_ALL) fade_mask = REDRAW_ALL; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; UnmapAllGadgets(); @@ -2370,14 +2347,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); @@ -2423,8 +2400,8 @@ static void HandleMenuScreen(int mx, int my, int dx, int dy, int button, int *num_page_entries_last = num_page_entries_all_last[game_status]; int *choice_store = choice_stores[game_status]; int *first_entry_store = first_entry_stores[game_status]; - int choice = choice_store[mode]; /* starts with 0 */ - int first_entry = first_entry_store[mode]; /* starts with 0 */ + int choice = choice_store[mode]; // starts with 0 + int first_entry = first_entry_store[mode]; // starts with 0 int x = 0; int y = choice - first_entry; int y_old = y; @@ -2447,7 +2424,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++; @@ -2495,28 +2472,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) { @@ -2527,7 +2504,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) @@ -2537,7 +2514,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) @@ -2600,7 +2577,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) @@ -2670,7 +2647,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; } } @@ -2682,17 +2659,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--; @@ -2921,22 +2898,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, @@ -3638,12 +3615,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); @@ -3694,12 +3667,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", @@ -3759,22 +3728,14 @@ 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 DrawTextF(xstart1, ystart, font_text, "SDL_VideoDriver"); DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_videodriver); DrawTextF(xstart3, ystart, font_text, "%s", driver_name); ystart += ystep_line; -#if defined(TARGET_SDL2) driver_name = getStringCopyNStatic(SDL_GetAudioDriver(0), driver_name_len); -#else - SDL_AudioDriverName(driver_name, driver_name_len); -#endif DrawTextF(xstart1, ystart, font_text, "SDL_AudioDriver"); DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_audiodriver); @@ -3836,29 +3797,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 @@ -3946,9 +3907,9 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button) } -/* ========================================================================= */ -/* type name functions */ -/* ========================================================================= */ +// ============================================================================ +// type name functions +// ============================================================================ void HandleTypeName(int newxpos, Key key) { @@ -4025,15 +3986,15 @@ void HandleTypeName(int newxpos, Key key) } -/* ========================================================================= */ -/* tree menu functions */ -/* ========================================================================= */ +// ============================================================================ +// tree menu functions +// ============================================================================ 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)) @@ -4052,7 +4013,7 @@ static void DrawChooseTree(TreeInfo **ti_ptr) FadeOut(fade_mask); - /* needed if different viewport properties defined for choosing level (set) */ + // needed if different viewport properties defined for choosing level (set) ChangeViewportPropertiesIfNeeded(); if (game_status == GAME_MODE_LEVELNR) @@ -4152,7 +4113,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); @@ -4181,7 +4142,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, 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; } @@ -4189,7 +4150,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; } @@ -4261,21 +4222,21 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, return; } - if (mx || my) /* mouse input */ + if (mx || my) // mouse input { x = (mx - mSX) / 32; y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS; } - 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) { @@ -4286,7 +4247,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) @@ -4296,7 +4257,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) @@ -4318,7 +4279,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; } @@ -4525,7 +4486,7 @@ void DrawChooseLevelNr(void) char identifier[32], name[32]; 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; @@ -4545,14 +4506,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; @@ -4570,16 +4531,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); @@ -4592,7 +4553,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(); @@ -4666,7 +4627,7 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) 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) @@ -4699,6 +4660,7 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) if (game_status_last_screen == GAME_MODE_PLAYING && setup.auto_play_next_level && setup.increment_levels && + level_nr < leveldir_current->last_level && !network_playing) { StartGameActions(network.enabled, setup.autorecord, level.random_seed); @@ -4716,13 +4678,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; @@ -4751,8 +4713,19 @@ static void execSetupMain(void) DrawSetupScreen(); } -static void execSetupGame_setGameSpeeds(void) +static void execSetupGame_setGameSpeeds(boolean update_value) { + if (setup.game_speed_extended) + { + game_speeds_list = game_speeds_list_extended; + game_speeds = game_speeds_extended; + } + else + { + game_speeds_list = game_speeds_list_normal; + game_speeds = game_speeds_normal; + } + if (game_speeds == NULL) { int i; @@ -4778,26 +4751,36 @@ static void execSetupGame_setGameSpeeds(void) pushTreeInfo(&game_speeds, ti); } - /* sort game speed values to start with slowest game speed */ + // sort game speed values to start with slowest game speed sortTreeInfo(&game_speeds); - /* set current game speed to configured game speed value */ + update_value = TRUE; + } + + if (update_value) + { + // set current game speed to configured game speed value game_speed_current = getTreeInfoFromIdentifier(game_speeds, i_to_a(setup.game_frame_delay)); - /* if that fails, set current game speed to reliable default value */ + // if that fails, set current game speed to reliable default value if (game_speed_current == NULL) game_speed_current = getTreeInfoFromIdentifier(game_speeds, i_to_a(GAME_FRAME_DELAY)); - /* if that also fails, set current game speed to first available speed */ + // if that also fails, set current game speed to first available speed if (game_speed_current == NULL) game_speed_current = game_speeds; + + if (setup.game_speed_extended) + game_speeds_extended = game_speeds; + else + game_speeds_normal = game_speeds; } setup.game_frame_delay = atoi(game_speed_current->identifier); - /* needed for displaying game speed text instead of identifier */ + // needed for displaying game speed text instead of identifier game_speed_text = game_speed_current->name; } @@ -4828,26 +4811,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; } @@ -4878,26 +4861,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; } @@ -4914,13 +4897,15 @@ 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; } static void execSetupGame(void) { - execSetupGame_setGameSpeeds(); + boolean check_vsync_mode = (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED); + + execSetupGame_setGameSpeeds(FALSE); execSetupGame_setScrollDelays(); execSetupGame_setSnapshotModes(); @@ -4929,6 +4914,10 @@ static void execSetupGame(void) setup_mode = SETUP_MODE_GAME; DrawSetupScreen(); + + // check if vsync needs to be disabled for this game speed to work + if (check_vsync_mode) + DisableVsyncIfNeeded(); } static void execSetupChooseGameSpeed(void) @@ -5019,28 +5008,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; } @@ -5071,26 +5060,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; } @@ -5121,31 +5110,31 @@ 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; } -static void execSetupGraphics_setVsyncModes(void) +static void execSetupGraphics_setVsyncModes(boolean update_value) { if (vsync_modes == NULL) { @@ -5172,31 +5161,38 @@ static void execSetupGraphics_setVsyncModes(void) 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); - /* set current vsync mode value to configured vsync mode value */ + update_value = TRUE; + } + + if (update_value) + { + // set current vsync mode value to configured vsync mode value vsync_mode_current = getTreeInfoFromIdentifier(vsync_modes, setup.vsync_mode); - /* if that fails, set current vsync mode to reliable default value */ + // if 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; } static void execSetupGraphics(void) { + boolean check_game_speed = (setup_mode == SETUP_MODE_CHOOSE_VSYNC); + // update "setup.window_scaling_percent" from list selection // (in this case, window scaling was changed on setup screen) if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE) @@ -5208,13 +5204,16 @@ static void execSetupGraphics(void) execSetupGraphics_setScalingTypes(); execSetupGraphics_setRenderingModes(); - execSetupGraphics_setVsyncModes(); + execSetupGraphics_setVsyncModes(FALSE); setup_mode = SETUP_MODE_GRAPHICS; DrawSetupScreen(); -#if defined(TARGET_SDL2) + // check if game speed is high enough for 60 Hz vsync to work + if (check_game_speed) + ModifyGameSpeedIfNeeded(); + // window scaling may have changed at this point ToggleFullscreenOrChangeWindowScalingIfNeeded(); @@ -5227,7 +5226,6 @@ static void execSetupGraphics(void) // screen vsync mode may have changed at this point SDLSetScreenVsyncMode(setup.vsync_mode); -#endif } static void execSetupChooseWindowSize(void) @@ -5332,19 +5330,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; } @@ -5400,19 +5398,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; } @@ -5468,19 +5466,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; } @@ -5489,7 +5487,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; @@ -5593,19 +5591,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; } @@ -5633,21 +5631,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; } @@ -5675,21 +5673,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; } @@ -5717,21 +5715,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; } @@ -5770,17 +5768,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], @@ -5788,7 +5786,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]; } @@ -5812,7 +5810,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; @@ -5840,10 +5838,10 @@ static void execSetupArtwork(void) 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; @@ -5985,6 +5983,71 @@ static void ToggleNetworkModeIfNeeded(void) DrawSetupScreen(); } +static void ToggleGameSpeedsListIfNeeded(void) +{ + boolean using_game_speeds_extended = (game_speeds == game_speeds_extended); + + if (setup.game_speed_extended == using_game_speeds_extended) + return; + + // try to match similar values when changing game speeds list + if (setup.game_speed_extended) + setup.game_frame_delay = (setup.game_frame_delay == 15 ? 16 : + setup.game_frame_delay == 30 ? 29 : + setup.game_frame_delay); + else + setup.game_frame_delay = (setup.game_frame_delay == 14 ? 15 : + setup.game_frame_delay == 16 ? 15 : + setup.game_frame_delay >= 29 ? 30 : + setup.game_frame_delay <= 10 ? 10 : + setup.game_frame_delay); + + execSetupGame_setGameSpeeds(TRUE); + + DrawSetupScreen(); +} + +static void ModifyGameSpeedIfNeeded(void) +{ + if (strEqual(setup.vsync_mode, STR_VSYNC_MODE_OFF) || + setup.game_frame_delay <= MAX_VSYNC_FRAME_DELAY) + return; + + char message[100]; + char *game_speed_text = "Fast"; + int game_speed_value = 15; + + if (setup.game_speed_extended) + { + game_speed_text = "60 fps"; + game_speed_value = 16; + } + + sprintf(message, "Game speed set to %s for VSync to work!", game_speed_text); + + // set game speed to existing list value that is fast enough for vsync + setup.game_frame_delay = game_speed_value; + + execSetupGame_setGameSpeeds(TRUE); + + Request(message, REQ_CONFIRM); +} + +static void DisableVsyncIfNeeded(void) +{ + if (strEqual(setup.vsync_mode, STR_VSYNC_MODE_OFF) || + (setup.game_frame_delay >= MIN_VSYNC_FRAME_DELAY && + setup.game_frame_delay <= MAX_VSYNC_FRAME_DELAY)) + return; + + // disable vsync for the selected game speed to work + setup.vsync_mode = STR_VSYNC_MODE_OFF; + + execSetupGraphics_setVsyncModes(TRUE); + + Request("VSync disabled for this game speed to work!", REQ_CONFIRM); +} + static struct { void *value; @@ -6097,9 +6160,11 @@ static struct TokenInfo setup_info_game[] = { TYPE_SWITCH, &setup.increment_levels,"Increment Solved Levels:" }, { TYPE_SWITCH, &setup.auto_play_next_level,"Auto-play Next Level:" }, { TYPE_SWITCH, &setup.skip_scores_after_game,"Skip Scores After Game:" }, + { TYPE_YES_NO, &setup.ask_on_game_over, "Ask on Game Over:" }, { TYPE_SWITCH, &setup.autorecord, "Auto-Record Tapes:" }, { TYPE_ENTER_LIST, execSetupChooseGameSpeed, "Game Speed:" }, { TYPE_STRING, &game_speed_text, "" }, + { TYPE_SWITCH, &setup.game_speed_extended, "Game Speed Extended List:" }, #if 1 { TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay:" }, { TYPE_STRING, &scroll_delay_text, "" }, @@ -6149,7 +6214,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, "" }, @@ -6422,9 +6487,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; } @@ -6489,10 +6554,12 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw) int ypos = MENU_SCREEN_START_YPOS + screen_pos; int startx = mSX + xpos * 32; int starty = mSY + ypos * 32; - int font_nr, font_nr_default, font_width_default; int type = si->type; void *value = si->value; char *value_string = getSetupValue(type, value); + int font_nr_default = getSetupValueFont(type, value); + int font_width_default = getFontWidth(font_nr_default); + int font_nr = font_nr_default; int i; if (value_string == NULL) @@ -6507,7 +6574,7 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw) } else if (type & TYPE_STRING) { - int max_value_len = (SCR_FIELDX - 2) * 2; + int max_value_len = (SXSIZE - 2 * TILEX) / font_width_default; xpos = MENU_SCREEN_START_XPOS; @@ -6527,10 +6594,6 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw) startx = mSX + xpos * 32; starty = mSY + ypos * 32; - font_nr_default = getSetupValueFont(type, value); - font_width_default = getFontWidth(font_nr_default); - - font_nr = font_nr_default; // special check if right-side setup values moved left due to scrollbar if (scrollbar_needed && xpos > MENU_SCREEN_START_XPOS) @@ -6551,13 +6614,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; @@ -6574,8 +6637,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; @@ -6596,10 +6659,17 @@ static void drawSetupValue(int screen_pos, int setup_info_pos_raw) if (type & TYPE_PLAYER) { + struct FontBitmapInfo *font = getFontBitmapInfo(font_nr); int player_nr = *(int *)value; - int xoff = getFontWidth(font_nr); + int xoff = font->draw_xoffset + getFontWidth(font_nr); + int yoff = font->draw_yoffset + (getFontHeight(font_nr) - TILEY) / 2; + int startx2 = startx + xoff; + int starty2 = starty + yoff; - DrawFixedGraphicThruMaskExt(drawto, startx + xoff, starty, + if (DrawingOnBackground(startx2, starty2)) + ClearRectangleOnBackground(drawto, startx2, starty2, TILEX, TILEY); + + DrawFixedGraphicThruMaskExt(drawto, startx2, starty2, PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0); } @@ -6658,6 +6728,10 @@ static void changeSetupValue(int screen_pos, int setup_info_pos_raw, int dx) // network mode may have changed at this point if (si->value == &setup.network_mode) ToggleNetworkModeIfNeeded(); + + // game speed list may have changed at this point + if (si->value == &setup.game_speed_extended) + ToggleGameSpeedsListIfNeeded(); } static struct TokenInfo *getSetupInfoFinal(struct TokenInfo *setup_info_orig) @@ -6667,21 +6741,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; @@ -6699,7 +6773,7 @@ static void DrawSetupScreen_Generic(void) char *title_string = NULL; int i; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; UnmapAllGadgets(); @@ -6713,7 +6787,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); @@ -6793,7 +6867,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); @@ -6852,11 +6926,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); @@ -7017,7 +7091,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--; @@ -7028,7 +7102,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; @@ -7047,12 +7121,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); @@ -7161,7 +7235,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(); @@ -7193,7 +7267,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(); @@ -7203,18 +7277,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); @@ -7222,13 +7296,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; @@ -7237,7 +7311,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, @@ -7261,7 +7335,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; @@ -7297,7 +7371,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 @@ -7305,7 +7379,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; @@ -7377,7 +7450,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) name = getFormattedJoystickName(SDL_JoystickName(joystick)); #if DEBUG_JOYSTICKS - /* print info about the joystick we are watching */ + // print info about the joystick we are watching Error(ERR_DEBUG, "watching joystick %d: (%s)\n", SDL_JoystickInstanceID(joystick), name); Error(ERR_DEBUG, "joystick has %d axes, %d hats, %d balls, and %d buttons\n", @@ -7385,16 +7458,16 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) SDL_JoystickNumBalls(joystick), SDL_JoystickNumButtons(joystick)); #endif - /* initialize mapping with GUID and name */ + // initialize mapping with GUID and name SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joystick), temp, sizeof(temp)); snprintf(mapping, sizeof(mapping), "%s,%s,platform:%s,", temp, name, SDL_GetPlatform()); - /* loop through all steps (buttons and axes), getting joystick events */ + // loop through all steps (buttons and axes), getting joystick events for (i = 0; i < SDL_arraysize(steps) && !done;) { - Bitmap *marker = button; /* initialize with reliable default value */ + Bitmap *marker = button; // initialize with reliable default value step = &steps[i]; strcpy(step->mapping, mapping); @@ -7525,8 +7598,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; @@ -7571,7 +7644,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) case SDL_FINGERDOWN: case SDL_MOUSEBUTTONDOWN: - /* skip this step */ + // skip this step i++; next = TRUE; @@ -7583,14 +7656,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--; @@ -7603,7 +7676,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; @@ -7612,7 +7685,7 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) if (event.key.keysym.sym == KSYM_Escape) { - /* leave screen */ + // leave screen success = FALSE; done = TRUE; } @@ -7647,13 +7720,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) @@ -7801,7 +7871,7 @@ static boolean ConfigureVirtualButtonsMain(void) { Key key = GetEventKey((KeyEvent *)&event, FALSE); - /* press 'Escape' to abort and keep the old key bindings */ + // press 'Escape' to abort and keep the old key bindings if (key == KSYM_Escape) { for (x = 0; x < MAX_GRID_XSIZE; x++) @@ -7815,21 +7885,15 @@ static boolean ConfigureVirtualButtonsMain(void) break; } - /* press 'Enter' to keep the existing key binding */ + // 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 - ) + else if (key == KSYM_BackSpace || + key == KSYM_Back) { if (step_nr == 0) { @@ -7847,7 +7911,7 @@ static boolean ConfigureVirtualButtonsMain(void) break; } - /* all virtual buttons configured */ + // all virtual buttons configured if (step_nr == 6) { finished = TRUE; @@ -7862,7 +7926,7 @@ static boolean ConfigureVirtualButtonsMain(void) overlay.grid_button_highlight = grid_button[step_nr]; - /* query next virtual button */ + // query next virtual button ClearField(); @@ -7918,7 +7982,6 @@ static boolean ConfigureVirtualButtonsMain(void) } break; -#if defined(TARGET_SDL2) case SDL_WINDOWEVENT: HandleWindowEvent((WindowEvent *) &event); @@ -7941,7 +8004,6 @@ static boolean ConfigureVirtualButtonsMain(void) case SDL_APP_DIDENTERFOREGROUND: HandlePauseResumeEvent((PauseResumeEvent *) &event); break; -#endif default: HandleOtherEvents(&event); @@ -8134,20 +8196,27 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) void HandleGameActions(void) { + if (setup.ask_on_game_over) + CheckGameOver(); + if (game.restart_game_message != NULL) + { RequestRestartGame(game.restart_game_message); + return; + } + if (game_status != GAME_MODE_PLAYING) return; - GameActions(); /* main game loop */ + GameActions(); // main game loop if (tape.auto_play && !tape.playing) - AutoPlayTape(); /* continue automatically playing next tape */ + AutoPlayTape(); // continue automatically playing next tape } -/* ---------- new screen button stuff -------------------------------------- */ +// ---------- new screen button stuff -------------------------------------- static void getScreenMenuButtonPos(int *x, int *y, int gadget_id) { @@ -8163,6 +8232,21 @@ static void getScreenMenuButtonPos(int *x, int *y, int gadget_id) *y = mSY + GDI_ACTIVE_POS(menu.main.button.next_level.y); break; + case SCREEN_CTRL_ID_FIRST_LEVEL: + *x = mSX + GDI_ACTIVE_POS(menu.main.button.first_level.x); + *y = mSY + GDI_ACTIVE_POS(menu.main.button.first_level.y); + break; + + case SCREEN_CTRL_ID_LAST_LEVEL: + *x = mSX + GDI_ACTIVE_POS(menu.main.button.last_level.x); + *y = mSY + GDI_ACTIVE_POS(menu.main.button.last_level.y); + break; + + case SCREEN_CTRL_ID_LEVEL_NUMBER: + *x = mSX + GDI_ACTIVE_POS(menu.main.button.level_number.x); + *y = mSY + GDI_ACTIVE_POS(menu.main.button.level_number.y); + break; + case SCREEN_CTRL_ID_PREV_PLAYER: *x = mSX + TILEX * 10; *y = mSY + TILEY * MENU_SCREEN_START_YPOS; @@ -8194,6 +8278,7 @@ static struct void (*get_gadget_position)(int *, int *, int); int gadget_id; int screen_mask; + unsigned int event_mask; char *infotext; } menubutton_info[NUM_SCREEN_MENUBUTTONS] = { @@ -8202,27 +8287,55 @@ static struct getScreenMenuButtonPos, SCREEN_CTRL_ID_PREV_LEVEL, SCREEN_MASK_MAIN, - "last level" + GD_EVENT_PRESSED | GD_EVENT_REPEATED, + "previous level" }, { IMG_MENU_BUTTON_NEXT_LEVEL, IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE, getScreenMenuButtonPos, SCREEN_CTRL_ID_NEXT_LEVEL, SCREEN_MASK_MAIN, + GD_EVENT_PRESSED | GD_EVENT_REPEATED, "next level" }, + { + IMG_MENU_BUTTON_FIRST_LEVEL, IMG_MENU_BUTTON_FIRST_LEVEL_ACTIVE, + getScreenMenuButtonPos, + SCREEN_CTRL_ID_FIRST_LEVEL, + SCREEN_MASK_MAIN, + GD_EVENT_RELEASED, + "first level" + }, + { + IMG_MENU_BUTTON_LAST_LEVEL, IMG_MENU_BUTTON_LAST_LEVEL_ACTIVE, + getScreenMenuButtonPos, + SCREEN_CTRL_ID_LAST_LEVEL, + SCREEN_MASK_MAIN, + GD_EVENT_RELEASED, + "last level" + }, + { + IMG_MENU_BUTTON_LEVEL_NUMBER, IMG_MENU_BUTTON_LEVEL_NUMBER_ACTIVE, + getScreenMenuButtonPos, + SCREEN_CTRL_ID_LEVEL_NUMBER, + SCREEN_MASK_MAIN, + GD_EVENT_RELEASED, + "level number" + }, { IMG_MENU_BUTTON_LEFT, IMG_MENU_BUTTON_LEFT_ACTIVE, getScreenMenuButtonPos, SCREEN_CTRL_ID_PREV_PLAYER, SCREEN_MASK_INPUT, - "last player" + GD_EVENT_PRESSED | GD_EVENT_REPEATED, + "previous player" }, { IMG_MENU_BUTTON_RIGHT, IMG_MENU_BUTTON_RIGHT_ACTIVE, getScreenMenuButtonPos, SCREEN_CTRL_ID_NEXT_PLAYER, SCREEN_MASK_INPUT, + GD_EVENT_PRESSED | GD_EVENT_REPEATED, "next player" }, { @@ -8230,6 +8343,7 @@ static struct getScreenMenuButtonPos, SCREEN_CTRL_ID_INSERT_SOLUTION, SCREEN_MASK_MAIN_HAS_SOLUTION, + GD_EVENT_RELEASED, "insert solution tape" }, { @@ -8237,6 +8351,7 @@ static struct getScreenMenuButtonPos, SCREEN_CTRL_ID_PLAY_SOLUTION, SCREEN_MASK_MAIN_HAS_SOLUTION, + GD_EVENT_RELEASED, "play solution tape" }, }; @@ -8251,13 +8366,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" } @@ -8275,8 +8390,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" @@ -8296,7 +8411,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" @@ -8317,10 +8432,7 @@ static void CreateScreenMenubuttons(void) int gd_x1, gd_x2, gd_y1, gd_y2; int id = menubutton_info[i].gadget_id; - 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); @@ -8374,7 +8486,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; @@ -8395,7 +8507,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; @@ -8440,7 +8552,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; @@ -8465,7 +8577,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; @@ -8654,6 +8766,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;