rnd-20071012-1-src

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index efd320ee62e11ea9cc208e8552daf1a2171ae9ef..0d162f25ad657553682f4caef1220b34abab48f8 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -1141,7 +1141,10 @@ void DrawTitleScreenImage(int nr, boolean initial)
   ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE);
 
   if (DrawingOnBackground(dst_x, dst_y))
+  {
+    SetClipOrigin(bitmap, bitmap->stored_clip_gc, dst_x - src_x, dst_y - src_y);
     BlitBitmapMasked(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y);
+  }
   else
     BlitBitmap(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y);
 
@@ -1269,9 +1272,11 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
 
   /* needed if last screen was the editor screen */
   UndrawSpecialEditorDoor();
+#if 0
   if (fade_mask == REDRAW_FIELD)
     BackToFront();
 #endif
+#endif
 
 #if defined(TARGET_SDL)
   SetDrawtoField(DRAW_BACKBUFFER);
@@ -1291,6 +1296,7 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
     level_nr = leveldir_current->handicap_level;
 
   LoadLevel(level_nr);
+  LoadScore(level_nr);
 
   SetMainBackgroundImage(IMG_BACKGROUND_MAIN);
 
@@ -1346,6 +1352,12 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading)
   FadeIn(fade_mask);
   FadeSetEnterMenu();
 
+#if 1
+  /* update screen area with special editor door */
+  redraw_mask |= REDRAW_ALL;
+  BackToFront();
+#endif
+
   SetMouseCursor(CURSOR_DEFAULT);
 
   InitAnimation();
@@ -4194,6 +4206,7 @@ static struct TokenInfo setup_info_artwork[] =
   { TYPE_YES_NO, &setup.override_level_graphics,"Override Level Graphics:" },
   { TYPE_YES_NO, &setup.override_level_sounds, "Override Level Sounds:"   },
   { TYPE_YES_NO, &setup.override_level_music,  "Override Level Music:"    },
+  { TYPE_YES_NO, &setup.auto_override_artwork, "Auto-Override Non-CE Sets:" },
 #else
   { TYPE_STRING,       NULL,                   "Override Level Artwork:"},
   { TYPE_YES_NO,       &setup.override_level_graphics, "Graphics:"     },