X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=922fc11afb2cd0d70f112d3fd8a6b5a37754f38e;hb=ec5f4027a019ebf435b41577ab1234849c77a059;hp=149b4ef2709e0ef6d6d26cf17cf798c897f85b88;hpb=a56f43284d320b60cbeb1ebd097ec6d21d4f4ff1;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 149b4ef2..922fc11a 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1136,6 +1136,7 @@ static void set_graphic_parameters_ext(int graphic, int *parameter,
   g->anim_delay_random = 0;
   g->post_delay_fixed = 0;
   g->post_delay_random = 0;
+  g->draw_order = 0;
   g->fade_mode = FADE_MODE_DEFAULT;
   g->fade_delay = -1;
   g->post_delay = -1;
@@ -1369,7 +1370,8 @@ static void set_graphic_parameters_ext(int graphic, int *parameter,
   g->draw_masked = parameter[GFX_ARG_DRAW_MASKED];
 
   /* used for toon animations and global animations */
-  g->draw_order = parameter[GFX_ARG_DRAW_ORDER];
+  if (parameter[GFX_ARG_DRAW_ORDER] != ARG_UNDEFINED_VALUE)
+    g->draw_order = parameter[GFX_ARG_DRAW_ORDER];
 
   /* optional graphic for cloning all graphics settings */
   if (parameter[GFX_ARG_CLONE_FROM] != ARG_UNDEFINED_VALUE)
@@ -5325,6 +5327,8 @@ void InitGfx()
   InitGfxDrawGlobalAnimFunction(DrawGlobalAnim);
   InitGfxDrawGlobalBorderFunction(DrawMaskedBorderToTarget);
 
+  gfx.fade_border_source_status = global.border_status;
+  gfx.fade_border_target_status = global.border_status;
   gfx.masked_border_bitmap_ptr = backbuffer;
 
   /* use copy of busy animation to prevent change while reloading artwork */