X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=d44e2cb48c6f83174133da7f2bc99cf40b704434;hb=ac94403f845928d307f2a7b60e81dfca1fd13cbb;hp=8ac74ac7178eb4d7f10247e9c6302ac594df460e;hpb=2d298d8e6d16600c4ea7cdbdc08508098f0218ef;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index 8ac74ac7..d44e2cb4 100644 --- a/src/tools.c +++ b/src/tools.c @@ -9243,34 +9243,27 @@ void PlaySoundSelecting(void) #endif } -void ToggleFullscreenOrChangeWindowScalingIfNeeded(void) +void ToggleFullscreenIfNeeded(void) { - boolean change_fullscreen = (setup.fullscreen != - video.fullscreen_enabled); - boolean change_window_scaling_percent = (!video.fullscreen_enabled && - setup.window_scaling_percent != - video.window_scaling_percent); - - if (change_window_scaling_percent && video.fullscreen_enabled) - return; - - if (!change_window_scaling_percent && !video.fullscreen_available) - return; - - if (change_window_scaling_percent) - { - SDLSetWindowScaling(setup.window_scaling_percent); - - return; - } - else if (change_fullscreen) + if (setup.fullscreen != video.fullscreen_enabled && + video.fullscreen_available) { SDLSetWindowFullscreen(setup.fullscreen); // set setup value according to successfully changed fullscreen mode setup.fullscreen = video.fullscreen_enabled; + } +} - return; +void ChangeWindowScalingIfNeeded(void) +{ + if (setup.window_scaling_percent != video.window_scaling_percent && + !video.fullscreen_enabled) + { + SDLSetWindowScaling(setup.window_scaling_percent); + + // set setup value according to successfully changed window scaling + setup.window_scaling_percent = video.window_scaling_percent; } }