From 6b64e704d628cdbf7a49d6025dce715dfd829125 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Sat, 28 Apr 2007 17:13:30 +0200 Subject: [PATCH] rnd-20070428-2-src --- src/conf_gfx.c | 12 ++++++------ src/conftime.h | 2 +- src/init.c | 10 ++++++++-- src/screens.c | 15 +++++++++++++++ src/tools.c | 17 ++++++++++------- 5 files changed, 40 insertions(+), 16 deletions(-) diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 908700cd..33bfdba6 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -5289,20 +5289,20 @@ struct ConfigInfo image_config[] = { "init.busy.align", "center" }, { "init.busy.valign", "middle" }, - { "menu.enter_menu.fade_mode", "crossfade" }, + { "menu.enter_menu.fade_mode", "none" }, { "menu.enter_menu.fade_delay", "250" }, { "menu.enter_menu.post_delay", "125" }, - { "menu.leave_menu.fade_mode", "crossfade" }, + { "menu.leave_menu.fade_mode", "none" }, { "menu.leave_menu.fade_delay", "250" }, { "menu.leave_menu.post_delay", "125" }, - { "menu.enter_screen.fade_mode", "crossfade" }, - { "menu.enter_screen.fade_delay", "250" }, + { "menu.enter_screen.fade_mode", "fade" }, + { "menu.enter_screen.fade_delay", "750" }, { "menu.enter_screen.post_delay", "125" }, { "menu.next_screen.fade_mode", "crossfade" }, { "menu.next_screen.fade_delay", "250" }, { "menu.next_screen.post_delay", "125" }, - { "menu.leave_screen.fade_mode", "crossfade" }, - { "menu.leave_screen.fade_delay", "250" }, + { "menu.leave_screen.fade_mode", "fade" }, + { "menu.leave_screen.fade_delay", "750" }, { "menu.leave_screen.post_delay", "125" }, { "menu.enter_screen.SCORES.fade_mode", ARG_DEFAULT }, { "menu.enter_screen.SCORES.fade_delay", ARG_DEFAULT }, diff --git a/src/conftime.h b/src/conftime.h index 655a6ba8..b81fab18 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "2007-04-28 04:06" +#define COMPILE_DATE_STRING "2007-04-28 17:12" diff --git a/src/init.c b/src/init.c index 9ecc59c3..79c3d588 100644 --- a/src/init.c +++ b/src/init.c @@ -5794,11 +5794,13 @@ void ReloadCustomArtwork(int force_reload) #endif print_timestamp_time("ClearRectangle"); +#if 0 printf("::: fading in ... %d\n", fading.fade_mode); - +#endif FadeIn(REDRAW_ALL); - +#if 0 printf("::: done\n"); +#endif if (gfx_new_identifier != NULL || force_reload_gfx) { @@ -5828,9 +5830,13 @@ void ReloadCustomArtwork(int force_reload) game_status = last_game_status; /* restore current game status */ +#if 0 printf("::: FadeOut @ ReloadCustomArtwork ...\n"); +#endif FadeOut(REDRAW_ALL); +#if 0 printf("::: FadeOut @ ReloadCustomArtwork done\n"); +#endif RedrawBackground(); diff --git a/src/screens.c b/src/screens.c index a29c3d65..bbd7eb82 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1280,6 +1280,7 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) { static LevelDirTree *leveldir_last_valid = NULL; boolean levelset_has_changed = FALSE; + boolean redraw_all = FALSE; FadeSetLeaveScreen(); @@ -1333,10 +1334,17 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) /* needed if last screen (level choice) changed graphics, sounds or music */ ReloadCustomArtwork(0); + if (redraw_mask & REDRAW_ALL) + redraw_all = TRUE; + #if 1 +#if 0 printf("::: FadeOut @ DrawMainMenuExt ...\n"); +#endif FadeOut(redraw_mask); +#if 0 printf("::: FadeOut @ DrawMainMenuExt done\n"); +#endif /* needed if last screen was the editor screen */ UndrawSpecialEditorDoor(); @@ -1418,6 +1426,11 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) } #endif +#if 0 + if (redraw_all) + redraw_mask = REDRAW_ALL; +#endif + FadeIn(redraw_mask); FadeSetEnterMenu(); @@ -4915,9 +4928,11 @@ static void DrawSetupScreen_Generic() if (redraw_mask & REDRAW_ALL) redraw_all = TRUE; +#if 0 printf("::: %s\n", (redraw_mask & REDRAW_FIELD ? "REDRAW_FIELD" : redraw_mask & REDRAW_ALL ? "REDRAW_ALL" : int2str(0, redraw_mask))); +#endif #if 1 FadeOut(redraw_mask); diff --git a/src/tools.c b/src/tools.c index 63c29e62..0522aae0 100644 --- a/src/tools.c +++ b/src/tools.c @@ -241,8 +241,9 @@ void DrawMaskedBorder_ALL() void DrawMaskedBorder(int redraw_mask) { - /* do not draw masked screen borders when displaying title screens */ - if (effectiveGameStatus() == GAME_MODE_TITLE) + /* never draw masked screen borders on borderless screens */ + if (effectiveGameStatus() == GAME_MODE_LOADING || + effectiveGameStatus() == GAME_MODE_TITLE) return; if (redraw_mask & REDRAW_ALL) @@ -465,7 +466,7 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type) { if (fade_type_skip != FADE_TYPE_NONE) { -#if 1 +#if 0 printf("::: skipping %d ... [%d] (X)\n", fade_mode, fade_type_skip); #endif @@ -477,16 +478,18 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type) } if (fading.fade_mode & FADE_TYPE_TRANSFORM) + { FadeCrossSaveBackbuffer(); - return; + return; + } } redraw_mask |= fade_mask; if (fade_type == FADE_TYPE_SKIP) { -#if 1 +#if 0 printf("::: will skip %d ... [%d]\n", fade_mode, fade_type_skip); #endif @@ -497,7 +500,7 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type) if (fade_type_skip != FADE_TYPE_NONE) { -#if 1 +#if 0 printf("::: skipping %d ... [%d]\n", fade_mode, fade_type_skip); #endif @@ -528,7 +531,7 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type) /* !!! what abount fade_mask == REDRAW_FIELD | REDRAW_ALL ??? !!! */ -#if 1 +#if 0 printf("::: NOW FADING %d ... [%d]\n", fade_mode, fade_type); #endif -- 2.34.1