X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=ad36f123d2ffb3c90e0a159a35c483d6eb6c9f08;hp=2ae872b475000ea3d2f0bddca41248f332f09f1c;hb=23ac9d644d93650ac7b88a50f44e9f1b5cdffa60;hpb=b33f14a8bdad5e3c9547c37b3854025daba761c7 diff --git a/src/tools.c b/src/tools.c index 2ae872b4..ad36f123 100644 --- a/src/tools.c +++ b/src/tools.c @@ -585,7 +585,10 @@ void FadeExt(int fade_mask, int fade_mode) fade_delay = fading.fade_delay; post_delay = (fade_mode == FADE_MODE_FADE_OUT ? fading.post_delay : 0); - draw_border_function = DrawMaskedBorder_FIELD; + if (border.draw_masked_when_fading) + draw_border_function = DrawMaskedBorder_FIELD; /* update when fading */ + else + DrawMaskedBorder_FIELD(); /* draw once */ } else /* REDRAW_ALL */ { @@ -620,7 +623,9 @@ void FadeExt(int fade_mask, int fade_mode) void FadeIn(int fade_mask) { +#if 0 global.border_status = game_status; +#endif #if 0 global.fading_status = game_status; @@ -700,6 +705,10 @@ void FadeOut(int fade_mask) FadeExt(fade_mask, FADE_MODE_FADE_OUT); #endif #endif + +#if 1 + global.border_status = game_status; +#endif } void FadeCross(int fade_mask)