From: Holger Schemel Date: Thu, 26 Oct 2023 08:45:13 +0000 (+0200) Subject: fixed bug with using wrong global border when restarting the game X-Git-Tag: 4.3.7.0^0 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=fad52d7c153cd0947830fe96825fa185cf211324;p=rocksndiamonds.git fixed bug with using wrong global border when restarting the game --- diff --git a/src/tools.c b/src/tools.c index 70509ada..6086cf25 100644 --- a/src/tools.c +++ b/src/tools.c @@ -634,6 +634,10 @@ void DrawMaskedBorderToTarget(int draw_target) gfx.masked_border_bitmap_ptr = gfx.fade_bitmap_target; } + // always use global border for PLAYING when restarting the game + if (global.border_status == GAME_MODE_PSEUDO_RESTARTING) + global.border_status = GAME_MODE_PLAYING; + DrawMaskedBorderExt(REDRAW_ALL, draw_target); global.border_status = last_border_status; @@ -976,6 +980,10 @@ static void SetScreenStates_BeforeFadingOut(void) static void SetScreenStates_AfterFadingOut(void) { global.border_status = game_status; + + // always use global border for PLAYING when restarting the game + if (global.border_status == GAME_MODE_PSEUDO_RESTARTING) + global.border_status = GAME_MODE_PLAYING; } void FadeIn(int fade_mask)