From: Holger Schemel Date: Wed, 3 Oct 2018 16:15:01 +0000 (+0200) Subject: added check if game speed is high enough for 60 Hz vsync to work X-Git-Tag: 4.1.1.0~9 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=24b64f626ba95db5e0529b63bf29909834fe3034;p=rocksndiamonds.git added check if game speed is high enough for 60 Hz vsync to work --- diff --git a/src/libgame/system.h b/src/libgame/system.h index ae23c924..f8d36daf 100644 --- a/src/libgame/system.h +++ b/src/libgame/system.h @@ -458,6 +458,7 @@ #define MENU_FRAME_DELAY 20 /* frame delay in milliseconds */ #define GAME_FRAME_DELAY 20 /* frame delay in milliseconds */ #define FFWD_FRAME_DELAY 10 /* 200% speed for fast forward */ +#define MAX_VSYNC_FRAME_DELAY 16 /* maximum value for vsync to work */ #define FRAMES_PER_SECOND (ONE_SECOND_DELAY / GAME_FRAME_DELAY) #define FRAMES_PER_SECOND_SP 35 diff --git a/src/screens.c b/src/screens.c index 758b3f67..716bf3c5 100644 --- a/src/screens.c +++ b/src/screens.c @@ -4751,7 +4751,7 @@ static void execSetupMain(void) DrawSetupScreen(); } -static void execSetupGame_setGameSpeeds(void) +static void execSetupGame_setGameSpeeds(boolean update_value) { if (game_speeds == NULL) { @@ -4781,6 +4781,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)); @@ -4918,9 +4923,32 @@ static void execSetupGame_setNetworkServerText(void) network_server_text = network_server_hostname; } +static void CheckGameSpeedForVsync(boolean force_vsync_game_speed) +{ + if (strEqual(setup.vsync_mode, STR_VSYNC_MODE_OFF) || + setup.game_frame_delay <= MAX_VSYNC_FRAME_DELAY) + return; + + if (force_vsync_game_speed) + { + /* set game speed to existing list value that is fast enough for vsync */ + setup.game_frame_delay = 15; + + execSetupGame_setGameSpeeds(TRUE); + + Request("Game speed was set to \"fast\" for VSync to work!", REQ_CONFIRM); + } + else + { + Request("Warning! Game speed too low for VSync to work!", REQ_CONFIRM); + } +} + static void execSetupGame(void) { - execSetupGame_setGameSpeeds(); + boolean check_vsync_game_speed = (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED); + + execSetupGame_setGameSpeeds(FALSE); execSetupGame_setScrollDelays(); execSetupGame_setSnapshotModes(); @@ -4929,6 +4957,10 @@ static void execSetupGame(void) setup_mode = SETUP_MODE_GAME; DrawSetupScreen(); + + // check if game speed is high enough for 60 Hz vsync to work + if (check_vsync_game_speed) + CheckGameSpeedForVsync(FALSE); } static void execSetupChooseGameSpeed(void) @@ -5197,6 +5229,8 @@ static void execSetupGraphics_setVsyncModes(void) static void execSetupGraphics(void) { + boolean check_vsync_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) @@ -5214,6 +5248,10 @@ static void execSetupGraphics(void) DrawSetupScreen(); + // check if game speed is high enough for 60 Hz vsync to work + if (check_vsync_game_speed) + CheckGameSpeedForVsync(TRUE); + #if defined(TARGET_SDL2) // window scaling may have changed at this point ToggleFullscreenOrChangeWindowScalingIfNeeded();