rnd-20070925-1-src

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index e4e8236e655e6331de9ffc144a1d267ee41fd658..0ed0b384c0200e3e9277a895e5f9e2afa88fdc2d 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -1269,6 +1269,10 @@ 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)
@@ -1289,6 +1293,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);
 
@@ -1344,6 +1349,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();
@@ -4192,6 +4203,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.override_classic_artwork,"Override Classic Artwork:" },
 #else
   { TYPE_STRING,       NULL,                   "Override Level Artwork:"},
   { TYPE_YES_NO,       &setup.override_level_graphics, "Graphics:"     },