X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=a1126a7992b0b0f43c8ccfa4f4f2d0d99ef0f80b;hb=5c94351c5b8a12d8615b447b6275dd2f68615be4;hp=6f994a5321688f262bc1f75c89aa53246020bfc6;hpb=83542c237bd00dad76dcd103e0343d648418e765;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 6f994a53..a1126a79 100644 --- a/src/screens.c +++ b/src/screens.c @@ -599,12 +599,12 @@ static int getTitleMusic(struct TitleControlInfo *tci) return MUS_UNDEFINED; } -static struct TitleInfo getTitleFading(struct TitleControlInfo *tci) +static struct TitleFadingInfo getTitleFading(struct TitleControlInfo *tci) { boolean is_image = tci->is_image; int initial = tci->initial; int nr = tci->local_nr; - struct TitleInfo ti; + struct TitleFadingInfo ti; if (is_image) { @@ -614,8 +614,8 @@ static struct TitleInfo getTitleFading(struct TitleControlInfo *tci) ti = (initial ? title_initial_default : title_default); /* override default settings with image config settings, if defined */ - if (graphic_info[graphic].anim_mode != ANIM_DEFAULT) - ti.anim_mode = graphic_info[graphic].anim_mode; + if (graphic_info[graphic].fade_mode != FADE_MODE_DEFAULT) + ti.fade_mode = graphic_info[graphic].fade_mode; if (graphic_info[graphic].fade_delay > -1) ti.fade_delay = graphic_info[graphic].fade_delay; if (graphic_info[graphic].post_delay > -1) @@ -627,22 +627,24 @@ static struct TitleInfo getTitleFading(struct TitleControlInfo *tci) { if (initial) { - ti.anim_mode = titlemessage_initial[nr].anim_mode; + ti.fade_mode = titlemessage_initial[nr].fade_mode; ti.fade_delay = titlemessage_initial[nr].fade_delay; ti.post_delay = titlemessage_initial[nr].post_delay; ti.auto_delay = titlemessage_initial[nr].auto_delay; } else { - ti.anim_mode = titlemessage[nr].anim_mode; + ti.fade_mode = titlemessage[nr].fade_mode; ti.fade_delay = titlemessage[nr].fade_delay; ti.post_delay = titlemessage[nr].post_delay; ti.auto_delay = titlemessage[nr].auto_delay; } } +#if 0 if (ti.anim_mode == ANIM_NONE) ti.fade_delay = ti.post_delay = 0; +#endif return ti; } @@ -1228,6 +1230,15 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) title = title_default; #endif +#if 0 + printf("::: %d, %d\n", fading.anim_mode == ANIM_CROSSFADE, + redraw_mask == REDRAW_ALL); +#endif + +#if 1 + FadeOut(redraw_mask); +#endif + UnmapAllGadgets(); FadeSoundsAndMusic(); @@ -1273,9 +1284,9 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) SetDrawtoField(DRAW_BACKBUFFER); #endif -#if 1 +#if 0 if (levelset_has_changed) - title = title_default; + fading = title_default; #endif #if 1 @@ -1313,6 +1324,32 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) LoadLevel(level_nr); SetMainBackgroundImage(IMG_BACKGROUND_MAIN); + +#if 0 + FadeOut(redraw_mask); +#endif + +#if 1 + if (redraw_mask == REDRAW_ALL) + { +#if 0 + int door_state = GetDoorState(); +#endif + + RedrawBackground(); + + // OpenDoor(door_state | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); + +#if 0 +#if 1 + OpenDoor(DOOR_NO_DELAY | DOOR_FORCE_REDRAW); +#else + OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); +#endif +#endif + } +#endif + ClearWindow(); #if 1 @@ -1402,16 +1439,33 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) FreeScreenGadgets(); CreateScreenGadgets(); +#if 0 + BlitBitmap(drawto, window, VX, VY, VXSIZE, VYSIZE, VX, VY); + Delay(3000); +#endif + /* map gadgets for main menu screen */ MapTapeButtons(); MapScreenMenuGadgets(SCREEN_MASK_MAIN); DrawMaskedBorder(REDRAW_ALL); +#if 1 + if (redraw_mask == REDRAW_ALL) + { + int door_state = GetDoorState(); + + OpenDoor(door_state | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); + } +#endif + +#if 1 + FadeIn(redraw_mask); +#else #if 1 if (!do_fading) BackToFront(); - else if (title.anim_mode == ANIM_CROSSFADE) + else if (fading.anim_mode == ANIM_CROSSFADE) FadeCross(redraw_mask); else FadeIn(redraw_mask); @@ -1421,9 +1475,12 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) else BackToFront(); #endif +#endif #if 1 - title = title_default; + FadeSetEnterMenu(); +#else + fading = title_default; #endif SetMouseCursor(CURSOR_DEFAULT); @@ -1489,11 +1546,16 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) #endif #endif struct TitleControlInfo *tci; - struct TitleInfo title_fading_next; + struct TitleFadingInfo fading_last = fading; + struct TitleFadingInfo fading_next; int sound, music; if (button == MB_MENU_INITIALIZE) { +#if 0 + boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE); +#endif + #if 0 int last_game_status = game_status; /* save current game status */ #endif @@ -1518,15 +1580,17 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) "No title screen for this level set."); /* use default settings for fading, but always disable auto delay */ - title = title_default; - title.auto_delay = -1; + fading = title_default; + fading.auto_delay = -1; return; } FadeSoundsAndMusic(); +#if 1 FadeOut(REDRAW_ALL); +#endif } if (tci->is_image) @@ -1534,7 +1598,11 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) else DrawTitleScreenMessage(tci->local_nr, tci->initial); - title = getTitleFading(tci); + fading = fading_next = getTitleFading(tci); + + if (fading_last.fade_mode != FADE_MODE_CROSSFADE && + fading_next.fade_mode == FADE_MODE_CROSSFADE) + fading.fade_mode = FADE_MODE_FADE; #if 1 sound = getTitleSound(tci); @@ -1551,14 +1619,18 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) SetMouseCursor(CURSOR_NONE); +#if 1 FadeIn(REDRAW_ALL); +#endif + + fading = fading_next; DelayReached(&title_delay, 0); /* reset delay counter */ return; } - if (title.auto_delay > -1 && DelayReached(&title_delay, title.auto_delay)) + if (fading.auto_delay > -1 && DelayReached(&title_delay, fading.auto_delay)) button = MB_MENU_CHOICE; if (button == MB_MENU_LEAVE) @@ -1568,13 +1640,17 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) } else if (button == MB_MENU_CHOICE) { -#if 1 - boolean use_cross_fading = (title.anim_mode == ANIM_CROSSFADE); +#if 0 + boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE); #endif if (game_status == GAME_MODE_INFO && num_title_screens == 0) { +#if 0 FadeOut(REDRAW_FIELD); +#endif + + FadeSetStartItem(); info_mode = INFO_MODE_MAIN; DrawAndFadeInInfoScreen(REDRAW_FIELD); @@ -1589,7 +1665,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) { #if 1 #if 0 - boolean use_cross_fading = (title.anim_mode == ANIM_CROSSFADE); + boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE); #endif #else int anim_mode; @@ -1614,17 +1690,16 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) if (music == MUS_UNDEFINED || music != last_music) FadeMusic(); - if (use_cross_fading) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_ALL); +#if 1 + FadeOut(REDRAW_ALL); +#endif if (tci->is_image) DrawTitleScreenImage(tci->local_nr, tci->initial); else DrawTitleScreenMessage(tci->local_nr, tci->initial); - title_fading_next = getTitleFading(tci); + fading_next = getTitleFading(tci); #if 1 sound = getTitleSound(tci); @@ -1639,16 +1714,20 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) last_music = music; #endif +#if 0 + printf("::: %d -> %d\n", fading.fade_mode, fading_next.fade_mode); +#endif + /* last screen already faded out, next screen has no animation */ - if (!use_cross_fading && title_fading_next.anim_mode == ANIM_NONE) - title = title_fading_next; + if (fading.fade_mode != FADE_MODE_CROSSFADE && + fading_next.fade_mode == FADE_MODE_NONE) + fading = fading_next; - if (use_cross_fading) - FadeCross(REDRAW_ALL); - else - FadeIn(REDRAW_ALL); +#if 1 + FadeIn(REDRAW_ALL); +#endif - title = title_fading_next; + fading = fading_next; DelayReached(&title_delay, 0); /* reset delay counter */ } @@ -1656,19 +1735,20 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) { FadeSoundsAndMusic(); +#if 0 #if 1 { #if 0 - boolean use_cross_fading = (title.anim_mode == ANIM_CROSSFADE); + boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE); #endif - if (use_cross_fading) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_ALL); +#if 1 + FadeOut(REDRAW_ALL); +#endif } #else FadeOut(REDRAW_ALL); +#endif #endif return_to_main_menu = TRUE; @@ -1677,20 +1757,26 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) if (return_to_main_menu) { +#if 0 RedrawBackground(); +#endif SetMouseCursor(CURSOR_DEFAULT); if (game_status == GAME_MODE_INFO) { +#if 0 OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); +#endif info_mode = INFO_MODE_MAIN; DrawInfoScreenExt(REDRAW_ALL, use_fading_main_menu); } else /* default: return to main menu */ { +#if 0 OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); +#endif game_status = GAME_MODE_MAIN; DrawMainMenuExt(REDRAW_ALL, use_fading_main_menu); @@ -1848,6 +1934,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) game_status = GAME_MODE_EDITOR; + FadeSetStartItem(); + DrawLevelEd(); } else if (pos == MAIN_CONTROL_INFO) @@ -1855,6 +1943,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) game_status = GAME_MODE_INFO; info_mode = INFO_MODE_MAIN; +#if 0 + fading = menu.navigation; +#endif + DrawInfoScreen(); } else if (pos == MAIN_CONTROL_GAME) @@ -2018,50 +2110,86 @@ static int num_info_info; static void execInfoTitleScreen() { +#if 0 + FadeSetStartItem(); +#endif + info_mode = INFO_MODE_TITLE; DrawInfoScreen(); } static void execInfoElements() { +#if 0 + FadeSetStartItem(); +#endif + info_mode = INFO_MODE_ELEMENTS; DrawInfoScreen(); } static void execInfoMusic() { +#if 0 + FadeSetStartItem(); +#endif + info_mode = INFO_MODE_MUSIC; DrawInfoScreen(); } static void execInfoCredits() { +#if 0 + FadeSetStartItem(); +#endif + info_mode = INFO_MODE_CREDITS; DrawInfoScreen(); } static void execInfoProgram() { +#if 0 + FadeSetStartItem(); +#endif + info_mode = INFO_MODE_PROGRAM; DrawInfoScreen(); } static void execInfoVersion() { +#if 0 + FadeSetStartItem(); +#endif + info_mode = INFO_MODE_VERSION; DrawInfoScreen(); } static void execInfoLevelSet() { +#if 0 + FadeSetStartItem(); +#endif + info_mode = INFO_MODE_LEVELSET; DrawInfoScreen(); } static void execExitInfo() { +#if 0 + FadeSetLeaveMenu(); +#endif + game_status = GAME_MODE_MAIN; +#if 1 + DrawMainMenuExt(REDRAW_FIELD, FALSE); +#else DrawMainMenu(); +#endif } static struct TokenInfo info_info_main[] = @@ -2101,6 +2229,18 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading) UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); +#if 1 + FadeOut(redraw_mask); +#endif + +#if 1 + if (redraw_mask == REDRAW_ALL) + { + RedrawBackground(); + OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); + } +#endif + ClearWindow(); DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Info Screen"); @@ -2137,12 +2277,15 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading) PlayMenuSound(); PlayMenuMusic(); - DrawMaskedBorder(REDRAW_ALL); + DrawMaskedBorder(redraw_mask); +#if 1 + FadeIn(redraw_mask); +#else #if 1 if (!do_fading) BackToFront(); - else if (title.anim_mode == ANIM_CROSSFADE) + else if (fading.anim_mode == ANIM_CROSSFADE) FadeCross(redraw_mask); else FadeIn(redraw_mask); @@ -2151,6 +2294,7 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading) FadeIn(redraw_mask); else BackToFront(); +#endif #endif InitAnimation(); @@ -2187,6 +2331,8 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button) { void (*menu_callback_function)(void) = info_info[y].value; + FadeSetLeaveMenu(); + menu_callback_function(); break; /* absolutely needed because function changes 'info_info'! */ @@ -2249,6 +2395,8 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button) { void (*menu_callback_function)(void) = info_info[choice].value; + FadeSetFromType(info_info[y].type); + menu_callback_function(); } } @@ -2269,7 +2417,9 @@ void DrawInfoScreen_NotAvailable(char *text_title, char *text_error) SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET); +#if 1 FadeOut(REDRAW_FIELD); +#endif ClearWindow(); DrawHeadline(); @@ -2280,7 +2430,9 @@ void DrawInfoScreen_NotAvailable(char *text_title, char *text_error) DrawTextSCentered(ybottom, FONT_TEXT_4, "Press any key or button for info menu"); +#if 1 FadeIn(REDRAW_FIELD); +#endif } void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) @@ -2469,14 +2621,18 @@ void DrawInfoScreen_Elements() { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS); +#if 1 FadeOut(REDRAW_FIELD); +#endif LoadHelpAnimInfo(); LoadHelpTextInfo(); HandleInfoScreen_Elements(MB_MENU_INITIALIZE); +#if 1 FadeIn(REDRAW_FIELD); +#endif InitAnimation(); } @@ -2532,7 +2688,10 @@ void HandleInfoScreen_Elements(int button) if (page >= num_pages) { FadeSoundsAndMusic(); + +#if 0 FadeOut(REDRAW_FIELD); +#endif info_mode = INFO_MODE_MAIN; DrawAndFadeInInfoScreen(REDRAW_FIELD); @@ -2562,7 +2721,9 @@ void DrawInfoScreen_Music() { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC); +#if 1 FadeOut(REDRAW_FIELD); +#endif ClearWindow(); DrawHeadline(); @@ -2571,7 +2732,9 @@ void DrawInfoScreen_Music() HandleInfoScreen_Music(MB_MENU_INITIALIZE); +#if 1 FadeIn(REDRAW_FIELD); +#endif } void HandleInfoScreen_Music(int button) @@ -2629,7 +2792,10 @@ void HandleInfoScreen_Music(int button) if (list == NULL) { FadeSoundsAndMusic(); + +#if 0 FadeOut(REDRAW_FIELD); +#endif info_mode = INFO_MODE_MAIN; DrawAndFadeInInfoScreen(REDRAW_FIELD); @@ -2895,11 +3061,15 @@ void DrawInfoScreen_Credits() FadeSoundsAndMusic(); +#if 1 FadeOut(REDRAW_FIELD); +#endif HandleInfoScreen_Credits(MB_MENU_INITIALIZE); +#if 1 FadeIn(REDRAW_FIELD); +#endif } void HandleInfoScreen_Credits(int button) @@ -2940,7 +3110,10 @@ void HandleInfoScreen_Credits(int button) else { FadeSoundsAndMusic(); + +#if 0 FadeOut(REDRAW_FIELD); +#endif info_mode = INFO_MODE_MAIN; DrawAndFadeInInfoScreen(REDRAW_FIELD); @@ -2961,7 +3134,9 @@ void DrawInfoScreen_Program() SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM); +#if 1 FadeOut(REDRAW_FIELD); +#endif ClearWindow(); DrawHeadline(); @@ -2998,7 +3173,9 @@ void DrawInfoScreen_Program() DrawTextSCentered(ybottom, FONT_TEXT_4, "Press any key or button for info menu"); +#if 1 FadeIn(REDRAW_FIELD); +#endif } void HandleInfoScreen_Program(int button) @@ -3017,7 +3194,10 @@ void HandleInfoScreen_Program(int button) PlaySound(SND_MENU_ITEM_SELECTING); FadeSoundsAndMusic(); + +#if 0 FadeOut(REDRAW_FIELD); +#endif info_mode = INFO_MODE_MAIN; DrawAndFadeInInfoScreen(REDRAW_FIELD); @@ -3049,7 +3229,9 @@ void DrawInfoScreen_Version() SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION); +#if 1 FadeOut(REDRAW_FIELD); +#endif ClearWindow(); DrawHeadline(); @@ -3160,7 +3342,9 @@ void DrawInfoScreen_Version() DrawTextSCentered(ybottom, FONT_TEXT_4, "Press any key or button for info menu"); +#if 1 FadeIn(REDRAW_FIELD); +#endif } void HandleInfoScreen_Version(int button) @@ -3179,7 +3363,10 @@ void HandleInfoScreen_Version(int button) PlaySound(SND_MENU_ITEM_SELECTING); FadeSoundsAndMusic(); + +#if 0 FadeOut(REDRAW_FIELD); +#endif info_mode = INFO_MODE_MAIN; DrawAndFadeInInfoScreen(REDRAW_FIELD); @@ -3209,7 +3396,9 @@ void DrawInfoScreen_LevelSet() SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET); +#if 1 FadeOut(REDRAW_FIELD); +#endif ClearWindow(); DrawHeadline(); @@ -3227,7 +3416,9 @@ void DrawInfoScreen_LevelSet() DrawTextCentered(mSY + SYSIZE - 20, FONT_TEXT_4, "Press any key or button for info menu"); +#if 1 FadeIn(REDRAW_FIELD); +#endif } void HandleInfoScreen_LevelSet(int button) @@ -3246,7 +3437,10 @@ void HandleInfoScreen_LevelSet(int button) PlaySound(SND_MENU_ITEM_SELECTING); FadeSoundsAndMusic(); + +#if 0 FadeOut(REDRAW_FIELD); +#endif info_mode = INFO_MODE_MAIN; DrawAndFadeInInfoScreen(REDRAW_FIELD); @@ -3294,7 +3488,7 @@ void DrawAndFadeInInfoScreen(int redraw_mask) void DrawInfoScreen() { - DrawInfoScreenExt(REDRAW_ALL, FALSE); + DrawInfoScreenExt(REDRAW_FIELD, FALSE); } void HandleInfoScreen(int mx, int my, int dx, int dy, int button) @@ -3460,12 +3654,19 @@ static void DrawChooseTree(TreeInfo **ti_ptr) CloseDoor(DOOR_CLOSE_2); +#if 1 + FadeOut(REDRAW_FIELD); +#endif + ClearWindow(); HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr); MapScreenTreeGadgets(*ti_ptr); - FadeToFront(); +#if 1 + FadeIn(REDRAW_FIELD); +#endif + InitAnimation(); } @@ -3640,6 +3841,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, } else if (button == MB_MENU_LEAVE) { + FadeSetLeaveMenu(); + PlaySound(SND_MENU_ITEM_SELECTING); if (ti->node_parent) @@ -3659,7 +3862,11 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, else { game_status = GAME_MODE_MAIN; +#if 1 + DrawMainMenuExt(REDRAW_FIELD, FALSE); +#else DrawMainMenu(); +#endif } return; @@ -3741,6 +3948,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, if (node_cursor->node_group) { + FadeSetEnterMenu(); + PlaySound(SND_MENU_ITEM_SELECTING); node_cursor->cl_first = ti->cl_first; @@ -3753,6 +3962,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, } else if (dx == -1 && ti->node_parent) { + FadeSetLeaveMenu(); + PlaySound(SND_MENU_ITEM_SELECTING); *ti_ptr = ti->node_parent; @@ -3791,6 +4002,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, if (node_cursor->node_group) { + FadeSetEnterMenu(); + node_cursor->cl_first = ti->cl_first; node_cursor->cl_cursor = ti->cl_cursor; *ti_ptr = node_cursor->node_group; @@ -3798,11 +4011,15 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, } else if (node_cursor->parent_link) { + FadeSetLeaveMenu(); + *ti_ptr = node_cursor->node_parent; DrawChooseTree(ti_ptr); } else { + FadeSetStartItem(); + node_cursor->cl_first = ti->cl_first; node_cursor->cl_cursor = ti->cl_cursor; *ti_ptr = node_cursor; @@ -3870,7 +4087,11 @@ void DrawHallOfFame(int highlight_position) if (highlight_position < 0) LoadScore(level_nr); + FadeSetStartItem(); + +#if 1 FadeOut(REDRAW_FIELD); +#endif InitAnimation(); @@ -3879,7 +4100,9 @@ void DrawHallOfFame(int highlight_position) HandleHallOfFame(highlight_position, 0, 0, 0, MB_MENU_INITIALIZE); +#if 1 FadeIn(REDRAW_FIELD); +#endif } static void drawHallOfFameList(int first_entry, int highlight_position) @@ -3974,7 +4197,10 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) PlaySound(SND_MENU_ITEM_SELECTING); FadeSound(SND_BACKGROUND_SCORES); + +#if 0 FadeOut(REDRAW_FIELD); +#endif game_status = GAME_MODE_MAIN; @@ -4003,12 +4229,20 @@ static char *music_set_name; static void execSetupMain() { +#if 0 + FadeSetLeaveMenu(); +#endif + setup_mode = SETUP_MODE_MAIN; DrawSetupScreen(); } static void execSetupGame() { +#if 0 + FadeSetEnterMenu(); +#endif + if (game_speeds == NULL) { int i; @@ -4062,18 +4296,30 @@ static void execSetupGame() static void execSetupChooseGameSpeed() { +#if 0 + FadeSetEnterMenu(); +#endif + setup_mode = SETUP_MODE_CHOOSE_GAME_SPEED; DrawSetupScreen(); } static void execSetupEditor() { +#if 0 + FadeSetEnterMenu(); +#endif + setup_mode = SETUP_MODE_EDITOR; DrawSetupScreen(); } static void execSetupGraphics() { +#if 0 + FadeSetEnterMenu(); +#endif + if (video.fullscreen_available && screen_modes == NULL) { int i; @@ -4136,6 +4382,10 @@ static void execSetupGraphics() static void execSetupChooseScreenMode() { +#if 0 + FadeSetEnterMenu(); +#endif + if (!video.fullscreen_available) return; @@ -4145,12 +4395,20 @@ static void execSetupChooseScreenMode() static void execSetupSound() { +#if 0 + FadeSetEnterMenu(); +#endif + setup_mode = SETUP_MODE_SOUND; DrawSetupScreen(); } static void execSetupArtwork() { +#if 0 + FadeSetEnterMenu(); +#endif + setup.graphics_set = artwork.gfx_current->identifier; setup.sounds_set = artwork.snd_current->identifier; setup.music_set = artwork.mus_current->identifier; @@ -4169,44 +4427,76 @@ static void execSetupArtwork() static void execSetupChooseGraphics() { +#if 0 + FadeSetEnterMenu(); +#endif + setup_mode = SETUP_MODE_CHOOSE_GRAPHICS; DrawSetupScreen(); } static void execSetupChooseSounds() { +#if 0 + FadeSetEnterMenu(); +#endif + setup_mode = SETUP_MODE_CHOOSE_SOUNDS; DrawSetupScreen(); } static void execSetupChooseMusic() { +#if 0 + FadeSetEnterMenu(); +#endif + setup_mode = SETUP_MODE_CHOOSE_MUSIC; DrawSetupScreen(); } static void execSetupInput() { +#if 0 + FadeSetEnterMenu(); +#endif + setup_mode = SETUP_MODE_INPUT; DrawSetupScreen(); } static void execSetupShortcut1() { +#if 0 + FadeSetEnterMenu(); +#endif + setup_mode = SETUP_MODE_SHORTCUT_1; DrawSetupScreen(); } static void execSetupShortcut2() { +#if 0 + FadeSetEnterMenu(); +#endif + setup_mode = SETUP_MODE_SHORTCUT_2; DrawSetupScreen(); } static void execExitSetup() { +#if 0 + FadeSetLeaveMenu(); +#endif + game_status = GAME_MODE_MAIN; +#if 1 + DrawMainMenuExt(REDRAW_FIELD, FALSE); +#else DrawMainMenu(); +#endif } static void execSaveAndExitSetup() @@ -4601,6 +4891,10 @@ static void DrawSetupScreen_Generic() UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); +#if 1 + FadeOut(REDRAW_FIELD); +#endif + ClearWindow(); if (setup_mode == SETUP_MODE_MAIN) @@ -4691,9 +4985,18 @@ static void DrawSetupScreen_Generic() "Joysticks deactivated in setup menu"); #endif - FadeToFront(); +#if 1 + HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE); +#endif + +#if 1 + FadeIn(REDRAW_FIELD); +#endif + InitAnimation(); +#if 0 HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE); +#endif } void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) @@ -4729,6 +5032,8 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) { void (*menu_callback_function)(void) = setup_info[y].value; + FadeSetLeaveMenu(); + menu_callback_function(); break; /* absolutely needed because function changes 'setup_info'! */ @@ -4799,6 +5104,8 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) { void (*menu_callback_function)(void) = setup_info[y].value; + FadeSetFromType(setup_info[y].type); + menu_callback_function(); } else @@ -4816,6 +5123,10 @@ void DrawSetupScreen_Input() int i; #endif +#if 1 + FadeOut(REDRAW_FIELD); +#endif + ClearWindow(); #if 1 @@ -4863,7 +5174,11 @@ void DrawSetupScreen_Input() MapScreenMenuGadgets(SCREEN_MASK_INPUT); HandleSetupScreen_Input(0, 0, 0, 0, MB_MENU_INITIALIZE); - FadeToFront(); + +#if 1 + FadeIn(REDRAW_FIELD); +#endif + InitAnimation(); } @@ -5105,6 +5420,8 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) { InitJoysticks(); + FadeSetLeaveMenu(); + setup_mode = SETUP_MODE_MAIN; DrawSetupScreen(); } @@ -5135,12 +5452,17 @@ void CustomizeKeyboard(int player_nr) /* read existing key bindings from player setup */ custom_key = setup.input[player_nr].key; + FadeSetEnterMenu(); + FadeOut(REDRAW_FIELD); + ClearWindow(); DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Keyboard Input"); +#if 0 BackToFront(); InitAnimation(); +#endif step_nr = 0; DrawText(mSX, mSY + (2 + 2 * step_nr) * 32, @@ -5150,6 +5472,12 @@ void CustomizeKeyboard(int player_nr) DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32, getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD); +#if 1 + FadeIn(REDRAW_FIELD); + + InitAnimation(); +#endif + while (!finished) { if (PendingEvent()) /* got event */ @@ -5166,6 +5494,9 @@ void CustomizeKeyboard(int player_nr) if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6)) { + if (key == KSYM_Escape) + FadeSkipNextFadeIn(); + finished = TRUE; break; } @@ -5264,6 +5595,9 @@ static boolean CalibrateJoystickMain(int player_nr) if (joystick_fd < 0 || !setup.input[player_nr].use_joystick) return FALSE; + FadeSetEnterMenu(); + FadeOut(REDRAW_FIELD); + ClearWindow(); for (y = 0; y < 3; y++) @@ -5295,7 +5629,12 @@ static boolean CalibrateJoystickMain(int player_nr) new_joystick_ymiddle = joy_y; DrawGraphic(xpos + last_x, ypos + last_y, IMG_MENU_CALIBRATE_RED, 0); + +#if 1 + FadeIn(REDRAW_FIELD); +#else BackToFront(); +#endif while (Joystick(player_nr) & JOY_BUTTON); /* wait for released button */ InitAnimation(); @@ -5319,6 +5658,7 @@ static boolean CalibrateJoystickMain(int player_nr) break; case KSYM_Escape: + FadeSkipNextFadeIn(); result = 0; break;