From c981ce2708040be6519fa2694c6ea8b4d9c51a27 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Mon, 3 Dec 2018 23:34:54 +0100 Subject: [PATCH] renamed function --- src/editor.c | 2 +- src/game.c | 2 +- src/screens.c | 10 +++++----- src/tools.c | 2 +- src/tools.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/editor.c b/src/editor.c index 8c2e2ee6..c6d85e31 100644 --- a/src/editor.c +++ b/src/editor.c @@ -8546,7 +8546,7 @@ void DrawLevelEd(void) FadeSoundsAndMusic(); - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; FadeOut(fade_mask); diff --git a/src/game.c b/src/game.c index 9197a84a..3a3b10e6 100644 --- a/src/game.c +++ b/src/game.c @@ -3358,7 +3358,7 @@ void InitGame(void) else FadeSetEnterScreen(); - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; FadeLevelSoundsAndMusic(); diff --git a/src/screens.c b/src/screens.c index 567fbf16..d1310895 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1593,7 +1593,7 @@ void DrawMainMenu(void) if (redraw_mask & REDRAW_ALL) fade_mask = REDRAW_ALL; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; FadeOut(fade_mask); @@ -2324,7 +2324,7 @@ static void DrawInfoScreen_Main(void) if (redraw_mask & REDRAW_ALL) fade_mask = REDRAW_ALL; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; UnmapAllGadgets(); @@ -3980,7 +3980,7 @@ 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)) @@ -4517,7 +4517,7 @@ void DrawHallOfFame(int level_nr, int highlight_position) { int fade_mask = REDRAW_FIELD; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; UnmapAllGadgets(); @@ -6759,7 +6759,7 @@ static void DrawSetupScreen_Generic(void) char *title_string = NULL; int i; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; UnmapAllGadgets(); diff --git a/src/tools.c b/src/tools.c index cdf55ac3..4023a34e 100644 --- a/src/tools.c +++ b/src/tools.c @@ -9422,7 +9422,7 @@ boolean CheckIfPlayfieldViewportHasChanged(void) new_full_sysize != FULL_SYSIZE); } -boolean CheckIfGlobalBorderOrPlayfieldViewportHasChanged(void) +boolean CheckFadeAll(void) { return (CheckIfGlobalBorderHasChanged() || CheckIfPlayfieldViewportHasChanged()); diff --git a/src/tools.h b/src/tools.h index 5243401b..a9aedb23 100644 --- a/src/tools.h +++ b/src/tools.h @@ -284,6 +284,6 @@ void ToggleFullscreenOrChangeWindowScalingIfNeeded(void); void ChangeViewportPropertiesIfNeeded(void); boolean CheckIfPlayfieldViewportHasChanged(void); -boolean CheckIfGlobalBorderOrPlayfieldViewportHasChanged(void); +boolean CheckFadeAll(void); #endif // TOOLS_H -- 2.34.1