X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=34eec7468caa7ca501ff2a903757a82f8aa1a1b7;hp=5c8baa818d64dc46dadc2dff2881631266a40bc2;hb=a312d80612bb9a448cdc1abbde690b296fa92b17;hpb=eb09b9aa5521e286723c668030825cd0e3470c3c diff --git a/src/screens.c b/src/screens.c index 5c8baa81..34eec746 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,18 +125,6 @@ #define SC_BORDER_SIZE 14 -/* other useful macro definitions */ -#define BUTTON_GRAPHIC_ACTIVE(g) \ - (g == IMG_MENU_BUTTON_LEFT ? IMG_MENU_BUTTON_LEFT_ACTIVE : \ - g == IMG_MENU_BUTTON_RIGHT ? IMG_MENU_BUTTON_RIGHT_ACTIVE : \ - g == IMG_MENU_BUTTON_UP ? IMG_MENU_BUTTON_UP_ACTIVE : \ - g == IMG_MENU_BUTTON_DOWN ? IMG_MENU_BUTTON_DOWN_ACTIVE : \ - g == IMG_MENU_BUTTON_LEAVE_MENU ? IMG_MENU_BUTTON_LEAVE_MENU_ACTIVE : \ - 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 : \ - IMG_MENU_BUTTON_ACTIVE) - /* forward declarations of internal functions */ static void HandleScreenGadgets(struct GadgetInfo *); @@ -164,12 +159,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,15 +202,42 @@ static struct { -1, NULL }, }; +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)]) @@ -220,11 +245,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)) @@ -257,7 +293,6 @@ struct TitleControlInfo struct TitleControlInfo title_controls[MAX_NUM_TITLE_SCREENS]; - /* main menu display and control definitions */ #define MAIN_CONTROL_NAME 0 @@ -329,49 +364,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, }, @@ -540,8 +575,11 @@ static int getTitleBackground(int nr, boolean initial, boolean is_image) return IMG_UNDEFINED; } -static int getTitleSound(int nr, boolean initial, boolean is_image) +static int getTitleSound(struct TitleControlInfo *tci) { + boolean is_image = tci->is_image; + int initial = tci->initial; + int nr = tci->local_nr; int mode = (initial ? GAME_MODE_TITLE_INITIAL : GAME_MODE_TITLE); int base = (is_image ? (initial ? SND_BACKGROUND_TITLESCREEN_INITIAL_1 : @@ -567,8 +605,11 @@ static int getTitleSound(int nr, boolean initial, boolean is_image) return SND_UNDEFINED; } -static int getTitleMusic(int nr, boolean initial, boolean is_image) +static int getTitleMusic(struct TitleControlInfo *tci) { + boolean is_image = tci->is_image; + int initial = tci->initial; + int nr = tci->local_nr; int mode = (initial ? GAME_MODE_TITLE_INITIAL : GAME_MODE_TITLE); int base = (is_image ? (initial ? MUS_BACKGROUND_TITLESCREEN_INITIAL_1 : @@ -594,6 +635,56 @@ static int getTitleMusic(int nr, boolean initial, boolean is_image) return MUS_UNDEFINED; } +static struct TitleFadingInfo getTitleFading(struct TitleControlInfo *tci) +{ + boolean is_image = tci->is_image; + int initial = tci->initial; + int nr = tci->local_nr; + struct TitleFadingInfo ti; + + if (is_image) + { + int graphic = getTitleScreenGraphic(nr, initial); + + /* initialize fading control values to default title config settings */ + ti = (initial ? title_initial_default : title_default); + + /* override default settings with image config settings, if defined */ + 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) + ti.post_delay = graphic_info[graphic].post_delay; + if (graphic_info[graphic].auto_delay > -1) + ti.auto_delay = graphic_info[graphic].auto_delay; + } + else + { + if (initial) + { + 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.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; +} + static int compareTitleControlInfo(const void *object1, const void *object2) { const struct TitleControlInfo *tci1 = (struct TitleControlInfo *)object1; @@ -634,6 +725,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); } @@ -644,6 +741,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); } @@ -653,9 +756,13 @@ static void InitializeTitleControls(boolean show_title_initial) { num_title_screens = 0; +#if 1 + /* 1st step: initialize title screens for game start (only when starting) */ if (show_title_initial) InitializeTitleControls_CheckTitleInfo(TRUE); +#endif + /* 2nd step: initialize title screens for current level set */ InitializeTitleControls_CheckTitleInfo(FALSE); /* sort title screens according to sort_priority and title number */ @@ -680,9 +787,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; @@ -814,7 +925,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); } @@ -924,7 +1035,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); @@ -949,8 +1060,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); @@ -997,16 +1110,10 @@ void DrawTitleScreenImage(int nr, boolean initial) { int graphic = getTitleScreenGraphic(nr, initial); Bitmap *bitmap = graphic_info[graphic].bitmap; -#if 1 int width = graphic_info[graphic].width; int height = graphic_info[graphic].height; int src_x = graphic_info[graphic].src_x; int src_y = graphic_info[graphic].src_y; -#else - int width = graphic_info[graphic].src_image_width; - int height = graphic_info[graphic].src_image_height; - int src_x = 0, src_y = 0; -#endif int dst_x, dst_y; if (bitmap == NULL) @@ -1036,41 +1143,20 @@ void DrawTitleScreenImage(int nr, boolean initial) ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE); if (DrawingOnBackground(dst_x, dst_y)) + { + SetClipOrigin(bitmap, bitmap->stored_clip_gc, dst_x - src_x, dst_y - src_y); BlitBitmapMasked(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y); + } else BlitBitmap(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y); redraw_mask = REDRAW_ALL; - - /* reset fading control values to default config settings */ - title.fade_delay_final = title.fade_delay; - title.post_delay_final = title.post_delay; - title.auto_delay_final = title.auto_delay; - - /* override default settings with image config settings, if defined */ - if (graphic_info[graphic].fade_delay > -1) - title.fade_delay_final = graphic_info[graphic].fade_delay; - if (graphic_info[graphic].post_delay > -1) - title.post_delay_final = graphic_info[graphic].post_delay; - if (graphic_info[graphic].auto_delay > -1) - title.auto_delay_final = graphic_info[graphic].auto_delay; } void DrawTitleScreenMessage(int nr, boolean initial) { char *filename = getLevelSetTitleMessageFilename(nr, initial); struct TitleMessageInfo *tmi = getTitleMessageInfo(nr, initial); -#if 0 - int font_nr = FONT_TEXT_1; - int font_width; - int font_height; - int pad_x = 16 + 4; - int pad_y = 32 + 14; - int sx = pad_x; - int sy = pad_y; - int max_chars_per_line; - int max_lines_per_screen; -#endif int last_game_status = game_status; /* save current game status */ if (filename == NULL) @@ -1096,22 +1182,9 @@ void DrawTitleScreenMessage(int nr, boolean initial) ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE); -#if 0 - font_width = getFontWidth(font_nr); - font_height = getFontHeight(font_nr); - max_chars_per_line = (WIN_XSIZE - 2 * pad_x) / font_width; - max_lines_per_screen = (WIN_YSIZE - pad_y) / font_height - 1; -#endif - -#if 1 DrawTextFile(ALIGNED_TEXT_XPOS(tmi), ALIGNED_TEXT_YPOS(tmi), filename, tmi->font, tmi->chars, -1, tmi->lines, -1, - tmi->autowrap, tmi->centered, tmi->skip_comments); -#else - DrawTextFile(sx, sy, filename, font_nr, max_chars_per_line, -1, - max_lines_per_screen, -1, tmi->autowrap, tmi->centered, - tmi->skip_comments); -#endif + tmi->autowrap, tmi->centered, tmi->parse_comments); game_status = last_game_status; /* restore current game status */ } @@ -1146,18 +1219,14 @@ boolean CheckTitleScreen(boolean levelset_has_changed) return (show_titlescreen && num_title_screens > 0); } -void DrawMainMenuExt(int redraw_mask, boolean do_fading) +void DrawMainMenuExt(int fade_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 + + FadeSetLeaveScreen(); + + /* do not fade out here -- function may continue and fade on editor screen */ UnmapAllGadgets(); FadeSoundsAndMusic(); @@ -1181,9 +1250,6 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) return; } - /* needed if last screen was the editor screen */ - UndrawSpecialEditorDoor(); - /* needed if last screen was the setup screen and fullscreen state changed */ ToggleFullscreenIfNeeded(); @@ -1200,29 +1266,25 @@ 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) + fade_mask = REDRAW_ALL; #if 1 - if (CheckTitleScreen(levelset_has_changed)) - { - game_status = GAME_MODE_TITLE; + FadeOut(fade_mask); - DrawTitleScreen(); - - return; - } + /* needed if last screen was the editor screen */ + UndrawSpecialEditorDoor(); +#if 0 + if (fade_mask == REDRAW_FIELD) + BackToFront(); +#endif +#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; @@ -1230,88 +1292,32 @@ 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) level_nr = leveldir_current->handicap_level; LoadLevel(level_nr); + LoadScore(level_nr); SetMainBackgroundImage(IMG_BACKGROUND_MAIN); - ClearWindow(); #if 1 - InitializeMainControls(); - -#if 1 - DrawCursorAndText_Main(-1, FALSE); -#else - for (i = 0; main_controls[i].nr != -1; i++) + if (fade_mask == REDRAW_ALL) { - 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; + // int door_state = GetDoorState(); - 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); + RedrawBackground(); - if (pos_input != NULL && input != NULL) - DrawText(mSX + pos_input->x, mSY + pos_input->y, input, font_input); + // OpenDoor(door_state | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); } #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); + ClearField(); - /* 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 + InitializeMainControls(); + DrawCursorAndText_Main(-1, FALSE); DrawPreviewLevel(TRUE); HandleMainMenu(0, 0, 0, 0, MB_MENU_INITIALIZE); @@ -1332,12 +1338,27 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) MapTapeButtons(); MapScreenMenuGadgets(SCREEN_MASK_MAIN); +#if 1 + if (fade_mask == REDRAW_ALL) + { + int door_state = GetDoorState(); + + // RedrawBackground(); + + OpenDoor(door_state | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); + } +#endif + DrawMaskedBorder(REDRAW_ALL); - if (do_fading) - FadeIn(redraw_mask); - else - BackToFront(); + FadeIn(fade_mask); + FadeSetEnterMenu(); + +#if 1 + /* update screen area with special editor door */ + redraw_mask |= REDRAW_ALL; + BackToFront(); +#endif SetMouseCursor(CURSOR_DEFAULT); @@ -1346,9 +1367,9 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2); } -void DrawAndFadeInMainMenu(int redraw_mask) +void DrawAndFadeInMainMenu(int fade_mask) { - DrawMainMenuExt(redraw_mask, TRUE); + DrawMainMenuExt(fade_mask, TRUE); } void DrawMainMenu() @@ -1387,7 +1408,6 @@ static void gotoTopLevelDir() } #endif -#if 1 void HandleTitleScreen(int mx, int my, int dx, int dy, int button) { static unsigned long title_delay = 0; @@ -1395,20 +1415,14 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) static int last_sound = -1, last_music = -1; boolean return_to_main_menu = FALSE; boolean use_fading_main_menu = TRUE; -#if 1 - boolean use_cross_fading = FALSE; -#else - boolean use_cross_fading = !show_title_initial; /* default */ -#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 0 - int last_game_status = game_status; /* save current game status */ -#endif - title_delay = 0; title_screen_nr = 0; tci = &title_controls[title_screen_nr]; @@ -1416,11 +1430,6 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) last_sound = SND_UNDEFINED; last_music = MUS_UNDEFINED; -#if 0 - /* determine number of title screens to display (images and messages) */ - InitializeTitleControls(); -#endif - if (game_status == GAME_MODE_INFO) { if (num_title_screens == 0) @@ -1428,32 +1437,43 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) DrawInfoScreen_NotAvailable("Title screen information:", "No title screen for this level set."); - title.auto_delay_final = -1; - return; } FadeSoundsAndMusic(); +#if 1 FadeOut(REDRAW_ALL); +#endif } if (tci->is_image) - { DrawTitleScreenImage(tci->local_nr, tci->initial); - } else - { DrawTitleScreenMessage(tci->local_nr, tci->initial); - title.fade_delay_final = title.fade_delay; - title.post_delay_final = title.post_delay; - title.auto_delay_final = -1; + 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->local_nr, tci->initial, tci->is_image); - music = getTitleMusic(tci->local_nr, tci->initial, tci->is_image); + sound = getTitleSound(tci); + music = getTitleMusic(tci); if (sound != last_sound) PlayMenuSoundExt(sound); @@ -1466,16 +1486,24 @@ 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_final > -1 && - DelayReached(&title_delay, title.auto_delay_final)) +#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) { @@ -1484,11 +1512,13 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) } else if (button == MB_MENU_CHOICE) { - int anim_mode; - if (game_status == GAME_MODE_INFO && num_title_screens == 0) { +#if 0 FadeOut(REDRAW_FIELD); +#endif + + FadeSetEnterScreen(); info_mode = INFO_MODE_MAIN; DrawAndFadeInInfoScreen(REDRAW_FIELD); @@ -1499,40 +1529,30 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) title_screen_nr++; tci = &title_controls[title_screen_nr]; - if (tci->is_image) - anim_mode = - graphic_info[getTitleScreenGraphic(tci->local_nr, - tci->initial)].anim_mode; - else - anim_mode = ANIM_FADE; /* ??? */ - - use_cross_fading = (anim_mode == ANIM_FADE ? FALSE : - anim_mode == ANIM_CROSSFADE ? TRUE : - use_cross_fading); - if (title_screen_nr < num_title_screens) { - sound = getTitleSound(tci->local_nr, tci->initial, tci->is_image); - music = getTitleMusic(tci->local_nr, tci->initial, tci->is_image); + sound = getTitleSound(tci); + music = getTitleMusic(tci); if (sound == SND_UNDEFINED || sound != last_sound) FadeSounds(); 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); + fading_next = getTitleFading(tci); + #if 1 - sound = getTitleSound(tci->local_nr, tci->initial, tci->is_image); - music = getTitleMusic(tci->local_nr, tci->initial, tci->is_image); + sound = getTitleSound(tci); + music = getTitleMusic(tci); if (sound != last_sound) PlayMenuSoundExt(sound); @@ -1543,10 +1563,23 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) last_music = music; #endif - if (use_cross_fading) - FadeCross(REDRAW_ALL); - else - FadeIn(REDRAW_ALL); +#if 1 + /* last screen already faded out, next screen has no animation */ + 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 1 + FadeIn(REDRAW_ALL); +#endif + + fading = fading_next; DelayReached(&title_delay, 0); /* reset delay counter */ } @@ -1554,28 +1587,32 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) { FadeSoundsAndMusic(); - FadeOut(REDRAW_ALL); - return_to_main_menu = TRUE; } } 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); @@ -1583,226 +1620,41 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) } } -#else - -void HandleTitleScreen(int mx, int my, int dx, int dy, int button) +void HandleMainMenu_SelectLevel(int step, int direction) { - static unsigned long title_delay = 0; - static int title_nr = 0; - static boolean showing_message = FALSE; - char *filename = getLevelSetMessageFilename(); - boolean return_to_main_menu = FALSE; - boolean use_fading_main_menu = TRUE; - boolean use_cross_fading = !show_title_initial; /* default */ - boolean no_title_info = (graphic_info[IMG_TITLESCREEN_1].bitmap == NULL && - getLevelSetMessageFilename(1, FALSE) == NULL); + int old_level_nr = level_nr; + int new_level_nr; - if (button == MB_MENU_INITIALIZE) - { - int last_game_status = game_status; /* save current game status */ + new_level_nr = old_level_nr + step * direction; + if (new_level_nr < leveldir_current->first_level) + new_level_nr = leveldir_current->first_level; + if (new_level_nr > leveldir_current->last_level) + new_level_nr = leveldir_current->last_level; - title_delay = 0; - title_nr = 0; - showing_message = FALSE; + if (setup.handicap && new_level_nr > leveldir_current->handicap_level) + { + /* skipping levels is only allowed when trying to skip single level */ + if (setup.skip_levels && step == 1 && + Request("Level still unsolved ! Skip despite handicap ?", REQ_ASK)) + { + leveldir_current->handicap_level++; + SaveLevelSetup_SeriesInfo(); + } - if (show_title_initial && - graphic_info[IMG_TITLESCREEN_INITIAL_1].bitmap == NULL && - getLevelSetMessageFilename(1, TRUE) == NULL) - show_title_initial = FALSE; + new_level_nr = leveldir_current->handicap_level; + } - if (game_status == GAME_MODE_INFO) - { - if (no_title_info) - { - DrawInfoScreen_NotAvailable("Title screen information:", - "No title screen for this level set."); + if (new_level_nr != old_level_nr) + { + struct MainControlInfo *mci= getMainControlInfo(MAIN_CONTROL_LEVEL_NUMBER); - title.auto_delay_final = -1; + PlaySound(SND_MENU_ITEM_SELECTING); - return; - } + level_nr = new_level_nr; - FadeSoundsAndMusic(); - - FadeOut(REDRAW_ALL); - } - - /* force TITLE music on title info screen */ - game_status = GAME_MODE_TITLE; - - PlayMenuSound(); - PlayMenuMusic(); - - game_status = last_game_status; /* restore current game status */ - - if (graphic_info[getTitleScreenGraphic(0, show_title_initial)].bitmap != NULL) - { - DrawTitleScreenImage(title_nr, show_title_initial); - } - else - { - DrawTitleScreenMessage(filename); - - showing_message = TRUE; - - title.fade_delay_final = title.fade_delay; - title.post_delay_final = title.post_delay; - title.auto_delay_final = -1; - } - - FadeIn(REDRAW_ALL); - - DelayReached(&title_delay, 0); /* reset delay counter */ - - return; - } - - if (title.auto_delay_final > -1 && - DelayReached(&title_delay, title.auto_delay_final)) - button = MB_MENU_CHOICE; - - if (button == MB_MENU_LEAVE) - { - return_to_main_menu = TRUE; - use_fading_main_menu = FALSE; - } - else if (button == MB_MENU_CHOICE) - { - int anim_mode; - - if (game_status == GAME_MODE_INFO && no_title_info) - { - FadeOut(REDRAW_FIELD); - - info_mode = INFO_MODE_MAIN; - DrawAndFadeInInfoScreen(REDRAW_FIELD); - - return; - } - - title_nr++; - - if (show_title_initial && - (title_nr >= MAX_NUM_TITLE_IMAGES || - graphic_info[IMG_TITLESCREEN_INITIAL_1 + title_nr].bitmap == NULL)) - { - show_title_initial = FALSE; - - title_nr = 0; /* restart with title screens for current level set */ - } - - anim_mode = graphic_info[getTitleScreenGraphic(title_nr, show_title_initial)].anim_mode; - - use_cross_fading = (anim_mode == ANIM_FADE ? FALSE : - anim_mode == ANIM_CROSSFADE ? TRUE : - use_cross_fading); - - if (!use_cross_fading) - FadeOut(REDRAW_ALL); - - if (title_nr < MAX_NUM_TITLE_IMAGES && - graphic_info[getTitleScreenGraphic(title_nr, show_title_initial)].bitmap != NULL) - { - if (use_cross_fading) - FadeCrossSaveBackbuffer(); - - DrawTitleScreenImage(title_nr, show_title_initial); - - if (use_cross_fading) - FadeCross(REDRAW_ALL); - else - FadeIn(REDRAW_ALL); - - DelayReached(&title_delay, 0); /* reset delay counter */ - } - else if (!showing_message && filename != NULL) - { - if (use_cross_fading) - FadeCrossSaveBackbuffer(); - - DrawTitleScreenMessage(filename); - - if (use_cross_fading) - FadeCross(REDRAW_ALL); - else - FadeIn(REDRAW_ALL); - - DelayReached(&title_delay, 0); /* reset delay counter */ - - showing_message = TRUE; - } - else - { - FadeSoundsAndMusic(); - - FadeOut(REDRAW_ALL); - - return_to_main_menu = TRUE; - } - } - - if (return_to_main_menu) - { - show_title_initial = FALSE; - - RedrawBackground(); - - if (game_status == GAME_MODE_INFO) - { - OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); - - info_mode = INFO_MODE_MAIN; - DrawInfoScreenExt(REDRAW_ALL, use_fading_main_menu); - } - else /* default: return to main menu */ - { - OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); - - game_status = GAME_MODE_MAIN; - DrawMainMenuExt(REDRAW_ALL, use_fading_main_menu); - } - } -} -#endif - -void HandleMainMenu_SelectLevel(int step, int direction) -{ - int old_level_nr = level_nr; - int new_level_nr; - - new_level_nr = old_level_nr + step * direction; - if (new_level_nr < leveldir_current->first_level) - new_level_nr = leveldir_current->first_level; - if (new_level_nr > leveldir_current->last_level) - new_level_nr = leveldir_current->last_level; - - if (setup.handicap && new_level_nr > leveldir_current->handicap_level) - { - /* skipping levels is only allowed when trying to skip single level */ - if (setup.skip_levels && step == 1 && - Request("Level still unsolved ! Skip despite handicap ?", REQ_ASK)) - { - leveldir_current->handicap_level++; - SaveLevelSetup_SeriesInfo(); - } - - new_level_nr = leveldir_current->handicap_level; - } - - if (new_level_nr != old_level_nr) - { - struct MainControlInfo *mci= getMainControlInfo(MAIN_CONTROL_LEVEL_NUMBER); - - PlaySound(SND_MENU_ITEM_SELECTING); - - level_nr = new_level_nr; - -#if 1 - DrawText(mSX + mci->pos_text->x, mSY + mci->pos_text->y, - int2str(level_nr, 3), mci->pos_text->font); -#else - DrawText(mSX + 11 * 32, mSY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1); -#endif + DrawText(mSX + mci->pos_text->x, mSY + mci->pos_text->y, + int2str(level_nr, menu.main.text.level_number.size), + mci->pos_text->font); LoadLevel(level_nr); DrawPreviewLevel(TRUE); @@ -1817,8 +1669,6 @@ void HandleMainMenu_SelectLevel(int step, int direction) } } -#if 1 - void HandleMainMenu(int mx, int my, int dx, int dy, int button) { static int choice = MAIN_CONTROL_GAME; @@ -1915,6 +1765,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) game_status = GAME_MODE_EDITOR; + FadeSetEnterScreen(); + DrawLevelEd(); } else if (pos == MAIN_CONTROL_INFO) @@ -1926,7 +1778,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) } else if (pos == MAIN_CONTROL_GAME) { - StartGameActions(options.network, setup.autorecord, NEW_RANDOMIZE); + StartGameActions(options.network, setup.autorecord, level.random_seed); } else if (pos == MAIN_CONTROL_SETUP) { @@ -1953,128 +1805,6 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) } } -#else - -void HandleMainMenu(int mx, int my, int dx, int dy, int button) -{ - static int choice = 5; - int x = 0; - int y = choice; - - if (button == MB_MENU_INITIALIZE) - { - drawCursor(choice, TRUE); - - return; - } - - if (mx || my) /* mouse input */ - { - x = (mx - mSX) / 32; - y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS; - } - else if (dx || dy) /* keyboard input */ - { - if (dx && choice == 1) - x = (dx < 0 ? 10 : 14); - else if (dx > 0) - { - if (choice == 4 || choice == 6) - button = MB_MENU_CHOICE; - } - else if (dy) - y = choice + dy; - } - - if (y == 1 && dx != 0 && button) - { - HandleMainMenu_SelectLevel(1, dx < 0 ? -1 : +1); - } - else if (IN_VIS_FIELD(x, y) && - y >= 0 && y <= 7 && (y != 1 || x < 10)) - { - if (button) - { - if (y != choice) - { - drawCursor(choice, FALSE); - drawCursor(y, TRUE); - - choice = y; - } - } - else - { - if (y == 0) - { - game_status = GAME_MODE_PSEUDO_TYPENAME; - HandleTypeName(strlen(setup.player_name), 0); - } - else if (y == 1) - { - if (leveldir_first) - { - game_status = GAME_MODE_LEVELS; - SaveLevelSetup_LastSeries(); - SaveLevelSetup_SeriesInfo(); - -#if 0 - gotoTopLevelDir(); -#endif - - DrawChooseLevel(); - } - } - else if (y == 2) - { - game_status = GAME_MODE_SCORES; - DrawHallOfFame(-1); - } - else if (y == 3) - { - if (leveldir_current->readonly && - !strEqual(setup.player_name, "Artsoft")) - Request("This level is read only !", REQ_CONFIRM); - game_status = GAME_MODE_EDITOR; - DrawLevelEd(); - } - else if (y == 4) - { - game_status = GAME_MODE_INFO; - info_mode = INFO_MODE_MAIN; - DrawInfoScreen(); - } - else if (y == 5) - { - StartGameActions(options.network, setup.autorecord, NEW_RANDOMIZE); - } - else if (y == 6) - { - game_status = GAME_MODE_SETUP; - setup_mode = SETUP_MODE_MAIN; - - DrawSetupScreen(); - } - else if (y == 7) - { - SaveLevelSetup_LastSeries(); - SaveLevelSetup_SeriesInfo(); - - if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED)) - game_status = GAME_MODE_QUIT; - } - } - } - - if (game_status == GAME_MODE_MAIN) - { - DrawPreviewLevel(FALSE); - DoAnimation(); - } -} - -#endif - /* ========================================================================= */ /* info screen functions */ @@ -2086,49 +1816,57 @@ static int num_info_info; static void execInfoTitleScreen() { info_mode = INFO_MODE_TITLE; + DrawInfoScreen(); } static void execInfoElements() { info_mode = INFO_MODE_ELEMENTS; + DrawInfoScreen(); } static void execInfoMusic() { info_mode = INFO_MODE_MUSIC; + DrawInfoScreen(); } static void execInfoCredits() { info_mode = INFO_MODE_CREDITS; + DrawInfoScreen(); } static void execInfoProgram() { info_mode = INFO_MODE_PROGRAM; + DrawInfoScreen(); } static void execInfoVersion() { info_mode = INFO_MODE_VERSION; + DrawInfoScreen(); } static void execInfoLevelSet() { info_mode = INFO_MODE_LEVELSET; + DrawInfoScreen(); } static void execExitInfo() { game_status = GAME_MODE_MAIN; - DrawMainMenu(); + + DrawMainMenuExt(REDRAW_FIELD, FALSE); } static struct TokenInfo info_info_main[] = @@ -2161,28 +1899,44 @@ static void DrawCursorAndText_Info(int pos, boolean active) drawCursor(pos, active); } -static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading) +static void DrawInfoScreen_Main(int fade_mask, boolean do_fading) { int i; UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); - ClearWindow(); + /* (needed after displaying title screens which disable auto repeat) */ + KeyboardAutoRepeatOn(); + + FadeSetLeaveScreen(); + +#if 1 + FadeOut(fade_mask); +#endif + +#if 1 + if (fade_mask == REDRAW_ALL) + { + RedrawBackground(); + + OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); + } +#endif + + ClearField(); DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Info Screen"); 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)) @@ -2190,11 +1944,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++; } @@ -2204,12 +1954,9 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading) PlayMenuSound(); PlayMenuMusic(); - DrawMaskedBorder(REDRAW_ALL); + DrawMaskedBorder(fade_mask); - if (do_fading) - FadeIn(redraw_mask); - else - BackToFront(); + FadeIn(fade_mask); InitAnimation(); } @@ -2229,11 +1976,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; } @@ -2245,6 +1988,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'! */ @@ -2267,7 +2012,8 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button) if (info_info[choice].type & menu_navigation_type || info_info[choice].type & TYPE_ENTER_SCREEN || - info_info[choice].type & TYPE_BOOLEAN_STYLE) + info_info[choice].type & TYPE_BOOLEAN_STYLE || + info_info[choice].type & TYPE_YES_NO_AUTO) button = MB_MENU_CHOICE; } else if (dy) @@ -2288,13 +2034,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; } @@ -2307,6 +2048,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(); } } @@ -2315,21 +2058,15 @@ 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); FadeOut(REDRAW_FIELD); - ClearWindow(); + ClearField(); DrawHeadline(); DrawTextSCentered(ystart1, FONT_TEXT_1, text_title); @@ -2361,7 +2098,7 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) for (i = 0; i < MAX_INFO_ELEMENTS_ON_SCREEN; i++) infoscreen_step[i] = infoscreen_frame[i] = 0; - ClearWindow(); + ClearField(); DrawHeadline(); DrawTextSCentered(ystart1, FONT_TEXT_1, "The Game Elements:"); @@ -2471,11 +2208,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; @@ -2503,14 +2236,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() @@ -2590,7 +2318,6 @@ void HandleInfoScreen_Elements(int button) if (page >= num_pages) { FadeSoundsAndMusic(); - FadeOut(REDRAW_FIELD); info_mode = INFO_MODE_MAIN; DrawAndFadeInInfoScreen(REDRAW_FIELD); @@ -2598,13 +2325,18 @@ void HandleInfoScreen_Elements(int button) return; } +#if 1 + if (page > 0) + FadeSetNextScreen(); +#endif + if (button != MB_MENU_INITIALIZE) - FadeCrossSaveBackbuffer(); + FadeOut(REDRAW_FIELD); DrawInfoScreen_HelpAnim(page * anims_per_page, num_anims, TRUE); if (button != MB_MENU_INITIALIZE) - FadeCross(REDRAW_FIELD); + FadeIn(REDRAW_FIELD); } else { @@ -2620,16 +2352,20 @@ void DrawInfoScreen_Music() { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC); +#if 1 FadeOut(REDRAW_FIELD); +#endif - ClearWindow(); + ClearField(); DrawHeadline(); LoadMusicInfo(); HandleInfoScreen_Music(MB_MENU_INITIALIZE); +#if 1 FadeIn(REDRAW_FIELD); +#endif } void HandleInfoScreen_Music(int button) @@ -2648,7 +2384,7 @@ void HandleInfoScreen_Music(int button) { FadeSoundsAndMusic(); - ClearWindow(); + ClearField(); DrawHeadline(); DrawTextSCentered(ystart1, FONT_TEXT_1, @@ -2687,7 +2423,6 @@ void HandleInfoScreen_Music(int button) if (list == NULL) { FadeSoundsAndMusic(); - FadeOut(REDRAW_FIELD); info_mode = INFO_MODE_MAIN; DrawAndFadeInInfoScreen(REDRAW_FIELD); @@ -2697,10 +2432,15 @@ void HandleInfoScreen_Music(int button) FadeSoundsAndMusic(); +#if 1 + if (list != music_file_info) + FadeSetNextScreen(); +#endif + if (button != MB_MENU_INITIALIZE) - FadeCrossSaveBackbuffer(); + FadeOut(REDRAW_FIELD); - ClearWindow(); + ClearField(); DrawHeadline(); if (list->is_sound) @@ -2763,24 +2503,21 @@ void HandleInfoScreen_Music(int button) "Press any key or button for next page"); if (button != MB_MENU_INITIALIZE) - FadeCross(REDRAW_FIELD); + FadeIn(REDRAW_FIELD); } 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(); + ClearField(); DrawHeadline(); DrawTextSCentered(ystart1, FONT_TEXT_1, "Credits:"); @@ -2902,8 +2639,15 @@ static boolean DrawInfoScreen_CreditsScreen(int screen_nr) "Thanks to"); DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3, "David Tritscher"); +#if 1 + DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2, + "for the code base used for the"); + DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_2, + "native Emerald Mine engine"); +#else DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2, "for the new Emerald Mine engine"); +#endif } else if (screen_nr == 7) { @@ -2934,17 +2678,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() @@ -2953,24 +2689,30 @@ 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) { 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); @@ -2979,30 +2721,37 @@ 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 1 + if (screen_nr > 0) + FadeSetNextScreen(); +#endif + + if (button != MB_MENU_INITIALIZE) FadeOut(REDRAW_FIELD); - info_mode = INFO_MODE_MAIN; - DrawAndFadeInInfoScreen(REDRAW_FIELD); - } + DrawInfoScreen_CreditsScreen(screen_nr); + + if (button != MB_MENU_INITIALIZE) + FadeIn(REDRAW_FIELD); } else { @@ -3019,9 +2768,11 @@ void DrawInfoScreen_Program() SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM); +#if 1 FadeOut(REDRAW_FIELD); +#endif - ClearWindow(); + ClearField(); DrawHeadline(); DrawTextSCentered(ystart1, FONT_TEXT_1, "Program Information:"); @@ -3056,7 +2807,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) @@ -3075,7 +2828,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); @@ -3107,9 +2863,11 @@ void DrawInfoScreen_Version() SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION); +#if 1 FadeOut(REDRAW_FIELD); +#endif - ClearWindow(); + ClearField(); DrawHeadline(); DrawTextSCentered(ystart1, FONT_TEXT_1, "Version Information:"); @@ -3218,7 +2976,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) @@ -3237,7 +2997,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); @@ -3267,9 +3030,11 @@ void DrawInfoScreen_LevelSet() SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET); +#if 1 FadeOut(REDRAW_FIELD); +#endif - ClearWindow(); + ClearField(); DrawHeadline(); DrawTextCentered(mSY + 100, FONT_TEXT_1, "Level Set Information:"); @@ -3277,7 +3042,7 @@ void DrawInfoScreen_LevelSet() if (filename != NULL) DrawTextFile(mSX + ALIGNED_TEXT_XPOS(tmi), mSY + ALIGNED_TEXT_YPOS(tmi), filename, tmi->font, tmi->chars, -1, tmi->lines, -1, - tmi->autowrap, tmi->centered, tmi->skip_comments); + tmi->autowrap, tmi->centered, tmi->parse_comments); else DrawTextCentered(mSY + ALIGNED_TEXT_YPOS(tmi), FONT_TEXT_2, "No information for this level set."); @@ -3285,7 +3050,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) @@ -3304,7 +3071,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); @@ -3315,7 +3085,7 @@ void HandleInfoScreen_LevelSet(int button) } } -static void DrawInfoScreenExt(int redraw_mask, boolean do_fading) +static void DrawInfoScreenExt(int fade_mask, boolean do_fading) { SetMainBackgroundImage(IMG_BACKGROUND_INFO); @@ -3334,7 +3104,7 @@ static void DrawInfoScreenExt(int redraw_mask, boolean do_fading) else if (info_mode == INFO_MODE_LEVELSET) DrawInfoScreen_LevelSet(); else - DrawInfoScreen_Main(redraw_mask, do_fading); + DrawInfoScreen_Main(fade_mask, do_fading); if (info_mode != INFO_MODE_MAIN && info_mode != INFO_MODE_TITLE && @@ -3345,14 +3115,14 @@ static void DrawInfoScreenExt(int redraw_mask, boolean do_fading) } } -void DrawAndFadeInInfoScreen(int redraw_mask) +void DrawAndFadeInInfoScreen(int fade_mask) { - DrawInfoScreenExt(redraw_mask, TRUE); + DrawInfoScreenExt(fade_mask, TRUE); } void DrawInfoScreen() { - DrawInfoScreenExt(REDRAW_ALL, FALSE); + DrawInfoScreenExt(REDRAW_FIELD, FALSE); } void HandleInfoScreen(int mx, int my, int dx, int dy, int button) @@ -3386,29 +3156,13 @@ void HandleTypeName(int newxpos, Key key) { static char last_player_name[MAX_PLAYER_NAME_LEN + 1]; struct MainControlInfo *mci = getMainControlInfo(MAIN_CONTROL_NAME); -#if 1 struct TextPosInfo *pos = mci->pos_input; int startx = mSX + ALIGNED_TEXT_XPOS(pos); int starty = mSY + ALIGNED_TEXT_YPOS(pos); -#endif -#if 1 static int xpos = 0; -#else - static int xpos = 0, ypos = 2; -#endif int font_nr = pos->font; int font_active_nr = FONT_ACTIVE(font_nr); int font_width = getFontWidth(font_active_nr); -#if 1 -#if 0 - int startx = mSX + mci->pos_input->x; - int starty = mSY + mci->pos_input->y; -#endif -#else - int name_width = getFontWidth(FONT_MENU_1) * strlen("Name:"); - int startx = mSX + 32 + name_width; - int starty = mSY + ypos * 32; -#endif char key_char = getValidConfigValueChar(getCharFromKey(key)); boolean is_valid_key_char = (key_char != 0 && (key_char != ' ' || xpos > 0)); boolean is_active = TRUE; @@ -3420,15 +3174,6 @@ void HandleTypeName(int newxpos, Key key) strcpy(last_player_name, setup.player_name); xpos = newxpos; - -#if 0 - /* add one character width for added cursor character */ - pos->width += font_width; - startx = mSX + ALIGNED_TEXT_XPOS(pos); - - DrawText(startx, starty, setup.player_name, font_active_nr); - DrawText(startx + xpos * font_width, starty, "_", font_active_nr); -#endif } else if (is_valid_key_char && xpos < MAX_PLAYER_NAME_LEN) { @@ -3436,42 +3181,15 @@ void HandleTypeName(int newxpos, Key key) setup.player_name[xpos + 1] = 0; xpos++; - -#if 0 - /* add one character width for added name text character */ - pos->width += font_width; - startx = mSX + ALIGNED_TEXT_XPOS(pos); - - DrawText(startx, starty, setup.player_name, font_active_nr); - DrawText(startx + xpos * font_width, starty, "_", font_active_nr); -#endif } else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0) { xpos--; setup.player_name[xpos] = 0; - -#if 0 - /* remove one character width for removed name text character */ - pos->width -= font_width; - startx = mSX + ALIGNED_TEXT_XPOS(pos); - - DrawText(startx, starty, setup.player_name, font_active_nr); - DrawText(startx + xpos * font_width, starty, "_ ", font_active_nr); -#endif } else if (key == KSYM_Return && xpos > 0) { -#if 0 - /* remove one character width for removed cursor text character */ - pos->width -= font_width; - startx = mSX + ALIGNED_TEXT_XPOS(pos); - - DrawText(startx, starty, setup.player_name, font_nr); - DrawText(startx + xpos * font_width, starty, " ", font_active_nr); -#endif - SaveSetup(); is_active = FALSE; @@ -3518,12 +3236,19 @@ static void DrawChooseTree(TreeInfo **ti_ptr) CloseDoor(DOOR_CLOSE_2); - ClearWindow(); +#if 1 + FadeOut(REDRAW_FIELD); +#endif + + ClearField(); HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr); MapScreenTreeGadgets(*ti_ptr); - FadeToFront(); +#if 1 + FadeIn(REDRAW_FIELD); +#endif + InitAnimation(); } @@ -3559,8 +3284,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 */ @@ -3654,8 +3381,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; @@ -3698,6 +3427,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) @@ -3709,7 +3440,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(); @@ -3717,7 +3449,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, else { game_status = GAME_MODE_MAIN; - DrawMainMenu(); + + DrawMainMenuExt(REDRAW_FIELD, FALSE); } return; @@ -3727,8 +3460,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; @@ -3799,6 +3534,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; @@ -3811,6 +3548,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; @@ -3849,6 +3588,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; @@ -3856,11 +3597,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; @@ -3878,7 +3623,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(); @@ -3928,7 +3674,13 @@ void DrawHallOfFame(int highlight_position) if (highlight_position < 0) LoadScore(level_nr); + FadeSetEnterScreen(); + + // printf("::: %d: %d\n", game_status, menu.enter_screen[game_status]); + +#if 1 FadeOut(REDRAW_FIELD); +#endif InitAnimation(); @@ -3937,7 +3689,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) @@ -3945,7 +3699,7 @@ static void drawHallOfFameList(int first_entry, int highlight_position) int i; SetMainBackgroundImage(IMG_BACKGROUND_SCORES); - ClearWindow(); + ClearField(); DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, "Hall Of Fame"); DrawTextFCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, @@ -4032,7 +3786,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; @@ -4054,6 +3811,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; @@ -4062,6 +3820,7 @@ static char *music_set_name; static void execSetupMain() { setup_mode = SETUP_MODE_MAIN; + DrawSetupScreen(); } @@ -4115,18 +3874,21 @@ static void execSetupGame() game_speed_text = game_speed_current->name; setup_mode = SETUP_MODE_GAME; + DrawSetupScreen(); } static void execSetupChooseGameSpeed() { setup_mode = SETUP_MODE_CHOOSE_GAME_SPEED; + DrawSetupScreen(); } static void execSetupEditor() { setup_mode = SETUP_MODE_EDITOR; + DrawSetupScreen(); } @@ -4188,6 +3950,55 @@ 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(); } @@ -4198,17 +4009,33 @@ static void execSetupChooseScreenMode() return; setup_mode = SETUP_MODE_CHOOSE_SCREEN_MODE; + + DrawSetupScreen(); +} + +static void execSetupChooseScrollDelay() +{ + setup_mode = SETUP_MODE_CHOOSE_SCROLL_DELAY; + DrawSetupScreen(); } static void execSetupSound() { setup_mode = SETUP_MODE_SOUND; + DrawSetupScreen(); } static void execSetupArtwork() { +#if 0 + printf("::: '%s', '%s', '%s'\n", + artwork.gfx_current->subdir, + artwork.gfx_current->fullpath, + artwork.gfx_current->basepath); +#endif + setup.graphics_set = artwork.gfx_current->identifier; setup.sounds_set = artwork.snd_current->identifier; setup.music_set = artwork.mus_current->identifier; @@ -4222,49 +4049,57 @@ static void execSetupArtwork() music_set_name = artwork.mus_current->name; setup_mode = SETUP_MODE_ARTWORK; + DrawSetupScreen(); } static void execSetupChooseGraphics() { setup_mode = SETUP_MODE_CHOOSE_GRAPHICS; + DrawSetupScreen(); } static void execSetupChooseSounds() { setup_mode = SETUP_MODE_CHOOSE_SOUNDS; + DrawSetupScreen(); } static void execSetupChooseMusic() { setup_mode = SETUP_MODE_CHOOSE_MUSIC; + DrawSetupScreen(); } static void execSetupInput() { setup_mode = SETUP_MODE_INPUT; + DrawSetupScreen(); } -static void execSetupShortcut1() +static void execSetupShortcuts1() { - setup_mode = SETUP_MODE_SHORTCUT_1; + setup_mode = SETUP_MODE_SHORTCUTS_1; + DrawSetupScreen(); } -static void execSetupShortcut2() +static void execSetupShortcuts2() { - setup_mode = SETUP_MODE_SHORTCUT_2; + setup_mode = SETUP_MODE_SHORTCUTS_2; + DrawSetupScreen(); } static void execExitSetup() { game_status = GAME_MODE_MAIN; - DrawMainMenu(); + + DrawMainMenuExt(REDRAW_FIELD, FALSE); } static void execSaveAndExitSetup() @@ -4281,8 +4116,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" }, @@ -4344,10 +4179,13 @@ 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:" }, #endif { TYPE_SWITCH, &setup.fade_screens, "Fade Screens:" }, { TYPE_SWITCH, &setup.quick_switch, "Quick Player Focus Switch:" }, @@ -4355,6 +4193,7 @@ static struct TokenInfo setup_info_graphics[] = { TYPE_SWITCH, &setup.show_titlescreen,"Show Title Screens:" }, { TYPE_SWITCH, &setup.toons, "Show Toons:" }, { TYPE_ECS_AGA, &setup.prefer_aga_graphics,"EMC graphics preference:" }, + { TYPE_SWITCH, &setup.sp_show_border_elements,"Supaplex Border Elements:" }, { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Back" }, @@ -4382,9 +4221,16 @@ static struct TokenInfo setup_info_artwork[] = { TYPE_STRING, &music_set_name, "" }, { TYPE_EMPTY, NULL, "" }, #if 1 +#if 1 + { TYPE_YES_NO_AUTO,&setup.override_level_graphics,"Override Level Graphics:"}, + { TYPE_YES_NO_AUTO,&setup.override_level_sounds, "Override Level Sounds:" }, + { TYPE_YES_NO_AUTO,&setup.override_level_music, "Override Level Music:" }, +#else { TYPE_YES_NO, &setup.override_level_graphics,"Override Level Graphics:" }, { TYPE_YES_NO, &setup.override_level_sounds, "Override Level Sounds:" }, { TYPE_YES_NO, &setup.override_level_music, "Override Level Music:" }, + { TYPE_YES_NO, &setup.auto_override_artwork, "Auto-Override Non-CE Sets:" }, +#endif #else { TYPE_STRING, NULL, "Override Level Artwork:"}, { TYPE_YES_NO, &setup.override_level_graphics, "Graphics:" }, @@ -4417,7 +4263,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, "" }, @@ -4434,7 +4280,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], "" }, @@ -4501,11 +4347,12 @@ static Key getSetupKey() static int getSetupTextFont(int type) { - if (type & (TYPE_SWITCH | - TYPE_YES_NO | - TYPE_STRING | - TYPE_ECS_AGA | - TYPE_KEYTEXT | + if (type & (TYPE_SWITCH | + TYPE_YES_NO | + TYPE_YES_NO_AUTO | + TYPE_STRING | + TYPE_ECS_AGA | + TYPE_KEYTEXT | TYPE_ENTER_LIST)) return FONT_MENU_2; else @@ -4522,6 +4369,9 @@ static int getSetupValueFont(int type, void *value) return FONT_VALUE_1; else if (type & TYPE_BOOLEAN_STYLE) return (*(boolean *)value ? FONT_OPTION_ON : FONT_OPTION_OFF); + else if (type & TYPE_YES_NO_AUTO) + return (*(int *)value == AUTO ? FONT_OPTION_ON : + *(int *)value == FALSE ? FONT_OPTION_OFF : FONT_OPTION_ON); else return FONT_VALUE_1; } @@ -4534,11 +4384,13 @@ static void drawSetupValue(int pos) int ypos = MENU_SCREEN_START_YPOS + pos; int startx = mSX + xpos * 32; int starty = mSY + ypos * 32; - int font_nr, font_width; + int font_nr, font_width, font_height; int type = setup_info[pos].type; void *value = setup_info[pos].value; char *value_string = getSetupValue(type, value); +#if 1 int i; +#endif if (value_string == NULL) return; @@ -4548,9 +4400,7 @@ static void drawSetupValue(int pos) xpos = MENU_SCREEN_START_XPOS; if (type & TYPE_QUERY) - { value_string = ""; - } } else if (type & TYPE_STRING) { @@ -4561,11 +4411,16 @@ static void drawSetupValue(int pos) if (strlen(value_string) > max_value_len) value_string[max_value_len] = '\0'; } + else if (type & TYPE_YES_NO_AUTO) + { + xpos = MENU_SCREEN_VALUE_XPOS - 1; + } startx = mSX + xpos * 32; starty = mSY + ypos * 32; font_nr = getSetupValueFont(type, value); font_width = getFontWidth(font_nr); + font_height = getFontHeight(font_nr); /* downward compatibility correction for Juergen Bonhagen's menu settings */ if (setup_mode != SETUP_MODE_INPUT) @@ -4602,8 +4457,12 @@ static void drawSetupValue(int pos) } } +#if 0 + DrawBackground(startx, starty, SX + SXSIZE - startx, font_height); +#else for (i = 0; i <= MENU_SCREEN_MAX_XPOS - xpos; i++) DrawText(startx + i * font_width, starty, " ", font_nr); +#endif DrawText(startx, starty, value_string, font_nr); @@ -4611,12 +4470,21 @@ static void drawSetupValue(int pos) getFontBitmapInfo(font_nr)->draw_xoffset = font_draw_xoffset_old; } -static void changeSetupValue(int pos) +static void changeSetupValue(int pos, int dx) { if (setup_info[pos].type & TYPE_BOOLEAN_STYLE) { *(boolean *)setup_info[pos].value ^= TRUE; } + else if (setup_info[pos].type & TYPE_YES_NO_AUTO) + { + *(int *)setup_info[pos].value = + (dx == -1 ? + (*(int *)setup_info[pos].value == AUTO ? TRUE : + *(int *)setup_info[pos].value == TRUE ? FALSE : AUTO) : + (*(int *)setup_info[pos].value == TRUE ? AUTO : + *(int *)setup_info[pos].value == AUTO ? FALSE : TRUE)); + } else if (setup_info[pos].type & TYPE_KEY) { Key key; @@ -4653,13 +4521,30 @@ 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); - ClearWindow(); + 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 + + ClearField(); if (setup_mode == SETUP_MODE_MAIN) { @@ -4691,29 +4576,27 @@ 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; - for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) - { - void *value_ptr = setup_info[i].value; #if 1 + for (i = 0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++) #else - int xpos = MENU_SCREEN_START_XPOS; - int ypos = MENU_SCREEN_START_YPOS + i; - int font_nr; + for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) #endif + { + void *value_ptr = setup_info[i].value; /* set some entries to "unchangeable" according to other variables */ if ((value_ptr == &setup.sound_simple && !audio.sound_available) || @@ -4730,13 +4613,7 @@ static void DrawSetupScreen_Generic() else if (setup_info[i].type & ~TYPE_SKIP_ENTRY) initCursor(i, IMG_MENU_BUTTON); -#if 1 DrawCursorAndText_Setup(i, FALSE); -#else - font_nr = getSetupTextFont(setup_info[i].type); - - DrawText(mSX + xpos * 32, mSY + ypos * 32, setup_info[i].text, font_nr); -#endif if (setup_info[i].type & TYPE_VALUE) drawSetupValue(i); @@ -4749,9 +4626,23 @@ static void DrawSetupScreen_Generic() "Joysticks deactivated in setup menu"); #endif - FadeToFront(); +#if 1 + HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE); +#endif + + if (redraw_all) + redraw_mask = REDRAW_ALL; + +#if 1 + FadeIn(redraw_mask); +#else + 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) @@ -4769,11 +4660,7 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) choice++; choice_store[setup_mode] = choice; -#if 1 DrawCursorAndText_Setup(choice, TRUE); -#else - drawCursor(choice, TRUE); -#endif return; } @@ -4787,6 +4674,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'! */ @@ -4808,7 +4697,8 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) int menu_navigation_type = (dx < 0 ? TYPE_LEAVE : TYPE_ENTER); if (setup_info[choice].type & menu_navigation_type || - setup_info[choice].type & TYPE_BOOLEAN_STYLE) + setup_info[choice].type & TYPE_BOOLEAN_STYLE || + setup_info[choice].type & TYPE_YES_NO_AUTO) button = MB_MENU_CHOICE; } else if (dy) @@ -4828,13 +4718,8 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) { PlaySound(SND_MENU_ITEM_ACTIVATING); -#if 1 DrawCursorAndText_Setup(choice, FALSE); DrawCursorAndText_Setup(y, TRUE); -#else - drawCursor(choice, FALSE); - drawCursor(y, TRUE); -#endif choice = choice_store[setup_mode] = y; } @@ -4857,12 +4742,14 @@ 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 { if (setup_info[y].type & TYPE_VALUE) - changeSetupValue(y); + changeSetupValue(y, dx); } } } @@ -4870,11 +4757,13 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) void DrawSetupScreen_Input() { -#if 1 int i; + +#if 1 + FadeOut(REDRAW_FIELD); #endif - ClearWindow(); + ClearField(); #if 1 setup_info = setup_info_input; @@ -4883,7 +4772,20 @@ 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 + 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); @@ -4894,23 +4796,19 @@ void DrawSetupScreen_Input() DrawCursorAndText_Setup(i, FALSE); } -#else - initCursor(0, IMG_MENU_BUTTON); - initCursor(1, IMG_MENU_BUTTON); - initCursor(2, IMG_MENU_BUTTON_ENTER_MENU); - initCursor(13, IMG_MENU_BUTTON_LEAVE_MENU); - - DrawText(mSX + 32, mSY + 2 * 32, "Player:", FONT_MENU_1); - DrawText(mSX + 32, mSY + 3 * 32, "Device:", FONT_MENU_1); - DrawText(mSX + 32, mSY + 15 * 32, "Back", FONT_MENU_1); -#endif #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 */ @@ -4921,7 +4819,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(); } @@ -5061,11 +4963,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) { drawPlayerSetupInputInfo(input_player_nr, (choice == 2)); -#if 1 DrawCursorAndText_Setup(choice, TRUE); -#else - drawCursor(choice, TRUE); -#endif return; } @@ -5110,15 +5008,10 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) { if (y != choice) { -#if 1 DrawCursorAndText_Setup(choice, FALSE); DrawCursorAndText_Setup(y, TRUE); drawPlayerSetupInputInfo(input_player_nr, (y == 2)); -#else - drawCursor(choice, FALSE); - drawCursor(y, TRUE); -#endif choice = y; } @@ -5163,6 +5056,8 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) { InitJoysticks(); + FadeSetLeaveMenu(); + setup_mode = SETUP_MODE_MAIN; DrawSetupScreen(); } @@ -5193,12 +5088,17 @@ void CustomizeKeyboard(int player_nr) /* read existing key bindings from player setup */ custom_key = setup.input[player_nr].key; - ClearWindow(); + FadeSetEnterMenu(); + FadeOut(REDRAW_FIELD); + + ClearField(); 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, @@ -5208,6 +5108,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 */ @@ -5224,6 +5130,9 @@ void CustomizeKeyboard(int player_nr) if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6)) { + if (key == KSYM_Escape) + FadeSkipNextFadeIn(); + finished = TRUE; break; } @@ -5322,7 +5231,10 @@ static boolean CalibrateJoystickMain(int player_nr) if (joystick_fd < 0 || !setup.input[player_nr].use_joystick) return FALSE; - ClearWindow(); + FadeSetEnterMenu(); + FadeOut(REDRAW_FIELD); + + ClearField(); for (y = 0; y < 3; y++) { @@ -5353,7 +5265,8 @@ static boolean CalibrateJoystickMain(int player_nr) new_joystick_ymiddle = joy_y; DrawGraphic(xpos + last_x, ypos + last_y, IMG_MENU_CALIBRATE_RED, 0); - BackToFront(); + + FadeIn(REDRAW_FIELD); while (Joystick(player_nr) & JOY_BUTTON); /* wait for released button */ InitAnimation(); @@ -5377,6 +5290,7 @@ static boolean CalibrateJoystickMain(int player_nr) break; case KSYM_Escape: + FadeSkipNextFadeIn(); result = 0; break; @@ -5495,7 +5409,7 @@ void CalibrateJoystick(int player_nr) int xpos = mSX - SX; int ypos = mSY - SY; - ClearWindow(); + ClearField(); DrawTextF(xpos + 16, ypos + 6 * 32, FONT_TITLE_1, " JOYSTICK %d ", nr); DrawTextF(xpos + 16, ypos + 7 * 32, FONT_TITLE_1, " NOT AVAILABLE! "); @@ -5523,6 +5437,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) @@ -5550,6 +5466,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) @@ -5931,8 +5849,10 @@ void CreateScreenGadgets() CreateScreenMenubuttons(); +#if 0 /* force LEVELS draw offset for scrollbar / scrollbutton gadgets */ game_status = GAME_MODE_LEVELS; +#endif CreateScreenScrollbuttons(); CreateScreenScrollbars();