rnd-20131209-1-src

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 307350325c759bfecd14640cc8027f120e3ca1f6..c2344a507175af8ce42059a4d563ca8c35cada54 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -5644,91 +5644,6 @@ void InitGfx()
 
   font_height = getFontHeight(FC_RED);
 
-
-
-
-
-
-
-
-
-#if 0
-  Delay(1000);
-
-#if 0
-  Bitmap new_bitmap;
-  printf("::: MARK 1.1\n");
-  new_bitmap.surface = SDL_LoadBMP("TEST.bmp");
-  printf("::: MARK 1.2\n");
-#endif
-
-  char *filename = getCustomImageFilename("RocksFontSmall.pcx");
-
-  printf("::: FILENAME == '%s'\n", filename);
-
-#if 1
-  Bitmap *new_bitmap = LoadImage(filename);
-#else
-#if 1
-  Bitmap *new_bitmap = CreateBitmapStruct();
-  SDL_Surface *sdl_image_tmp;
-  sdl_image_tmp = IMG_Load(filename);
-  new_bitmap->surface = SDL_DisplayFormat(sdl_image_tmp);
-
-#else
-  SDL_Surface *sdl_image_tmp = IMG_Load(filename);
-  SDL_Surface *sdl_image = SDL_DisplayFormat(sdl_image_tmp);
-#endif
-#endif
-
-  // SDL_Surface *image = SDL_LoadBMP("TEST.bmp");
-  // SDL_LoadBMP("TEST.bmp");
-
-  // bitmap_font_initial->surface = SDL_LoadBMP("TEST.bmp");
-
-#if 0
-  printf("::: MARK 1 [%08x, %08xd]\n",
-        (unsigned int)bitmap_font_initial->surface,
-        (unsigned int)backbuffer->surface);
-#endif
-
-  // SDL_BlitSurface(image, NULL, backbuffer->surface, NULL);
-  // SDL_BlitSurface(new_bitmap.surface, NULL,backbuffer->surface, NULL);
-  SDL_BlitSurface(new_bitmap->surface, NULL,backbuffer->surface, NULL);
-  // SDL_BlitSurface(sdl_image, NULL,backbuffer->surface, NULL);
-  // SDL_BlitSurface(bitmap_font_initial->surface, NULL,backbuffer->surface, NULL);
-
-#if 0
-  printf("::: MARK 1 [%08x, %08xd, %08xd]\n",
-        (unsigned int)bitmap_font_initial->surface,
-        (unsigned int)backbuffer->surface,
-        (unsigned int)image);
-#endif
-
-  extern SDL_Window *sdl_window;
-  SDL_UpdateWindowSurface(sdl_window);
-
-#if 1
-#if 0
-  SDL_BlitSurface(bitmap_font_initial->surface, NULL,backbuffer->surface, NULL);
-#endif
-  // SDL_UpdateWindowSurface(sdl_window);
-
-  Delay(1000);
-  exit(0);
-#endif
-#endif
-
-
-
-
-
-
-
-
-
-
-
 #if 1
   DrawInitText(getWindowTitleString(), 20, FC_YELLOW);
 #else
@@ -6363,6 +6278,10 @@ void KeyboardAutoRepeatOffUnlessAutoplay()
 
 void DisplayExitMessage(char *format, va_list ap)
 {
+  // check if draw buffer and fonts for exit message are already available
+  if (drawto == NULL || font_initial[NUM_INITIAL_FONTS - 1].bitmap == NULL)
+    return;
+
   int font_1 = FC_RED;
   int font_2 = FC_YELLOW;
   int font_3 = FC_BLUE;