fixed and enhanced screen fading and global border handling (continued)

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 58ebc1a3bb21d909979afd893191ba5a54dfcd8d..c30548161e2408565ff3ef6155217c6582c5f345 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -5204,16 +5204,19 @@ void InitGfx()
 
 void RedrawGlobalBorder()
 {
-  int global_border_graphic;
-
-  global_border_graphic =
+  int global_border_graphic =
     (game_status == GAME_MODE_MAIN ? IMG_GLOBAL_BORDER_MAIN :
      game_status == GAME_MODE_SCORES ? IMG_GLOBAL_BORDER_SCORES :
      game_status == GAME_MODE_EDITOR ? IMG_GLOBAL_BORDER_EDITOR :
      game_status == GAME_MODE_PLAYING ? IMG_GLOBAL_BORDER_PLAYING :
      IMG_GLOBAL_BORDER);
 
-  BlitBitmap(graphic_info[global_border_graphic].bitmap, backbuffer,
+  Bitmap *global_border_bitmap =
+    (graphic_info[global_border_graphic].bitmap ?
+     graphic_info[global_border_graphic].bitmap :
+     graphic_info[IMG_GLOBAL_BORDER].bitmap);
+
+  BlitBitmap(global_border_bitmap, backbuffer,
             0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 
   redraw_mask = REDRAW_ALL;