X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=97b32f42ef5891a96c93fb4c63a2e049e7cbfcae;hb=58514a5b4392fa9501fced41921157633927ea94;hp=6b96420a5b364ddf7ca0c7f1407354778c429508;hpb=884012f34f9f3c22bf75d1468e4ed57d7795a24b;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 6b96420a..97b32f42 100644 --- a/src/screens.c +++ b/src/screens.c @@ -35,13 +35,14 @@ #define SETUP_MODE_SHORTCUT_2 6 #define SETUP_MODE_GRAPHICS 7 #define SETUP_MODE_CHOOSE_SCREEN_MODE 8 -#define SETUP_MODE_SOUND 9 -#define SETUP_MODE_ARTWORK 10 -#define SETUP_MODE_CHOOSE_GRAPHICS 11 -#define SETUP_MODE_CHOOSE_SOUNDS 12 -#define SETUP_MODE_CHOOSE_MUSIC 13 +#define SETUP_MODE_CHOOSE_SCROLL_DELAY 9 +#define SETUP_MODE_SOUND 10 +#define SETUP_MODE_ARTWORK 11 +#define SETUP_MODE_CHOOSE_GRAPHICS 12 +#define SETUP_MODE_CHOOSE_SOUNDS 13 +#define SETUP_MODE_CHOOSE_MUSIC 14 -#define MAX_SETUP_MODES 14 +#define MAX_SETUP_MODES 15 /* for input setup functions */ #define SETUPINPUT_SCREEN_POS_START 0 @@ -170,6 +171,9 @@ static int info_mode = INFO_MODE_MAIN; static TreeInfo *screen_modes = NULL; static TreeInfo *screen_mode_current = NULL; +static TreeInfo *scroll_delays = NULL; +static TreeInfo *scroll_delay_current = NULL; + static TreeInfo *game_speeds = NULL; static TreeInfo *game_speed_current = NULL; @@ -204,7 +208,24 @@ static struct { -1, NULL }, }; -#define XFADE 1 +static struct +{ + int value; + char *text; +} scroll_delays_list[] = +{ + { 0, "0 Tiles (No Scroll Delay)" }, + { 1, "1 Tile" }, + { 2, "2 Tiles" }, + { 3, "3 Tiles (Default)" }, + { 4, "4 Tiles" }, + { 5, "5 Tiles" }, + { 6, "6 Tiles" }, + { 7, "7 Tiles" }, + { 8, "8 Tiles (Maximum Scroll Delay)"}, + + { -1, NULL }, +}; #define DRAW_MODE(s) ((s) >= GAME_MODE_MAIN && \ (s) <= GAME_MODE_SETUP ? (s) : \ @@ -616,8 +637,8 @@ static struct TitleFadingInfo 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) @@ -629,14 +650,14 @@ static struct TitleFadingInfo 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; @@ -737,9 +758,13 @@ static void InitializeMainControls() /* set main control text values to dynamically determined values */ sprintf(main_text_name, "%s", local_team_mode ? "Team:" : "Name:"); - sprintf(main_text_first_level, "%03d", leveldir_current->first_level); - sprintf(main_text_last_level, "%03d", leveldir_current->last_level); - sprintf(main_text_level_number, "%s", int2str(level_nr, 3)); + + strcpy(main_text_first_level, int2str(leveldir_current->first_level, + menu.main.text.first_level.size)); + strcpy(main_text_last_level, int2str(leveldir_current->last_level, + menu.main.text.last_level.size)); + strcpy(main_text_level_number, int2str(level_nr, + menu.main.text.level_number.size)); main_text_level_year = leveldir_current->year; main_text_level_imported_from = leveldir_current->imported_from; @@ -1232,18 +1257,30 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) title = title_default; #endif +#if 0 + { + int graphicA = element_info[EL_EM_DYNAMITE_ACTIVE].special_graphic[GFX_SPECIAL_ARG_EDITOR]; + int graphicB = element_info[EL_EM_DYNAMITE_ACTIVE].special_graphic[GFX_SPECIAL_ARG_PANEL]; + int graphic1 = element_info[EL_CONVEYOR_BELT_1_MIDDLE].special_graphic[GFX_SPECIAL_ARG_EDITOR]; + int graphic2 = element_info[EL_CONVEYOR_BELT_1_MIDDLE_ACTIVE].special_graphic[GFX_SPECIAL_ARG_EDITOR]; + + printf("::: %d [%d] -> %d, %d [%d, %d]\n", + graphicA, graphicB, + graphic_info[graphicA].src_x, + graphic_info[graphicA].src_y, + graphic1, graphic2); + } +#endif + #if 0 printf("::: %d, %d\n", fading.anim_mode == ANIM_CROSSFADE, redraw_mask == REDRAW_ALL); #endif + FadeSetLeaveScreen(); + #if 1 -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(redraw_mask); -#endif + FadeOut(redraw_mask); #endif UnmapAllGadgets(); @@ -1333,18 +1370,15 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) SetMainBackgroundImage(IMG_BACKGROUND_MAIN); #if 0 -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(redraw_mask); -#endif + FadeOut(redraw_mask); #endif #if 1 if (redraw_mask == REDRAW_ALL) { +#if 0 int door_state = GetDoorState(); +#endif RedrawBackground(); @@ -1469,11 +1503,22 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) } #endif -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(redraw_mask); - else - FadeIn(redraw_mask); +#if 0 + { + game_status = GAME_MODE_PSEUDO_PREVIEW; + + DrawText(20, 400, "text_3.PREVIEW", FONT_TEXT_3); + DrawText(20, 420, "text_4.PREVIEW", FONT_TEXT_4); + + game_status = GAME_MODE_MAIN; + + DrawText(20, 440, "text_3.MAIN", FONT_TEXT_3); + DrawText(20, 460, "text_4.MAIN", FONT_TEXT_4); + } +#endif + +#if 1 + FadeIn(redraw_mask); #else #if 1 if (!do_fading) @@ -1491,7 +1536,7 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) #endif #if 1 - fading = menu.navigation; + FadeSetEnterMenu(); #else fading = title_default; #endif @@ -1559,12 +1604,14 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) #endif #endif struct TitleControlInfo *tci; + struct TitleFadingInfo fading_default; + struct TitleFadingInfo fading_last = fading; struct TitleFadingInfo fading_next; int sound, music; if (button == MB_MENU_INITIALIZE) { -#if 1 +#if 0 boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE); #endif @@ -1591,9 +1638,11 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) DrawInfoScreen_NotAvailable("Title screen information:", "No title screen for this level set."); +#if 0 /* use default settings for fading, but always disable auto delay */ fading = title_default; fading.auto_delay = -1; +#endif return; } @@ -1601,11 +1650,6 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) FadeSoundsAndMusic(); #if 1 - if (use_cross_fading) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_ALL); -#else FadeOut(REDRAW_ALL); #endif } @@ -1615,7 +1659,24 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) else DrawTitleScreenMessage(tci->local_nr, tci->initial); - fading = getTitleFading(tci); + fading_default = (tci->initial ? title_initial_default : title_default); + + fading = fading_next = getTitleFading(tci); + +#if 1 +#if 1 + if (!(fading_last.fade_mode & FADE_TYPE_TRANSFORM) && + fading_next.fade_mode & FADE_TYPE_TRANSFORM) + { + fading.fade_mode = FADE_MODE_FADE; + fading.fade_delay = fading_default.fade_delay; + } +#else + if (fading_last.fade_mode != FADE_MODE_CROSSFADE && + fading_next.fade_mode == FADE_MODE_CROSSFADE) + fading.fade_mode = FADE_MODE_FADE; +#endif +#endif #if 1 sound = getTitleSound(tci); @@ -1632,22 +1693,26 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) SetMouseCursor(CURSOR_NONE); + // printf("::: mode: %d, delay: %d\n", fading.fade_mode, fading.fade_delay); + #if 1 - if (use_cross_fading) - FadeCross(REDRAW_ALL); - else - FadeIn(REDRAW_ALL); -#else FadeIn(REDRAW_ALL); #endif + fading = fading_next; + DelayReached(&title_delay, 0); /* reset delay counter */ return; } +#if 1 + if (fading.auto_delay > 0 && DelayReached(&title_delay, fading.auto_delay)) + button = MB_MENU_CHOICE; +#else if (fading.auto_delay > -1 && DelayReached(&title_delay, fading.auto_delay)) button = MB_MENU_CHOICE; +#endif if (button == MB_MENU_LEAVE) { @@ -1656,24 +1721,17 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) } else if (button == MB_MENU_CHOICE) { -#if 1 +#if 0 boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE); #endif if (game_status == GAME_MODE_INFO && num_title_screens == 0) { #if 0 -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else FadeOut(REDRAW_FIELD); -#endif #endif - fading = menu.destination; + FadeSetEnterScreen(); info_mode = INFO_MODE_MAIN; DrawAndFadeInInfoScreen(REDRAW_FIELD); @@ -1713,10 +1771,9 @@ 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); @@ -1738,14 +1795,25 @@ 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 + +#if 1 /* last screen already faded out, next screen has no animation */ - if (!use_cross_fading && fading_next.anim_mode == ANIM_NONE) + if (!(fading.fade_mode & FADE_TYPE_TRANSFORM) && + fading_next.fade_mode == FADE_MODE_NONE) fading = fading_next; +#else + /* last screen already faded out, next screen has no animation */ + if (fading.fade_mode != FADE_MODE_CROSSFADE && + fading_next.fade_mode == FADE_MODE_NONE) + fading = fading_next; +#endif - if (use_cross_fading) - FadeCross(REDRAW_ALL); - else - FadeIn(REDRAW_ALL); +#if 1 + FadeIn(REDRAW_ALL); +#endif fading = fading_next; @@ -1762,10 +1830,9 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) 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); @@ -1839,7 +1906,8 @@ void HandleMainMenu_SelectLevel(int step, int direction) #if 1 DrawText(mSX + mci->pos_text->x, mSY + mci->pos_text->y, - int2str(level_nr, 3), mci->pos_text->font); + int2str(level_nr, menu.main.text.level_number.size), + mci->pos_text->font); #else DrawText(mSX + 11 * 32, mSY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1); #endif @@ -1955,7 +2023,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) game_status = GAME_MODE_EDITOR; - fading = menu.destination; + FadeSetEnterScreen(); DrawLevelEd(); } @@ -1964,7 +2032,9 @@ 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(); } @@ -2129,7 +2199,9 @@ static int num_info_info; static void execInfoTitleScreen() { - fading = menu.destination; +#if 0 + FadeSetEnterScreen(); +#endif info_mode = INFO_MODE_TITLE; DrawInfoScreen(); @@ -2137,7 +2209,9 @@ static void execInfoTitleScreen() static void execInfoElements() { - fading = menu.destination; +#if 0 + FadeSetEnterScreen(); +#endif info_mode = INFO_MODE_ELEMENTS; DrawInfoScreen(); @@ -2145,7 +2219,9 @@ static void execInfoElements() static void execInfoMusic() { - fading = menu.destination; +#if 0 + FadeSetEnterScreen(); +#endif info_mode = INFO_MODE_MUSIC; DrawInfoScreen(); @@ -2153,7 +2229,9 @@ static void execInfoMusic() static void execInfoCredits() { - fading = menu.destination; +#if 0 + FadeSetEnterScreen(); +#endif info_mode = INFO_MODE_CREDITS; DrawInfoScreen(); @@ -2161,7 +2239,9 @@ static void execInfoCredits() static void execInfoProgram() { - fading = menu.destination; +#if 0 + FadeSetEnterScreen(); +#endif info_mode = INFO_MODE_PROGRAM; DrawInfoScreen(); @@ -2169,7 +2249,9 @@ static void execInfoProgram() static void execInfoVersion() { - fading = menu.destination; +#if 0 + FadeSetEnterScreen(); +#endif info_mode = INFO_MODE_VERSION; DrawInfoScreen(); @@ -2177,7 +2259,9 @@ static void execInfoVersion() static void execInfoLevelSet() { - fading = menu.destination; +#if 0 + FadeSetEnterScreen(); +#endif info_mode = INFO_MODE_LEVELSET; DrawInfoScreen(); @@ -2185,7 +2269,9 @@ static void execInfoLevelSet() static void execExitInfo() { - fading = menu.navigation; +#if 0 + FadeSetLeaveMenu(); +#endif game_status = GAME_MODE_MAIN; #if 1 @@ -2232,11 +2318,13 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading) UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(redraw_mask); + /* (needed after displaying title screens which disable auto repeat) */ + KeyboardAutoRepeatOn(); + + FadeSetLeaveScreen(); + +#if 1 + FadeOut(redraw_mask); #endif #if 1 @@ -2283,13 +2371,10 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading) PlayMenuSound(); PlayMenuMusic(); - DrawMaskedBorder(REDRAW_ALL); + DrawMaskedBorder(redraw_mask); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(redraw_mask); - else - FadeIn(redraw_mask); +#if 1 + FadeIn(redraw_mask); #else #if 1 if (!do_fading) @@ -2340,6 +2425,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'! */ @@ -2402,6 +2489,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(); } } @@ -2422,12 +2511,7 @@ void DrawInfoScreen_NotAvailable(char *text_title, char *text_error) SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else +#if 1 FadeOut(REDRAW_FIELD); #endif @@ -2440,12 +2524,7 @@ void DrawInfoScreen_NotAvailable(char *text_title, char *text_error) DrawTextSCentered(ybottom, FONT_TEXT_4, "Press any key or button for info menu"); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(REDRAW_FIELD); - else - FadeIn(REDRAW_FIELD); -#else +#if 1 FadeIn(REDRAW_FIELD); #endif } @@ -2636,12 +2715,7 @@ void DrawInfoScreen_Elements() { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else +#if 1 FadeOut(REDRAW_FIELD); #endif @@ -2650,12 +2724,7 @@ void DrawInfoScreen_Elements() HandleInfoScreen_Elements(MB_MENU_INITIALIZE); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(REDRAW_FIELD); - else - FadeIn(REDRAW_FIELD); -#else +#if 1 FadeIn(REDRAW_FIELD); #endif @@ -2715,14 +2784,7 @@ void HandleInfoScreen_Elements(int button) FadeSoundsAndMusic(); #if 0 -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else FadeOut(REDRAW_FIELD); -#endif #endif info_mode = INFO_MODE_MAIN; @@ -2753,12 +2815,7 @@ void DrawInfoScreen_Music() { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else +#if 1 FadeOut(REDRAW_FIELD); #endif @@ -2769,12 +2826,7 @@ void DrawInfoScreen_Music() HandleInfoScreen_Music(MB_MENU_INITIALIZE); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(REDRAW_FIELD); - else - FadeIn(REDRAW_FIELD); -#else +#if 1 FadeIn(REDRAW_FIELD); #endif } @@ -2836,14 +2888,7 @@ void HandleInfoScreen_Music(int button) FadeSoundsAndMusic(); #if 0 -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else FadeOut(REDRAW_FIELD); -#endif #endif info_mode = INFO_MODE_MAIN; @@ -3110,23 +3155,13 @@ void DrawInfoScreen_Credits() FadeSoundsAndMusic(); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else +#if 1 FadeOut(REDRAW_FIELD); #endif HandleInfoScreen_Credits(MB_MENU_INITIALIZE); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(REDRAW_FIELD); - else - FadeIn(REDRAW_FIELD); -#else +#if 1 FadeIn(REDRAW_FIELD); #endif } @@ -3171,14 +3206,7 @@ void HandleInfoScreen_Credits(int button) FadeSoundsAndMusic(); #if 0 -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else FadeOut(REDRAW_FIELD); -#endif #endif info_mode = INFO_MODE_MAIN; @@ -3200,12 +3228,7 @@ void DrawInfoScreen_Program() SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else +#if 1 FadeOut(REDRAW_FIELD); #endif @@ -3244,12 +3267,7 @@ void DrawInfoScreen_Program() DrawTextSCentered(ybottom, FONT_TEXT_4, "Press any key or button for info menu"); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(REDRAW_FIELD); - else - FadeIn(REDRAW_FIELD); -#else +#if 1 FadeIn(REDRAW_FIELD); #endif } @@ -3272,14 +3290,7 @@ void HandleInfoScreen_Program(int button) FadeSoundsAndMusic(); #if 0 -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else FadeOut(REDRAW_FIELD); -#endif #endif info_mode = INFO_MODE_MAIN; @@ -3312,12 +3323,7 @@ void DrawInfoScreen_Version() SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else +#if 1 FadeOut(REDRAW_FIELD); #endif @@ -3430,12 +3436,7 @@ void DrawInfoScreen_Version() DrawTextSCentered(ybottom, FONT_TEXT_4, "Press any key or button for info menu"); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(REDRAW_FIELD); - else - FadeIn(REDRAW_FIELD); -#else +#if 1 FadeIn(REDRAW_FIELD); #endif } @@ -3458,14 +3459,7 @@ void HandleInfoScreen_Version(int button) FadeSoundsAndMusic(); #if 0 -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else FadeOut(REDRAW_FIELD); -#endif #endif info_mode = INFO_MODE_MAIN; @@ -3496,12 +3490,7 @@ void DrawInfoScreen_LevelSet() SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else +#if 1 FadeOut(REDRAW_FIELD); #endif @@ -3521,12 +3510,7 @@ void DrawInfoScreen_LevelSet() DrawTextCentered(mSY + SYSIZE - 20, FONT_TEXT_4, "Press any key or button for info menu"); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(REDRAW_FIELD); - else - FadeIn(REDRAW_FIELD); -#else +#if 1 FadeIn(REDRAW_FIELD); #endif } @@ -3549,14 +3533,7 @@ void HandleInfoScreen_LevelSet(int button) FadeSoundsAndMusic(); #if 0 -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else FadeOut(REDRAW_FIELD); -#endif #endif info_mode = INFO_MODE_MAIN; @@ -3605,7 +3582,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) @@ -3771,11 +3748,8 @@ static void DrawChooseTree(TreeInfo **ti_ptr) CloseDoor(DOOR_CLOSE_2); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); +#if 1 + FadeOut(REDRAW_FIELD); #endif ClearWindow(); @@ -3783,13 +3757,8 @@ static void DrawChooseTree(TreeInfo **ti_ptr) HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr); MapScreenTreeGadgets(*ti_ptr); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(redraw_mask); - else - FadeIn(redraw_mask); -#else - FadeToFront(); +#if 1 + FadeIn(REDRAW_FIELD); #endif InitAnimation(); @@ -3966,6 +3935,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) @@ -3977,7 +3948,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, { if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED) execSetupGame(); - else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE) + else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE || + setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY) execSetupGraphics(); else execSetupArtwork(); @@ -4071,6 +4043,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; @@ -4083,6 +4057,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; @@ -4121,6 +4097,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; @@ -4128,11 +4106,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 { + FadeSetEnterScreen(); + node_cursor->cl_first = ti->cl_first; node_cursor->cl_cursor = ti->cl_cursor; *ti_ptr = node_cursor; @@ -4150,7 +4132,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, { if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED) execSetupGame(); - else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE) + else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE || + setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY) execSetupGraphics(); else execSetupArtwork(); @@ -4200,14 +4183,11 @@ void DrawHallOfFame(int highlight_position) if (highlight_position < 0) LoadScore(level_nr); - fading = menu.destination; + FadeSetEnterScreen(); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else + // printf("::: %d: %d\n", game_status, menu.enter_screen[game_status]); + +#if 1 FadeOut(REDRAW_FIELD); #endif @@ -4218,12 +4198,7 @@ void DrawHallOfFame(int highlight_position) HandleHallOfFame(highlight_position, 0, 0, 0, MB_MENU_INITIALIZE); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(REDRAW_FIELD); - else - FadeIn(REDRAW_FIELD); -#else +#if 1 FadeIn(REDRAW_FIELD); #endif } @@ -4322,14 +4297,7 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) FadeSound(SND_BACKGROUND_SCORES); #if 0 -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else FadeOut(REDRAW_FIELD); -#endif #endif game_status = GAME_MODE_MAIN; @@ -4352,6 +4320,7 @@ static struct TokenInfo *setup_info; static int num_setup_info; static char *screen_mode_text; +static char *scroll_delay_text; static char *game_speed_text; static char *graphics_set_name; static char *sounds_set_name; @@ -4359,12 +4328,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; @@ -4418,18 +4395,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; @@ -4486,12 +4475,65 @@ static void execSetupGraphics() screen_mode_text = screen_mode_current->name; } +#if 1 + if (scroll_delays == NULL) + { + int i; + + for (i = 0; scroll_delays_list[i].value != -1; i++) + { + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + int value = scroll_delays_list[i].value; + char *text = scroll_delays_list[i].text; + + ti->node_top = &scroll_delays; + ti->sort_priority = value; + + sprintf(identifier, "%d", value); + sprintf(name, "%s", text); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, "Scroll Delay"); + + pushTreeInfo(&scroll_delays, ti); + } + + /* sort scroll delay values to start with lowest scroll delay value */ + sortTreeInfo(&scroll_delays); + + /* set current scroll delay value to configured scroll delay value */ + scroll_delay_current = + getTreeInfoFromIdentifier(scroll_delays,i_to_a(setup.scroll_delay_value)); + + /* if that fails, set current scroll delay to reliable default value */ + if (scroll_delay_current == NULL) + scroll_delay_current = + getTreeInfoFromIdentifier(scroll_delays, i_to_a(STD_SCROLL_DELAY)); + + /* if that also fails, set current scroll delay to first available value */ + if (scroll_delay_current == NULL) + scroll_delay_current = scroll_delays; + } + + setup.scroll_delay_value = atoi(scroll_delay_current->identifier); + + /* needed for displaying scroll delay text instead of identifier */ + scroll_delay_text = scroll_delay_current->name; +#endif + setup_mode = SETUP_MODE_GRAPHICS; DrawSetupScreen(); } static void execSetupChooseScreenMode() { +#if 0 + FadeSetEnterMenu(); +#endif + if (!video.fullscreen_available) return; @@ -4499,14 +4541,32 @@ static void execSetupChooseScreenMode() DrawSetupScreen(); } +static void execSetupChooseScrollDelay() +{ +#if 0 + FadeSetEnterMenu(); +#endif + + setup_mode = SETUP_MODE_CHOOSE_SCROLL_DELAY; + DrawSetupScreen(); +} + 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; @@ -4525,42 +4585,70 @@ 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); @@ -4646,7 +4734,11 @@ static struct TokenInfo setup_info_graphics[] = { TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" }, { TYPE_ENTER_LIST, execSetupChooseScreenMode, "Fullscreen Mode:" }, { TYPE_STRING, &screen_mode_text, "" }, - { TYPE_SWITCH, &setup.scroll_delay, "Delayed Scrolling:" }, +#if 0 + { TYPE_SWITCH, &setup.scroll_delay, "Scroll Delay:" }, +#endif + { TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay Value:" }, + { TYPE_STRING, &scroll_delay_text, "" }, #if 0 { TYPE_SWITCH, &setup.soft_scrolling, "Soft Scrolling:" }, { TYPE_SWITCH, &setup.double_buffering,"Double-Buffering:" }, @@ -4961,11 +5053,8 @@ static void DrawSetupScreen_Generic() UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); +#if 1 + FadeOut(REDRAW_FIELD); #endif ClearWindow(); @@ -5062,13 +5151,8 @@ static void DrawSetupScreen_Generic() HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE); #endif -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(redraw_mask); - else - FadeIn(redraw_mask); -#else - FadeToFront(); +#if 1 + FadeIn(REDRAW_FIELD); #endif InitAnimation(); @@ -5110,6 +5194,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'! */ @@ -5180,6 +5266,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 @@ -5197,11 +5285,8 @@ void DrawSetupScreen_Input() int i; #endif -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); +#if 1 + FadeOut(REDRAW_FIELD); #endif ClearWindow(); @@ -5252,13 +5337,8 @@ void DrawSetupScreen_Input() HandleSetupScreen_Input(0, 0, 0, 0, MB_MENU_INITIALIZE); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(redraw_mask); - else - FadeIn(redraw_mask); -#else - FadeToFront(); +#if 1 + FadeIn(REDRAW_FIELD); #endif InitAnimation(); @@ -5502,6 +5582,8 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) { InitJoysticks(); + FadeSetLeaveMenu(); + setup_mode = SETUP_MODE_MAIN; DrawSetupScreen(); } @@ -5532,12 +5614,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, @@ -5547,6 +5634,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 */ @@ -5563,6 +5656,9 @@ void CustomizeKeyboard(int player_nr) if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6)) { + if (key == KSYM_Escape) + FadeSkipNextFadeIn(); + finished = TRUE; break; } @@ -5661,6 +5757,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++) @@ -5692,7 +5791,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(); @@ -5716,6 +5820,7 @@ static boolean CalibrateJoystickMain(int player_nr) break; case KSYM_Escape: + FadeSkipNextFadeIn(); result = 0; break; @@ -5862,6 +5967,8 @@ void DrawSetupScreen() DrawChooseTree(&game_speed_current); else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE) DrawChooseTree(&screen_mode_current); + else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY) + DrawChooseTree(&scroll_delay_current); else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS) DrawChooseTree(&artwork.gfx_current); else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS) @@ -5889,6 +5996,8 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) HandleChooseTree(mx, my, dx, dy, button, &game_speed_current); else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE) HandleChooseTree(mx, my, dx, dy, button, &screen_mode_current); + else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY) + HandleChooseTree(mx, my, dx, dy, button, &scroll_delay_current); else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS) HandleChooseTree(mx, my, dx, dy, button, &artwork.gfx_current); else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS)