X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=0ed0b384c0200e3e9277a895e5f9e2afa88fdc2d;hb=56814df201c2d86273cf54e0e94c0448ce9bdd0f;hp=13a094e4382515427a99860c28d2e02fa962466e;hpb=ed5a795f1fd2d48a1372d46c06d86d2faab7e3c4;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 13a094e4..0ed0b384 100644 --- a/src/screens.c +++ b/src/screens.c @@ -756,7 +756,7 @@ static void InitializeTitleControls(boolean show_title_initial) { num_title_screens = 0; -#if 0 +#if 1 if (show_title_initial) InitializeTitleControls_CheckTitleInfo(TRUE); #endif @@ -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:" },