X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=3bc6c2b3ef1b50e7b1f5204d027e58be01636da6;hb=24d1083c28d6994772a2ba225ec9c0e90117e8dd;hp=6b96420a5b364ddf7ca0c7f1407354778c429508;hpb=884012f34f9f3c22bf75d1468e4ed57d7795a24b;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 6b96420a..3bc6c2b3 100644 --- a/src/screens.c +++ b/src/screens.c @@ -25,30 +25,6 @@ #include "init.h" #include "config.h" -/* screens in the setup menu */ -#define SETUP_MODE_MAIN 0 -#define SETUP_MODE_GAME 1 -#define SETUP_MODE_CHOOSE_GAME_SPEED 2 -#define SETUP_MODE_EDITOR 3 -#define SETUP_MODE_INPUT 4 -#define SETUP_MODE_SHORTCUT_1 5 -#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 MAX_SETUP_MODES 14 - -/* for input setup functions */ -#define SETUPINPUT_SCREEN_POS_START 0 -#define SETUPINPUT_SCREEN_POS_END (SCR_FIELDY - 4) -#define SETUPINPUT_SCREEN_POS_EMPTY1 (SETUPINPUT_SCREEN_POS_START + 3) -#define SETUPINPUT_SCREEN_POS_EMPTY2 (SETUPINPUT_SCREEN_POS_END - 1) - /* screens on the info screen */ #define INFO_MODE_MAIN 0 #define INFO_MODE_TITLE 1 @@ -61,6 +37,37 @@ #define MAX_INFO_MODES 8 +/* screens on the setup screen */ +#define SETUP_MODE_MAIN 0 +#define SETUP_MODE_GAME 1 +#define SETUP_MODE_EDITOR 2 +#define SETUP_MODE_GRAPHICS 3 +#define SETUP_MODE_SOUND 4 +#define SETUP_MODE_ARTWORK 5 +#define SETUP_MODE_INPUT 6 +#define SETUP_MODE_SHORTCUTS_1 7 +#define SETUP_MODE_SHORTCUTS_2 8 + +/* sub-screens on the setup screen (generic) */ +#define SETUP_MODE_CHOOSE_ARTWORK 9 +#define SETUP_MODE_CHOOSE_OTHER 10 + +/* sub-screens on the setup screen (specific) */ +#define SETUP_MODE_CHOOSE_GAME_SPEED 11 +#define SETUP_MODE_CHOOSE_SCREEN_MODE 12 +#define SETUP_MODE_CHOOSE_SCROLL_DELAY 13 +#define SETUP_MODE_CHOOSE_GRAPHICS 14 +#define SETUP_MODE_CHOOSE_SOUNDS 15 +#define SETUP_MODE_CHOOSE_MUSIC 16 + +#define MAX_SETUP_MODES 17 + +/* for input setup functions */ +#define SETUPINPUT_SCREEN_POS_START 0 +#define SETUPINPUT_SCREEN_POS_END (SCR_FIELDY - 4) +#define SETUPINPUT_SCREEN_POS_EMPTY1 (SETUPINPUT_SCREEN_POS_START + 3) +#define SETUPINPUT_SCREEN_POS_EMPTY2 (SETUPINPUT_SCREEN_POS_END - 1) + /* for various menu stuff */ #define MENU_SCREEN_START_XPOS 1 #define MENU_SCREEN_START_YPOS 2 @@ -118,6 +125,7 @@ #define SC_BORDER_SIZE 14 +#if 0 /* other useful macro definitions */ #define BUTTON_GRAPHIC_ACTIVE(g) \ (g == IMG_MENU_BUTTON_LEFT ? IMG_MENU_BUTTON_LEFT_ACTIVE : \ @@ -128,7 +136,16 @@ g == IMG_MENU_BUTTON_ENTER_MENU ? IMG_MENU_BUTTON_ENTER_MENU_ACTIVE : \ g == IMG_MENU_BUTTON_PREV_LEVEL ? IMG_MENU_BUTTON_PREV_LEVEL_ACTIVE : \ g == IMG_MENU_BUTTON_NEXT_LEVEL ? IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE : \ + g == IMG_MENU_BUTTON_NAME ? IMG_MENU_BUTTON_NAME_ACTIVE : \ + g == IMG_MENU_BUTTON_LEVELS ? IMG_MENU_BUTTON_LEVELS_ACTIVE : \ + g == IMG_MENU_BUTTON_SCORES ? IMG_MENU_BUTTON_SCORES_ACTIVE : \ + g == IMG_MENU_BUTTON_EDITOR ? IMG_MENU_BUTTON_EDITOR_ACTIVE : \ + g == IMG_MENU_BUTTON_INFO ? IMG_MENU_BUTTON_INFO_ACTIVE : \ + g == IMG_MENU_BUTTON_GAME ? IMG_MENU_BUTTON_GAME_ACTIVE : \ + g == IMG_MENU_BUTTON_SETUP ? IMG_MENU_BUTTON_SETUP_ACTIVE : \ + g == IMG_MENU_BUTTON_QUIT ? IMG_MENU_BUTTON_QUIT_ACTIVE : \ IMG_MENU_BUTTON_ACTIVE) +#endif /* forward declarations of internal functions */ @@ -164,12 +181,15 @@ static void MapScreenTreeGadgets(TreeInfo *); static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS]; -static int setup_mode = SETUP_MODE_MAIN; static int info_mode = INFO_MODE_MAIN; +static int setup_mode = SETUP_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,17 +224,42 @@ 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) : \ (s) == GAME_MODE_PSEUDO_TYPENAME ? \ GAME_MODE_MAIN : GAME_MODE_DEFAULT) +/* (there are no draw offset definitions needed for INFO_MODE_TITLE) */ #define DRAW_MODE_INFO(i) ((i) >= INFO_MODE_ELEMENTS && \ (i) <= INFO_MODE_LEVELSET ? (i) : \ INFO_MODE_MAIN) +#define DRAW_MODE_SETUP(i) ((i) >= SETUP_MODE_MAIN && \ + (i) <= SETUP_MODE_SHORTCUTS_2 ? (i) : \ + (i) >= SETUP_MODE_CHOOSE_GRAPHICS && \ + (i) <= SETUP_MODE_CHOOSE_MUSIC ? \ + SETUP_MODE_CHOOSE_ARTWORK : \ + SETUP_MODE_CHOOSE_OTHER) + #define DRAW_XOFFSET_INFO(i) (DRAW_MODE_INFO(i) == INFO_MODE_MAIN ? \ menu.draw_xoffset[GAME_MODE_INFO] : \ menu.draw_xoffset_info[DRAW_MODE_INFO(i)]) @@ -222,11 +267,22 @@ static struct menu.draw_yoffset[GAME_MODE_INFO] : \ menu.draw_yoffset_info[DRAW_MODE_INFO(i)]) +#define DRAW_XOFFSET_SETUP(i) (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \ + menu.draw_xoffset[GAME_MODE_SETUP] : \ + menu.draw_xoffset_setup[DRAW_MODE_SETUP(i)]) +#define DRAW_YOFFSET_SETUP(i) (DRAW_MODE_SETUP(i) == SETUP_MODE_MAIN ? \ + menu.draw_yoffset[GAME_MODE_SETUP] : \ + menu.draw_yoffset_setup[DRAW_MODE_SETUP(i)]) + #define DRAW_XOFFSET(s) ((s) == GAME_MODE_INFO ? \ DRAW_XOFFSET_INFO(info_mode) : \ + (s) == GAME_MODE_SETUP ? \ + DRAW_XOFFSET_SETUP(setup_mode) : \ menu.draw_xoffset[DRAW_MODE(s)]) #define DRAW_YOFFSET(s) ((s) == GAME_MODE_INFO ? \ DRAW_YOFFSET_INFO(info_mode) : \ + (s) == GAME_MODE_SETUP ? \ + DRAW_YOFFSET_SETUP(setup_mode) : \ menu.draw_yoffset[DRAW_MODE(s)]) #define mSX (SX + DRAW_XOFFSET(game_status)) @@ -330,49 +386,49 @@ static struct MainControlInfo main_controls[] = { { MAIN_CONTROL_NAME, - &menu.main.button.name, IMG_MENU_BUTTON, + &menu.main.button.name, IMG_MENU_BUTTON_NAME, &menu.main.text.name, &main_text_name, &menu.main.input.name, &setup.player_name, }, { MAIN_CONTROL_LEVELS, - &menu.main.button.levels, IMG_MENU_BUTTON_ENTER_MENU, + &menu.main.button.levels, IMG_MENU_BUTTON_LEVELS, &menu.main.text.levels, &main_text_levels, NULL, NULL, }, { MAIN_CONTROL_SCORES, - &menu.main.button.scores, IMG_MENU_BUTTON, + &menu.main.button.scores, IMG_MENU_BUTTON_SCORES, &menu.main.text.scores, &main_text_scores, NULL, NULL, }, { MAIN_CONTROL_EDITOR, - &menu.main.button.editor, IMG_MENU_BUTTON, + &menu.main.button.editor, IMG_MENU_BUTTON_EDITOR, &menu.main.text.editor, &main_text_editor, NULL, NULL, }, { MAIN_CONTROL_INFO, - &menu.main.button.info, IMG_MENU_BUTTON_ENTER_MENU, + &menu.main.button.info, IMG_MENU_BUTTON_INFO, &menu.main.text.info, &main_text_info, NULL, NULL, }, { MAIN_CONTROL_GAME, - &menu.main.button.game, IMG_MENU_BUTTON, + &menu.main.button.game, IMG_MENU_BUTTON_GAME, &menu.main.text.game, &main_text_game, NULL, NULL, }, { MAIN_CONTROL_SETUP, - &menu.main.button.setup, IMG_MENU_BUTTON_ENTER_MENU, + &menu.main.button.setup, IMG_MENU_BUTTON_SETUP, &menu.main.text.setup, &main_text_setup, NULL, NULL, }, { MAIN_CONTROL_QUIT, - &menu.main.button.quit, IMG_MENU_BUTTON, + &menu.main.button.quit, IMG_MENU_BUTTON_QUIT, &menu.main.text.quit, &main_text_quit, NULL, NULL, }, @@ -616,8 +672,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 +685,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; @@ -691,6 +747,12 @@ static void InitializeTitleControls_CheckTitleInfo(boolean initial) Bitmap *bitmap = graphic_info[graphic].bitmap; int sort_priority = graphic_info[graphic].sort_priority; +#if 0 + /* skip images and messages (fonts!) when using forced custom graphics */ + if (setup.override_level_graphics && !initial) + continue; +#endif + if (bitmap != NULL) InitializeTitleControlsExt_AddTitleInfo(TRUE, initial, i, sort_priority); } @@ -701,6 +763,12 @@ static void InitializeTitleControls_CheckTitleInfo(boolean initial) char *filename = getLevelSetTitleMessageFilename(i, initial); int sort_priority = tmi->sort_priority; +#if 0 + /* skip images and messages (fonts!) when using forced custom graphics */ + if (setup.override_level_graphics) + continue; +#endif + if (filename != NULL) InitializeTitleControlsExt_AddTitleInfo(FALSE, initial, i, sort_priority); } @@ -710,8 +778,10 @@ static void InitializeTitleControls(boolean show_title_initial) { num_title_screens = 0; +#if 0 if (show_title_initial) InitializeTitleControls_CheckTitleInfo(TRUE); +#endif InitializeTitleControls_CheckTitleInfo(FALSE); @@ -737,9 +807,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; @@ -871,7 +945,7 @@ static void DrawCursorAndText_Main_Ext(int nr, boolean active_text, if (active_text) { - button_graphic = BUTTON_GRAPHIC_ACTIVE(button_graphic); + button_graphic = BUTTON_ACTIVE(button_graphic); font_text = FONT_ACTIVE(font_text); } @@ -981,7 +1055,7 @@ static void drawCursorExt(int xpos, int ypos, boolean active, int graphic) } if (active) - graphic = BUTTON_GRAPHIC_ACTIVE(graphic); + graphic = BUTTON_ACTIVE(graphic); DrawBackgroundForGraphic(x, y, TILEX, TILEY, graphic); DrawGraphicThruMaskExt(drawto, x, y, graphic, 0); @@ -1006,8 +1080,10 @@ static void drawChooseTreeCursor(int ypos, boolean active) { int last_game_status = game_status; /* save current game status */ +#if 0 /* force LEVELS draw offset on artwork setup screen */ game_status = GAME_MODE_LEVELS; +#endif drawCursorExt(0, ypos, active, -1); @@ -1218,32 +1294,13 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) { static LevelDirTree *leveldir_last_valid = NULL; boolean levelset_has_changed = FALSE; -#if 0 - boolean local_team_mode = (!options.network && setup.team_mode); - char *name_text = (local_team_mode ? "Team:" : "Name:"); - int name_width, level_width; -#endif -#if 0 - int i; -#endif + boolean redraw_all = FALSE; -#if 0 - /* !!! CHANGE THIS !!! */ - title = title_default; -#endif + FadeSetLeaveScreen(); + /* (does not work well when changing to editor, which fades out itself) */ #if 0 - printf("::: %d, %d\n", fading.anim_mode == ANIM_CROSSFADE, - redraw_mask == REDRAW_ALL); -#endif - -#if 1 -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(redraw_mask); -#endif + FadeOut(redraw_mask); #endif UnmapAllGadgets(); @@ -1268,8 +1325,12 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) return; } +#if 0 + FadeOut(redraw_mask); + /* needed if last screen was the editor screen */ UndrawSpecialEditorDoor(); +#endif /* needed if last screen was the setup screen and fullscreen state changed */ ToggleFullscreenIfNeeded(); @@ -1287,34 +1348,27 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) /* needed if last screen (level choice) changed graphics, sounds or music */ ReloadCustomArtwork(0); -#if defined(TARGET_SDL) - SetDrawtoField(DRAW_BACKBUFFER); -#endif + if (redraw_mask & REDRAW_ALL) + redraw_all = TRUE; +#if 1 #if 0 - if (levelset_has_changed) - fading = title_default; + printf("::: FadeOut @ DrawMainMenuExt ...\n"); +#endif + FadeOut(redraw_mask); +#if 0 + printf("::: FadeOut @ DrawMainMenuExt done\n"); #endif -#if 1 - if (CheckTitleScreen(levelset_has_changed)) - { - game_status = GAME_MODE_TITLE; - - DrawTitleScreen(); - - return; - } + /* needed if last screen was the editor screen */ + UndrawSpecialEditorDoor(); +#endif -#else +#if defined(TARGET_SDL) + SetDrawtoField(DRAW_BACKBUFFER); +#endif - if (setup.show_titlescreen && - ((levelset_has_changed && - (graphic_info[IMG_TITLESCREEN_1].bitmap != NULL || - getLevelSetMessageFilename(1, FALSE) != NULL)) || - (show_title_initial && - (graphic_info[IMG_TITLESCREEN_INITIAL_1].bitmap != NULL || - getLevelSetMessageFilename(1, TRUE) != NULL)))) + if (CheckTitleScreen(levelset_has_changed)) { game_status = GAME_MODE_TITLE; @@ -1322,7 +1376,6 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) return; } -#endif /* level_nr may have been set to value over handicap with level editor */ if (setup.handicap && level_nr > leveldir_current->handicap_level) @@ -1333,106 +1386,25 @@ 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) { - int door_state = GetDoorState(); + // int door_state = GetDoorState(); 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 InitializeMainControls(); -#if 1 DrawCursorAndText_Main(-1, FALSE); -#else - for (i = 0; main_controls[i].nr != -1; i++) - { - struct MenuPosInfo *pos_button = main_controls[i].pos_button; - struct MenuPosInfo *pos_text = main_controls[i].pos_text; - struct MenuPosInfo *pos_input = main_controls[i].pos_input; - char *text = main_controls[i].text; - char *input = main_controls[i].input; - int button_graphic = main_controls[i].button_graphic; - int font_text = main_controls[i].font_text; - int font_input = main_controls[i].font_input; - - if (pos_button != NULL) - DrawGraphicThruMaskExt(drawto, mSX + pos_button->x, mSY + pos_button->y, - button_graphic, 0); - - if (pos_text != NULL && text != NULL) - DrawText(mSX + pos_text->x, mSY + pos_text->y, text, font_text); - - if (pos_input != NULL && input != NULL) - DrawText(mSX + pos_input->x, mSY + pos_input->y, input, font_input); - } -#endif - -#else - - DrawHeadline(); - - DrawText(mSX + 32, mSY + 2 * 32, name_text, FONT_MENU_1); - DrawText(mSX + 32, mSY + 3 * 32, "Levelset", FONT_MENU_1); - DrawText(mSX + 32, mSY + 4 * 32, "Hall Of Fame", FONT_MENU_1); - DrawText(mSX + 32, mSY + 5 * 32, "Level Creator", FONT_MENU_1); - DrawText(mSX + 32, mSY + 6 * 32, "Info Screen", FONT_MENU_1); - DrawText(mSX + 32, mSY + 7 * 32, "Start Game", FONT_MENU_1); - DrawText(mSX + 32, mSY + 8 * 32, "Setup", FONT_MENU_1); - DrawText(mSX + 32, mSY + 9 * 32, "Quit", FONT_MENU_1); - - /* calculated after (possible) reload of custom artwork */ - name_width = getTextWidth(name_text, FONT_MENU_1); - level_width = 9 * 32; - - DrawText(mSX + 32 + name_width, mSY + 2 * 32, setup.player_name, - FONT_INPUT_1); - - DrawText(mSX + getCurrentLevelTextPos() * 32, mSY + 3 * 32, - int2str(level_nr, 3), FONT_VALUE_1); - - { - int text_height = getFontHeight(FONT_TEXT_3); - int xpos = getLevelRangeTextPos() * 32 + 8; - int ypos2 = 3 * 32 + 16; - int ypos1 = ypos2 - text_height; - - DrawTextF(mSX - SX + xpos, mSY - SY + ypos1, FONT_TEXT_3, - "%03d", leveldir_current->first_level); - DrawTextF(mSX - SX + xpos, mSY - SY + ypos2, FONT_TEXT_3, - "%03d", leveldir_current->last_level); - } - - for (i = 0; i < 8; i++) - initCursor(i, (i == 1 || i == 4 || i == 6 ? IMG_MENU_BUTTON_ENTER_MENU : - IMG_MENU_BUTTON)); - - DrawTextSCentered(326, FONT_TITLE_2, PROGRAM_GAME_BY_STRING); -#endif - DrawPreviewLevel(TRUE); HandleMainMenu(0, 0, 0, 0, MB_MENU_INITIALIZE); @@ -1449,53 +1421,38 @@ 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); +#if 0 DrawMaskedBorder(REDRAW_ALL); +#endif #if 1 if (redraw_mask == REDRAW_ALL) { int door_state = GetDoorState(); + // RedrawBackground(); + OpenDoor(door_state | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); } #endif -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(redraw_mask); - else - FadeIn(redraw_mask); -#else #if 1 - if (!do_fading) - BackToFront(); - else if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(redraw_mask); - else - FadeIn(redraw_mask); -#else - if (do_fading) - FadeIn(redraw_mask); - else - BackToFront(); -#endif + DrawMaskedBorder(REDRAW_ALL); #endif -#if 1 - fading = menu.navigation; -#else - fading = title_default; +#if 0 + if (redraw_all) + redraw_mask = REDRAW_ALL; #endif + FadeIn(redraw_mask); + + FadeSetEnterMenu(); + SetMouseCursor(CURSOR_DEFAULT); InitAnimation(); @@ -1559,12 +1516,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 +1550,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 +1562,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 +1571,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 +1605,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 +1633,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 +1683,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 +1707,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 +1742,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 +1818,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 +1935,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 +1944,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(); } @@ -2059,6 +2041,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (leveldir_first) { game_status = GAME_MODE_LEVELS; + SaveLevelSetup_LastSeries(); SaveLevelSetup_SeriesInfo(); @@ -2129,7 +2112,9 @@ static int num_info_info; static void execInfoTitleScreen() { - fading = menu.destination; +#if 0 + FadeSetEnterScreen(); +#endif info_mode = INFO_MODE_TITLE; DrawInfoScreen(); @@ -2137,7 +2122,9 @@ static void execInfoTitleScreen() static void execInfoElements() { - fading = menu.destination; +#if 0 + FadeSetEnterScreen(); +#endif info_mode = INFO_MODE_ELEMENTS; DrawInfoScreen(); @@ -2145,7 +2132,9 @@ static void execInfoElements() static void execInfoMusic() { - fading = menu.destination; +#if 0 + FadeSetEnterScreen(); +#endif info_mode = INFO_MODE_MUSIC; DrawInfoScreen(); @@ -2153,7 +2142,9 @@ static void execInfoMusic() static void execInfoCredits() { - fading = menu.destination; +#if 0 + FadeSetEnterScreen(); +#endif info_mode = INFO_MODE_CREDITS; DrawInfoScreen(); @@ -2161,7 +2152,9 @@ static void execInfoCredits() static void execInfoProgram() { - fading = menu.destination; +#if 0 + FadeSetEnterScreen(); +#endif info_mode = INFO_MODE_PROGRAM; DrawInfoScreen(); @@ -2169,7 +2162,9 @@ static void execInfoProgram() static void execInfoVersion() { - fading = menu.destination; +#if 0 + FadeSetEnterScreen(); +#endif info_mode = INFO_MODE_VERSION; DrawInfoScreen(); @@ -2177,7 +2172,9 @@ static void execInfoVersion() static void execInfoLevelSet() { - fading = menu.destination; +#if 0 + FadeSetEnterScreen(); +#endif info_mode = INFO_MODE_LEVELSET; DrawInfoScreen(); @@ -2185,7 +2182,9 @@ static void execInfoLevelSet() static void execExitInfo() { - fading = menu.navigation; +#if 0 + FadeSetLeaveMenu(); +#endif game_status = GAME_MODE_MAIN; #if 1 @@ -2232,17 +2231,20 @@ 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 if (redraw_mask == REDRAW_ALL) { RedrawBackground(); + OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); } #endif @@ -2254,14 +2256,12 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading) info_info = info_info_main; num_info_info = 0; +#if 1 + for (i = 0; info_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++) +#else for (i = 0; info_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) - { -#if 0 - int xpos = MENU_SCREEN_START_XPOS; - int ypos = MENU_SCREEN_START_YPOS + i; - int font_nr = FONT_MENU_1; #endif - + { if (info_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST)) initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); else if (info_info[i].type & (TYPE_LEAVE_MENU|TYPE_LEAVE_LIST)) @@ -2269,11 +2269,7 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading) else if (info_info[i].type & ~TYPE_SKIP_ENTRY) initCursor(i, IMG_MENU_BUTTON); -#if 1 DrawCursorAndText_Info(i, FALSE); -#else - DrawText(mSX + xpos * 32, mSY + ypos * 32, info_info[i].text, font_nr); -#endif num_info_info++; } @@ -2283,28 +2279,9 @@ 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); -#else -#if 1 - if (!do_fading) - BackToFront(); - else if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(redraw_mask); - else - FadeIn(redraw_mask); -#else - if (do_fading) - FadeIn(redraw_mask); - else - BackToFront(); -#endif -#endif + FadeIn(redraw_mask); InitAnimation(); } @@ -2324,11 +2301,7 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button) choice++; choice_store[info_mode] = choice; -#if 1 DrawCursorAndText_Info(choice, TRUE); -#else - drawCursor(choice, TRUE); -#endif return; } @@ -2340,6 +2313,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'! */ @@ -2383,13 +2358,8 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button) { PlaySound(SND_MENU_ITEM_ACTIVATING); -#if 1 DrawCursorAndText_Info(choice, FALSE); DrawCursorAndText_Info(y, TRUE); -#else - drawCursor(choice, FALSE); - drawCursor(y, TRUE); -#endif choice = choice_store[info_mode] = y; } @@ -2402,6 +2372,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(); } } @@ -2410,26 +2382,13 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button) void DrawInfoScreen_NotAvailable(char *text_title, char *text_error) { -#if 1 int ystart1 = mSY - SY + 100; int ystart2 = mSY - SY + 150; int ybottom = mSY - SY + SYSIZE - 20; -#else - int ystart1 = 100; - int ystart2 = 150; - int ybottom = SYSIZE - 20; -#endif SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else FadeOut(REDRAW_FIELD); -#endif ClearWindow(); DrawHeadline(); @@ -2440,14 +2399,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 FadeIn(REDRAW_FIELD); -#endif } void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) @@ -2580,11 +2532,7 @@ static char *getHelpText(int element, int action, int direction) void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos) { -#if 1 int font_nr = FONT_INFO_ELEMENTS; -#else - int font_nr = FONT_LEVEL_NUMBER; -#endif int font_width = getFontWidth(font_nr); int sx = mSX + MINI_TILEX + TILEX + MINI_TILEX; int sy = mSY + 65 + 2 * 32 + 1; @@ -2612,14 +2560,9 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos) if (strlen(text) <= max_chars_per_line) /* only one line of text */ sy += getFontHeight(font_nr) / 2; -#if 1 DrawTextBuffer(sx, sy + ypos * ystep, text, font_nr, max_chars_per_line, -1, max_lines_per_text, -1, TRUE, FALSE, FALSE); -#else - DrawTextWrapped(sx, sy + ypos * ystep, text, font_nr, - max_chars_per_line, max_lines_per_text); -#endif } void DrawInfoScreen_TitleScreen() @@ -2636,28 +2579,14 @@ void DrawInfoScreen_Elements() { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else FadeOut(REDRAW_FIELD); -#endif LoadHelpAnimInfo(); LoadHelpTextInfo(); HandleInfoScreen_Elements(MB_MENU_INITIALIZE); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCross(REDRAW_FIELD); - else - FadeIn(REDRAW_FIELD); -#else FadeIn(REDRAW_FIELD); -#endif InitAnimation(); } @@ -2714,30 +2643,34 @@ 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; DrawAndFadeInInfoScreen(REDRAW_FIELD); return; } +#if 1 + if (page > 0) + FadeSetNextScreen(); +#endif + +#if 1 + if (button != MB_MENU_INITIALIZE) + FadeOut(REDRAW_FIELD); +#else if (button != MB_MENU_INITIALIZE) FadeCrossSaveBackbuffer(); +#endif DrawInfoScreen_HelpAnim(page * anims_per_page, num_anims, TRUE); +#if 1 + if (button != MB_MENU_INITIALIZE) + FadeIn(REDRAW_FIELD); +#else if (button != MB_MENU_INITIALIZE) FadeCross(REDRAW_FIELD); +#endif } else { @@ -2753,12 +2686,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 +2697,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 } @@ -2835,17 +2758,6 @@ 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; DrawAndFadeInInfoScreen(REDRAW_FIELD); @@ -2854,8 +2766,18 @@ void HandleInfoScreen_Music(int button) FadeSoundsAndMusic(); +#if 1 + if (list != music_file_info) + FadeSetNextScreen(); +#endif + +#if 1 + if (button != MB_MENU_INITIALIZE) + FadeOut(REDRAW_FIELD); +#else if (button != MB_MENU_INITIALIZE) FadeCrossSaveBackbuffer(); +#endif ClearWindow(); DrawHeadline(); @@ -2919,24 +2841,26 @@ void HandleInfoScreen_Music(int button) DrawTextSCentered(ybottom, FONT_TEXT_4, "Press any key or button for next page"); +#if 1 + if (button != MB_MENU_INITIALIZE) + FadeIn(REDRAW_FIELD); +#else if (button != MB_MENU_INITIALIZE) FadeCross(REDRAW_FIELD); +#endif } if (list != NULL && list->is_sound && sound_info[list->music].loop) PlaySoundLoop(list->music); } -static boolean DrawInfoScreen_CreditsScreen(int screen_nr) +static void DrawInfoScreen_CreditsScreen(int screen_nr) { int ystart1 = mSY - SY + 100; int ystart2 = mSY - SY + 150; int ybottom = mSY - SY + SYSIZE - 20; int ystep = 30; - if (screen_nr > 8) - return FALSE; - ClearWindow(); DrawHeadline(); @@ -3091,17 +3015,9 @@ static boolean DrawInfoScreen_CreditsScreen(int screen_nr) DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_3, "since 1995"); } -#if 0 - else - { - return FALSE; - } -#endif DrawTextSCentered(ybottom, FONT_TEXT_4, "Press any key or button for next page"); - - return TRUE; } void DrawInfoScreen_Credits() @@ -3110,23 +3026,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 } @@ -3134,14 +3040,16 @@ void DrawInfoScreen_Credits() void HandleInfoScreen_Credits(int button) { static int screen_nr = 0; + int num_screens = 9; if (button == MB_MENU_INITIALIZE) { screen_nr = 0; - DrawInfoScreen_CreditsScreen(screen_nr); + // DrawInfoScreen_CreditsScreen(screen_nr); } - else if (button == MB_MENU_LEAVE) + + if (button == MB_MENU_LEAVE) { PlaySound(SND_MENU_ITEM_SELECTING); @@ -3150,40 +3058,47 @@ void HandleInfoScreen_Credits(int button) return; } - else if (button == MB_MENU_CHOICE) + else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE) { - boolean show_screen; + if (button != MB_MENU_INITIALIZE) + { + PlaySound(SND_MENU_ITEM_SELECTING); - PlaySound(SND_MENU_ITEM_SELECTING); + screen_nr++; + } - screen_nr++; + if (screen_nr >= num_screens) + { + FadeSoundsAndMusic(); - FadeCrossSaveBackbuffer(); + info_mode = INFO_MODE_MAIN; + DrawAndFadeInInfoScreen(REDRAW_FIELD); - show_screen = DrawInfoScreen_CreditsScreen(screen_nr); - - if (show_screen) - { - FadeCross(REDRAW_FIELD); + return; } - else - { - FadeSoundsAndMusic(); -#if 0 -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); -#else - FadeOut(REDRAW_FIELD); +#if 1 + if (screen_nr > 0) + FadeSetNextScreen(); #endif + +#if 1 + if (button != MB_MENU_INITIALIZE) + FadeOut(REDRAW_FIELD); +#else + if (button != MB_MENU_INITIALIZE) + FadeCrossSaveBackbuffer(); #endif - info_mode = INFO_MODE_MAIN; - DrawAndFadeInInfoScreen(REDRAW_FIELD); - } + DrawInfoScreen_CreditsScreen(screen_nr); + +#if 1 + if (button != MB_MENU_INITIALIZE) + FadeIn(REDRAW_FIELD); +#else + if (button != MB_MENU_INITIALIZE) + FadeCross(REDRAW_FIELD); +#endif } else { @@ -3200,12 +3115,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 +3154,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 +3177,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 +3210,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 +3323,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 +3346,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 +3377,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 +3397,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 +3420,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 +3469,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 +3635,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 +3644,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(); @@ -3827,8 +3683,10 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, DrawTextSCentered(mSY - SY + yoffset, FONT_TITLE_1, title_string); +#if 0 /* force LEVELS font on artwork setup screen */ game_status = GAME_MODE_LEVELS; +#endif #if 1 /* clear tree list area, but not title or scrollbar */ @@ -3922,8 +3780,10 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, int last_game_status = game_status; /* save current game status */ boolean position_set_by_scrollbar = (dx == 999); +#if 0 /* force LEVELS draw offset on choose level and artwork setup screen */ game_status = GAME_MODE_LEVELS; +#endif if (num_entries <= NUM_MENU_ENTRIES_ON_SCREEN) num_page_entries = num_entries; @@ -3966,6 +3826,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 +3839,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(); @@ -3999,8 +3862,10 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, { int last_game_status = game_status; /* save current game status */ +#if 0 /* force LEVELS draw offset on artwork setup screen */ game_status = GAME_MODE_LEVELS; +#endif x = (mx - mSX) / 32; y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS; @@ -4071,6 +3936,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 +3950,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 +3990,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 +3999,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 +4025,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 +4076,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 +4091,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 +4190,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 +4213,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 +4221,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 +4288,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 +4368,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 +4434,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 +4478,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() +static void execSetupShortcuts1() { - setup_mode = SETUP_MODE_SHORTCUT_1; +#if 0 + FadeSetEnterMenu(); +#endif + + setup_mode = SETUP_MODE_SHORTCUTS_1; DrawSetupScreen(); } -static void execSetupShortcut2() +static void execSetupShortcuts2() { - setup_mode = SETUP_MODE_SHORTCUT_2; +#if 0 + FadeSetEnterMenu(); +#endif + + setup_mode = SETUP_MODE_SHORTCUTS_2; DrawSetupScreen(); } static void execExitSetup() { +#if 0 + FadeSetLeaveMenu(); +#endif + game_status = GAME_MODE_MAIN; #if 1 DrawMainMenuExt(REDRAW_FIELD, FALSE); @@ -4583,8 +4564,8 @@ static struct TokenInfo setup_info_main[] = { TYPE_ENTER_MENU, execSetupSound, "Sound & Music" }, { TYPE_ENTER_MENU, execSetupArtwork, "Custom Artwork" }, { TYPE_ENTER_MENU, execSetupInput, "Input Devices" }, - { TYPE_ENTER_MENU, execSetupShortcut1, "Key Shortcuts 1" }, - { TYPE_ENTER_MENU, execSetupShortcut2, "Key Shortcuts 2" }, + { TYPE_ENTER_MENU, execSetupShortcuts1, "Key Shortcuts 1" }, + { TYPE_ENTER_MENU, execSetupShortcuts2, "Key Shortcuts 2" }, { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execExitSetup, "Exit" }, { TYPE_LEAVE_MENU, execSaveAndExitSetup, "Save and Exit" }, @@ -4646,7 +4627,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:" }, @@ -4719,7 +4704,7 @@ static struct TokenInfo setup_info_input[] = { 0, NULL, NULL } }; -static struct TokenInfo setup_info_shortcut_1[] = +static struct TokenInfo setup_info_shortcuts_1[] = { { TYPE_KEYTEXT, NULL, "Quick Save Game to Tape:", }, { TYPE_KEY, &setup.shortcut.save_game, "" }, @@ -4736,7 +4721,7 @@ static struct TokenInfo setup_info_shortcut_1[] = { 0, NULL, NULL } }; -static struct TokenInfo setup_info_shortcut_2[] = +static struct TokenInfo setup_info_shortcuts_2[] = { { TYPE_KEYTEXT, NULL, "Set Focus to Player 1:", }, { TYPE_KEY, &setup.shortcut.focus_player[0], "" }, @@ -4955,17 +4940,27 @@ static void DrawCursorAndText_Setup(int pos, boolean active) static void DrawSetupScreen_Generic() { + boolean redraw_all = FALSE; char *title_string = NULL; int i; UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); -#if XFADE - if (fading.anim_mode == ANIM_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeOut(REDRAW_FIELD); + if (redraw_mask & REDRAW_ALL) + redraw_all = TRUE; + +#if 0 + printf("::: %s\n", (redraw_mask & REDRAW_FIELD ? "REDRAW_FIELD" : + redraw_mask & REDRAW_ALL ? "REDRAW_ALL" : + int2str(0, redraw_mask))); +#endif + +#if 0 + /* !!! usually REDRAW_NONE => DOES NOT WORK (with fade) => CHECK THIS !!! */ + FadeOut(redraw_mask); +#else + FadeOut(REDRAW_FIELD); #endif ClearWindow(); @@ -5000,21 +4995,25 @@ static void DrawSetupScreen_Generic() setup_info = setup_info_artwork; title_string = "Custom Artwork"; } - else if (setup_mode == SETUP_MODE_SHORTCUT_1) + else if (setup_mode == SETUP_MODE_SHORTCUTS_1) { - setup_info = setup_info_shortcut_1; + setup_info = setup_info_shortcuts_1; title_string = "Setup Shortcuts"; } - else if (setup_mode == SETUP_MODE_SHORTCUT_2) + else if (setup_mode == SETUP_MODE_SHORTCUTS_2) { - setup_info = setup_info_shortcut_2; + setup_info = setup_info_shortcuts_2; title_string = "Setup Shortcuts"; } DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, title_string); num_setup_info = 0; +#if 1 + for (i = 0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++) +#else for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) +#endif { void *value_ptr = setup_info[i].value; #if 1 @@ -5062,13 +5061,13 @@ 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); + if (redraw_all) + redraw_mask = REDRAW_ALL; + +#if 1 + FadeIn(redraw_mask); #else - FadeToFront(); + FadeIn(REDRAW_FIELD); #endif InitAnimation(); @@ -5110,6 +5109,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 +5181,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 +5200,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(); @@ -5213,7 +5213,21 @@ void DrawSetupScreen_Input() DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Setup Input"); #if 1 +#if 1 + DrawTextSCentered(SYSIZE - 20, FONT_TITLE_2, + "Joysticks deactivated on this screen"); +#else + DrawTextSCentered(SYSIZE - 20, FONT_TEXT_4, + "Joysticks deactivated on this screen"); +#endif +#endif + +#if 1 +#if 1 + for (i = 0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++) +#else for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) +#endif { if (setup_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST)) initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); @@ -5238,9 +5252,15 @@ void DrawSetupScreen_Input() #if 0 DeactivateJoystickForCalibration(); #endif + +#if 0 #if 1 + DrawTextSCentered(SYSIZE - 20, FONT_TITLE_2, + "Joysticks deactivated on this screen"); +#else DrawTextSCentered(SYSIZE - 20, FONT_TEXT_4, "Joysticks deactivated on this screen"); +#endif #endif /* create gadgets for setup input menu screen */ @@ -5252,13 +5272,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 +5517,8 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) { InitJoysticks(); + FadeSetLeaveMenu(); + setup_mode = SETUP_MODE_MAIN; DrawSetupScreen(); } @@ -5532,12 +5549,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 +5569,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 +5591,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 +5692,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 +5726,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 +5755,7 @@ static boolean CalibrateJoystickMain(int player_nr) break; case KSYM_Escape: + FadeSkipNextFadeIn(); result = 0; break; @@ -5862,6 +5902,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 +5931,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) @@ -6270,8 +6314,10 @@ void CreateScreenGadgets() CreateScreenMenubuttons(); +#if 0 /* force LEVELS draw offset for scrollbar / scrollbutton gadgets */ game_status = GAME_MODE_LEVELS; +#endif CreateScreenScrollbuttons(); CreateScreenScrollbars();