rnd-20070401-1-src

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 0a9e79672ff10de7ae037fafbb5c5a84a45ec675..08177e1b3cd22e520f2451d5649d1702d0b7e05c 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -4851,10 +4851,14 @@ void InitGfxBackground()
   fieldbuffer = bitmap_db_field;
   SetDrawtoField(DRAW_BACKBUFFER);
 
+#if 1
+  ClearRectangle(backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE);
+#else
   RedrawBackground();
 
   ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
   ClearRectangle(bitmap_db_door, 0, 0, 3 * DXSIZE, DYSIZE + VYSIZE);
+#endif
 
   for (x = 0; x < MAX_BUF_XSIZE; x++)
     for (y = 0; y < MAX_BUF_YSIZE; y++)
@@ -5117,7 +5121,7 @@ void ReloadCustomArtwork(int force_reload)
 
 #if 1
 #if 1
-    FadeSetStartItem();
+    FadeSetEnterScreen();
     // FadeSkipNextFadeOut();
     // FadeSetDisabled();
 #else
@@ -5210,16 +5214,17 @@ void OpenAll()
     return;
   }
 
+  game_status = GAME_MODE_MAIN;
+
 #if 1
-  FadeSetStartItem();
-  FadeSkipNextFadeOut();
+  FadeSetEnterScreen();
+  if (!(fading.fade_mode & FADE_TYPE_TRANSFORM))
+    FadeSkipNextFadeOut();
   // FadeSetDisabled();
 #else
   fading = fading_none;
 #endif
 
-  game_status = GAME_MODE_MAIN;
-
   DrawMainMenu();
 
   InitNetworkServer();