X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=3c12d6b5df34b14d528fd4d61f8c7a828e64bfd7;hp=6dd964f3f3df109cba6f08c22dcb2d8a825a004a;hb=17c7213a32d3a0e4c84727937f2ed79028461798;hpb=15166fddf78bff71ddec88fb3e4dda9424953403 diff --git a/src/screens.c b/src/screens.c index 6dd964f3..3c12d6b5 100644 --- a/src/screens.c +++ b/src/screens.c @@ -251,6 +251,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 +283,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 +315,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 +333,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 +342,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 +355,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 +364,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 +412,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 +422,7 @@ static struct { NULL, NULL }, }; -static struct -{ - int value; - char *text; -} volumes_list[] = +static struct ValueTextInfo volumes_list[] = { { 0, "0 %" }, { 1, "1 %" }, @@ -463,11 +442,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 +452,7 @@ static struct { NULL, NULL }, }; -static struct -{ - int value; - char *text; -} distances_list[] = +static struct ValueTextInfo distances_list[] = { { 1, "1 %" }, { 2, "2 %" }, @@ -496,11 +467,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 +484,7 @@ static struct { -1, NULL }, }; -static struct -{ - int value; - char *text; -} grid_sizes_list[] = +static struct ValueTextInfo grid_sizes_list[] = { { 3, "3" }, { 4, "4" }, @@ -4699,6 +4662,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); @@ -4751,8 +4715,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; @@ -4781,6 +4756,11 @@ static void execSetupGame_setGameSpeeds(void) /* sort game speed values to start with slowest game speed */ sortTreeInfo(&game_speeds); + 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)); @@ -4793,6 +4773,11 @@ static void execSetupGame_setGameSpeeds(void) /* 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); @@ -4920,7 +4905,9 @@ static void execSetupGame_setNetworkServerText(void) 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 +4916,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) @@ -5145,7 +5136,7 @@ static void execSetupGraphics_setRenderingModes(void) rendering_mode_text = rendering_mode_current->name; } -static void execSetupGraphics_setVsyncModes(void) +static void execSetupGraphics_setVsyncModes(boolean update_value) { if (vsync_modes == NULL) { @@ -5175,6 +5166,11 @@ static void execSetupGraphics_setVsyncModes(void) /* sort vsync mode values to start with lowest vsync mode value */ sortTreeInfo(&vsync_modes); + update_value = TRUE; + } + + if (update_value) + { /* set current vsync mode value to configured vsync mode value */ vsync_mode_current = getTreeInfoFromIdentifier(vsync_modes, setup.vsync_mode); @@ -5197,6 +5193,8 @@ static void execSetupGraphics_setVsyncModes(void) 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,12 +5206,16 @@ static void execSetupGraphics(void) execSetupGraphics_setScalingTypes(); execSetupGraphics_setRenderingModes(); - execSetupGraphics_setVsyncModes(); + execSetupGraphics_setVsyncModes(FALSE); setup_mode = SETUP_MODE_GRAPHICS; DrawSetupScreen(); + // check if game speed is high enough for 60 Hz vsync to work + if (check_game_speed) + ModifyGameSpeedIfNeeded(); + #if defined(TARGET_SDL2) // window scaling may have changed at this point ToggleFullscreenOrChangeWindowScalingIfNeeded(); @@ -5953,6 +5955,12 @@ static void execGadgetNetworkServer(void) static void ToggleNetworkModeIfNeeded(void) { + int font_title = FONT_TITLE_1; + int font_foot = FC_BLUE; + int ystart = mSY - SY + 16; + int ybottom = mSY - SY + SYSIZE - 20; + char *text = (setup.network_mode ? "Start Network" : "Stop Network"); + if (setup.network_mode == network.enabled) return; @@ -5962,6 +5970,8 @@ static void ToggleNetworkModeIfNeeded(void) ClearField(); + DrawTextSCentered(ystart, font_title, text); + FadeIn(REDRAW_ALL); if (network.enabled) @@ -5969,9 +5979,79 @@ static void ToggleNetworkModeIfNeeded(void) else DisconnectFromNetworkServer(); + DrawTextSCentered(ybottom, font_foot, + "Press any key or button for setup menu"); + + WaitForEventToContinue(); + DrawSetupScreen(); } +static void ToggleGameSpeedsListIfNeeded(void) +{ + boolean using_game_speeds_extended = (game_speeds == game_speeds_extended); + + if (setup.game_speed_extended == using_game_speeds_extended) + return; + + /* try to match similar values when changing game speeds list */ + if (setup.game_speed_extended) + setup.game_frame_delay = (setup.game_frame_delay == 15 ? 16 : + setup.game_frame_delay == 30 ? 29 : + setup.game_frame_delay); + else + setup.game_frame_delay = (setup.game_frame_delay == 14 ? 15 : + setup.game_frame_delay == 16 ? 15 : + setup.game_frame_delay >= 29 ? 30 : + setup.game_frame_delay <= 10 ? 10 : + setup.game_frame_delay); + + execSetupGame_setGameSpeeds(TRUE); + + DrawSetupScreen(); +} + +static void ModifyGameSpeedIfNeeded(void) +{ + if (strEqual(setup.vsync_mode, STR_VSYNC_MODE_OFF) || + setup.game_frame_delay <= MAX_VSYNC_FRAME_DELAY) + return; + + char message[100]; + char *game_speed_text = "Fast"; + int game_speed_value = 15; + + if (setup.game_speed_extended) + { + game_speed_text = "60 fps"; + game_speed_value = 16; + } + + sprintf(message, "Game speed set to %s for VSync to work!", game_speed_text); + + /* set game speed to existing list value that is fast enough for vsync */ + setup.game_frame_delay = game_speed_value; + + execSetupGame_setGameSpeeds(TRUE); + + Request(message, REQ_CONFIRM); +} + +static void DisableVsyncIfNeeded(void) +{ + if (strEqual(setup.vsync_mode, STR_VSYNC_MODE_OFF) || + (setup.game_frame_delay >= MIN_VSYNC_FRAME_DELAY && + setup.game_frame_delay <= MAX_VSYNC_FRAME_DELAY)) + return; + + /* disable vsync for the selected game speed to work */ + setup.vsync_mode = STR_VSYNC_MODE_OFF; + + execSetupGraphics_setVsyncModes(TRUE); + + Request("VSync disabled for this game speed to work!", REQ_CONFIRM); +} + static struct { void *value; @@ -6084,9 +6164,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, "" }, @@ -6476,10 +6558,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) @@ -6494,7 +6578,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; @@ -6514,10 +6598,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) @@ -6583,10 +6663,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; + + if (DrawingOnBackground(startx2, starty2)) + ClearRectangleOnBackground(drawto, startx2, starty2, TILEX, TILEY); - DrawFixedGraphicThruMaskExt(drawto, startx + xoff, starty, + DrawFixedGraphicThruMaskExt(drawto, startx2, starty2, PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0); } @@ -6645,6 +6732,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) @@ -8121,9 +8212,16 @@ 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;