X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=4989985a00d967c5406722e4185957d874848049;hp=eeb2bcf704e1f789d9fbeb40223c6b83b6295dcc;hb=643bbf5bfe5db8cf56ff57f7e835e67053bb30ff;hpb=000f4fbffe0d915d1ded9c981a5a2d521cdf7e5e diff --git a/src/screens.c b/src/screens.c index eeb2bcf7..4989985a 100644 --- a/src/screens.c +++ b/src/screens.c @@ -23,23 +23,44 @@ #include "cartoons.h" #include "network.h" #include "init.h" +#include "config.h" -/* screens in the setup menu */ +/* screens on the info screen */ +#define INFO_MODE_MAIN 0 +#define INFO_MODE_TITLE 1 +#define INFO_MODE_ELEMENTS 2 +#define INFO_MODE_MUSIC 3 +#define INFO_MODE_CREDITS 4 +#define INFO_MODE_PROGRAM 5 +#define INFO_MODE_VERSION 6 +#define INFO_MODE_LEVELSET 7 + +#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_INPUT 3 -#define SETUP_MODE_SHORTCUT_1 4 -#define SETUP_MODE_SHORTCUT_2 5 -#define SETUP_MODE_GRAPHICS 6 -#define SETUP_MODE_CHOOSE_SCREEN_MODE 7 -#define SETUP_MODE_SOUND 8 -#define SETUP_MODE_ARTWORK 9 -#define SETUP_MODE_CHOOSE_GRAPHICS 10 -#define SETUP_MODE_CHOOSE_SOUNDS 11 -#define SETUP_MODE_CHOOSE_MUSIC 12 - -#define MAX_SETUP_MODES 13 +#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 @@ -47,17 +68,6 @@ #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 -#define INFO_MODE_ELEMENTS 2 -#define INFO_MODE_MUSIC 3 -#define INFO_MODE_CREDITS 4 -#define INFO_MODE_PROGRAM 5 -#define INFO_MODE_LEVELSET 6 - -#define MAX_INFO_MODES 7 - /* for various menu stuff */ #define MENU_SCREEN_START_XPOS 1 #define MENU_SCREEN_START_YPOS 2 @@ -115,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 : \ @@ -125,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 */ @@ -134,6 +154,7 @@ static void HandleSetupScreen_Generic(int, int, int, int, int); static void HandleSetupScreen_Input(int, int, int, int, int); static void CustomizeKeyboard(int); static void CalibrateJoystick(int); +static void execSetupGame(void); static void execSetupGraphics(void); static void execSetupArtwork(void); static void HandleChooseTree(int, int, int, int, int, TreeInfo **); @@ -153,29 +174,92 @@ static void HandleInfoScreen_Elements(int); static void HandleInfoScreen_Music(int); static void HandleInfoScreen_Credits(int); static void HandleInfoScreen_Program(int); +static void HandleInfoScreen_Version(int); static void MapScreenMenuGadgets(int); static void MapScreenTreeGadgets(TreeInfo *); static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS]; -static boolean show_titlescreen_initial = TRUE; - -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; + +static struct +{ + int value; + char *text; +} game_speeds_list[] = +{ +#if 1 + { 30, "Very Slow" }, + { 25, "Slow" }, + { 20, "Normal" }, + { 15, "Fast" }, + { 10, "Very Fast" }, +#else + { 1000, "1/1s (Extremely Slow)" }, + { 500, "1/2s" }, + { 200, "1/5s" }, + { 100, "1/10s" }, + { 50, "1/20s" }, + { 29, "1/35s (Original Supaplex)" }, + { 25, "1/40s" }, + { 20, "1/50s (Normal Speed)" }, + { 14, "1/70s (Maximum Supaplex)" }, + { 10, "1/100s" }, + { 5, "1/200s" }, + { 2, "1/500s" }, + { 1, "1/1000s (Extremely Fast)" }, +#endif + + { -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)]) @@ -183,11 +267,22 @@ static TreeInfo *screen_mode_current = NULL; 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)) @@ -203,30 +298,75 @@ static Bitmap *scrollbar_bitmap[NUM_SCROLLBAR_BITMAPS]; #endif -#define MAIN_CONTROL_NAME 0 -#define MAIN_CONTROL_LEVELS 1 -#define MAIN_CONTROL_SCORES 2 -#define MAIN_CONTROL_EDITOR 3 -#define MAIN_CONTROL_INFO 4 -#define MAIN_CONTROL_GAME 5 -#define MAIN_CONTROL_SETUP 6 -#define MAIN_CONTROL_QUIT 7 -#define MAIN_CONTROL_PREV_LEVEL 8 -#define MAIN_CONTROL_NEXT_LEVEL 9 -#define MAIN_CONTROL_CURRENT_LEVEL 10 -#define MAIN_CONTROL_FIRST_LEVEL 11 -#define MAIN_CONTROL_LAST_LEVEL 12 -#define MAIN_CONTROL_LEVEL_INFO_1 13 -#define MAIN_CONTROL_LEVEL_INFO_2 14 -#define MAIN_CONTROL_TITLE_1 15 -#define MAIN_CONTROL_TITLE_2 16 -#define MAIN_CONTROL_TITLE_3 17 - -static char main_text_name[10]; -static char main_text_current_level[10]; -static char main_text_first_level[10]; -static char main_text_last_level[10]; -static char main_input_name[MAX_PLAYER_NAME_LEN + 1]; +/* title display and control definitions */ + +#define MAX_NUM_TITLE_SCREENS (2 * MAX_NUM_TITLE_IMAGES + \ + 2 * MAX_NUM_TITLE_MESSAGES) + +static int num_title_screens = 0; + +struct TitleControlInfo +{ + boolean is_image; + boolean initial; + int local_nr; + int sort_priority; +}; + +struct TitleControlInfo title_controls[MAX_NUM_TITLE_SCREENS]; + +/* main menu display and control definitions */ + +#define MAIN_CONTROL_NAME 0 +#define MAIN_CONTROL_LEVELS 1 +#define MAIN_CONTROL_SCORES 2 +#define MAIN_CONTROL_EDITOR 3 +#define MAIN_CONTROL_INFO 4 +#define MAIN_CONTROL_GAME 5 +#define MAIN_CONTROL_SETUP 6 +#define MAIN_CONTROL_QUIT 7 +#define MAIN_CONTROL_PREV_LEVEL 8 +#define MAIN_CONTROL_NEXT_LEVEL 9 +#define MAIN_CONTROL_FIRST_LEVEL 10 +#define MAIN_CONTROL_LAST_LEVEL 11 +#define MAIN_CONTROL_LEVEL_NUMBER 12 +#define MAIN_CONTROL_LEVEL_INFO_1 13 +#define MAIN_CONTROL_LEVEL_INFO_2 14 +#define MAIN_CONTROL_LEVEL_NAME 15 +#define MAIN_CONTROL_LEVEL_AUTHOR 16 +#define MAIN_CONTROL_LEVEL_YEAR 17 +#define MAIN_CONTROL_LEVEL_IMPORTED_FROM 18 +#define MAIN_CONTROL_LEVEL_IMPORTED_BY 19 +#define MAIN_CONTROL_LEVEL_TESTED_BY 20 +#define MAIN_CONTROL_TITLE_1 21 +#define MAIN_CONTROL_TITLE_2 22 +#define MAIN_CONTROL_TITLE_3 23 + +static char str_main_text_name[10]; +static char str_main_text_first_level[10]; +static char str_main_text_last_level[10]; +static char str_main_text_level_number[10]; + +static char *main_text_name = str_main_text_name; +static char *main_text_first_level = str_main_text_first_level; +static char *main_text_last_level = str_main_text_last_level; +static char *main_text_level_number = str_main_text_level_number; +static char *main_text_levels = "Levelset"; +static char *main_text_scores = "Hall Of Fame"; +static char *main_text_editor = "Level Creator"; +static char *main_text_info = "Info Screen"; +static char *main_text_game = "Start Game"; +static char *main_text_setup = "Setup"; +static char *main_text_quit = "Quit"; +static char *main_text_level_name = level.name; +static char *main_text_level_author = level.author; +static char *main_text_level_year = NULL; +static char *main_text_level_imported_from = NULL; +static char *main_text_level_imported_by = NULL; +static char *main_text_level_tested_by = NULL; +static char *main_text_title_1 = PROGRAM_TITLE_STRING; +static char *main_text_title_2 = PROGRAM_COPYRIGHT_STRING; +static char *main_text_title_3 = PROGRAM_GAME_BY_STRING; struct MainControlInfo { @@ -235,149 +375,436 @@ struct MainControlInfo struct MenuPosInfo *pos_button; int button_graphic; - struct MenuPosInfo *pos_text; - char *text; - int font_text; + struct TextPosInfo *pos_text; + char **text; - struct MenuPosInfo *pos_input; - char *input; - int font_input; + struct TextPosInfo *pos_input; + char **input; }; static struct MainControlInfo main_controls[] = { { MAIN_CONTROL_NAME, - &menu.main.button.name, IMG_MENU_BUTTON, - &menu.main.text.name, main_text_name, FONT_MENU_1, - &menu.main.input.name, main_input_name, FONT_INPUT_1, + &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.text.levels, "Levelset", FONT_MENU_1, - NULL, NULL, -1, + &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.text.scores, "Hall Of Fame", FONT_MENU_1, - NULL, NULL, -1, + &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.text.editor, "Level Creator", FONT_MENU_1, - NULL, NULL, -1, + &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.text.info, "Info Screen", FONT_MENU_1, - NULL, NULL, -1, + &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.text.game, "Start Game", FONT_MENU_1, - NULL, NULL, -1, + &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.text.setup, "Setup", FONT_MENU_1, - NULL, NULL, -1, + &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.text.quit, "Quit", FONT_MENU_1, - NULL, NULL, -1, + &menu.main.button.quit, IMG_MENU_BUTTON_QUIT, + &menu.main.text.quit, &main_text_quit, + NULL, NULL, }, #if 0 /* (these two buttons are real gadgets) */ { MAIN_CONTROL_PREV_LEVEL, &menu.main.button.prev_level, IMG_MENU_BUTTON_PREV_LEVEL, - NULL, NULL, -1, - NULL, NULL, -1, + NULL, NULL, + NULL, NULL, }, { MAIN_CONTROL_NEXT_LEVEL, &menu.main.button.next_level, IMG_MENU_BUTTON_NEXT_LEVEL, - NULL, NULL, -1, - NULL, NULL, -1, + NULL, NULL, + NULL, NULL, }, #endif { - MAIN_CONTROL_CURRENT_LEVEL, + MAIN_CONTROL_FIRST_LEVEL, NULL, -1, - &menu.main.text.current_level, main_text_current_level,FONT_VALUE_1, - NULL, NULL, -1, + &menu.main.text.first_level, &main_text_first_level, + NULL, NULL, }, { - MAIN_CONTROL_FIRST_LEVEL, + MAIN_CONTROL_LAST_LEVEL, NULL, -1, - &menu.main.text.first_level, main_text_first_level, FONT_TEXT_3, - NULL, NULL, -1, + &menu.main.text.last_level, &main_text_last_level, + NULL, NULL, }, { - MAIN_CONTROL_LAST_LEVEL, + MAIN_CONTROL_LEVEL_NUMBER, NULL, -1, - &menu.main.text.last_level, main_text_last_level, FONT_TEXT_3, - NULL, NULL, -1, + &menu.main.text.level_number, &main_text_level_number, + NULL, NULL, }, { MAIN_CONTROL_LEVEL_INFO_1, NULL, -1, - &menu.main.text.level_info_1, NULL, -1, - NULL, NULL, -1, + &menu.main.text.level_info_1, NULL, + NULL, NULL, }, { MAIN_CONTROL_LEVEL_INFO_2, NULL, -1, - &menu.main.text.level_info_2, NULL, -1, - NULL, NULL, -1, + &menu.main.text.level_info_2, NULL, + NULL, NULL, + }, + { + MAIN_CONTROL_LEVEL_NAME, + NULL, -1, + &menu.main.text.level_name, &main_text_level_name, + NULL, NULL, + }, + { + MAIN_CONTROL_LEVEL_AUTHOR, + NULL, -1, + &menu.main.text.level_author, &main_text_level_author, + NULL, NULL, + }, + { + MAIN_CONTROL_LEVEL_YEAR, + NULL, -1, + &menu.main.text.level_year, &main_text_level_year, + NULL, NULL, + }, + { + MAIN_CONTROL_LEVEL_IMPORTED_FROM, + NULL, -1, + &menu.main.text.level_imported_from, &main_text_level_imported_from, + NULL, NULL, + }, + { + MAIN_CONTROL_LEVEL_IMPORTED_BY, + NULL, -1, + &menu.main.text.level_imported_by, &main_text_level_imported_by, + NULL, NULL, + }, + { + MAIN_CONTROL_LEVEL_TESTED_BY, + NULL, -1, + &menu.main.text.level_tested_by, &main_text_level_tested_by, + NULL, NULL, }, { MAIN_CONTROL_TITLE_1, NULL, -1, - &menu.main.text.title_1, PROGRAM_TITLE_STRING, FONT_TITLE_1, - NULL, NULL, -1, + &menu.main.text.title_1, &main_text_title_1, + NULL, NULL, }, { MAIN_CONTROL_TITLE_2, NULL, -1, - &menu.main.text.title_2, PROGRAM_COPYRIGHT_STRING, FONT_TITLE_2, - NULL, NULL, -1, + &menu.main.text.title_2, &main_text_title_2, + NULL, NULL, }, { MAIN_CONTROL_TITLE_3, NULL, -1, - &menu.main.text.title_3, PROGRAM_GAME_BY_STRING, FONT_TITLE_2, - NULL, NULL, -1, + &menu.main.text.title_3, &main_text_title_3, + NULL, NULL, }, { -1, NULL, -1, - NULL, NULL, -1, - NULL, NULL, -1, + NULL, NULL, + NULL, NULL, } }; +static int getTitleScreenGraphic(int nr, boolean initial) +{ + return (initial ? IMG_TITLESCREEN_INITIAL_1 : IMG_TITLESCREEN_1) + nr; +} + +static struct TitleMessageInfo *getTitleMessageInfo(int nr, boolean initial) +{ + return (initial ? &titlemessage_initial[nr] : &titlemessage[nr]); +} + +#if 0 +static int getTitleScreenGameMode(boolean initial) +{ + return (initial ? GAME_MODE_TITLE_INITIAL : GAME_MODE_TITLE); +} +#endif + +static int getTitleMessageGameMode(boolean initial) +{ + return (initial ? GAME_MODE_TITLE_INITIAL : GAME_MODE_TITLE); +} + +#if 0 +static int getTitleScreenBackground(boolean initial) +{ + return (initial ? IMG_BACKGROUND_TITLE_INITIAL : IMG_BACKGROUND_TITLE); +} +#endif + +#if 0 +static int getTitleMessageBackground(int nr, boolean initial) +{ + return (initial ? IMG_BACKGROUND_TITLE_INITIAL : IMG_BACKGROUND_TITLE); +} +#endif + +static int getTitleBackground(int nr, boolean initial, boolean is_image) +{ + int base = (is_image ? + (initial ? IMG_BACKGROUND_TITLESCREEN_INITIAL_1 : + IMG_BACKGROUND_TITLESCREEN_1) : + (initial ? IMG_BACKGROUND_TITLEMESSAGE_INITIAL_1 : + IMG_BACKGROUND_TITLEMESSAGE_1)); + int graphic_global = (initial ? IMG_BACKGROUND_TITLE_INITIAL : + IMG_BACKGROUND_TITLE); + int graphic_local = base + nr; + + if (graphic_info[graphic_local].bitmap != NULL) + return graphic_local; + + if (graphic_info[graphic_global].bitmap != NULL) + return graphic_global; + + return IMG_UNDEFINED; +} + +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 : + SND_BACKGROUND_TITLESCREEN_1) : + (initial ? SND_BACKGROUND_TITLEMESSAGE_INITIAL_1 : + SND_BACKGROUND_TITLEMESSAGE_1)); + int sound_global = menu.sound[mode]; + int sound_local = base + nr; + +#if 0 + printf("::: %d, %d, %d: %d ['%s'], %d ['%s']\n", + nr, initial, is_image, + sound_global, getSoundListEntry(sound_global)->filename, + sound_local, getSoundListEntry(sound_local)->filename); +#endif + + if (!strEqual(getSoundListEntry(sound_local)->filename, UNDEFINED_FILENAME)) + return sound_local; + + if (!strEqual(getSoundListEntry(sound_global)->filename, UNDEFINED_FILENAME)) + return sound_global; + + return SND_UNDEFINED; +} + +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 : + MUS_BACKGROUND_TITLESCREEN_1) : + (initial ? MUS_BACKGROUND_TITLEMESSAGE_INITIAL_1 : + MUS_BACKGROUND_TITLEMESSAGE_1)); + int music_global = menu.music[mode]; + int music_local = base + nr; + +#if 0 + printf("::: %d, %d, %d: %d ['%s'], %d ['%s']\n", + nr, initial, is_image, + music_global, getMusicListEntry(music_global)->filename, + music_local, getMusicListEntry(music_local)->filename); +#endif + + if (!strEqual(getMusicListEntry(music_local)->filename, UNDEFINED_FILENAME)) + return music_local; + + if (!strEqual(getMusicListEntry(music_global)->filename, UNDEFINED_FILENAME)) + return music_global; + + 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; + const struct TitleControlInfo *tci2 = (struct TitleControlInfo *)object2; + int compare_result; + + if (tci1->initial != tci2->initial) + compare_result = (tci1->initial ? -1 : +1); + else if (tci1->sort_priority != tci2->sort_priority) + compare_result = tci1->sort_priority - tci2->sort_priority; + else if (tci1->is_image != tci2->is_image) + compare_result = (tci1->is_image ? -1 : +1); + else + compare_result = tci1->local_nr - tci2->local_nr; + + return compare_result; +} + +static void InitializeTitleControlsExt_AddTitleInfo(boolean is_image, + boolean initial, + int nr, int sort_priority) +{ + title_controls[num_title_screens].is_image = is_image; + title_controls[num_title_screens].initial = initial; + title_controls[num_title_screens].local_nr = nr; + title_controls[num_title_screens].sort_priority = sort_priority; + + num_title_screens++; +} + +static void InitializeTitleControls_CheckTitleInfo(boolean initial) +{ + int i; + + for (i = 0; i < MAX_NUM_TITLE_IMAGES; i++) + { + int graphic = getTitleScreenGraphic(i, initial); + Bitmap *bitmap = graphic_info[graphic].bitmap; + int sort_priority = graphic_info[graphic].sort_priority; + + if (bitmap != NULL) + InitializeTitleControlsExt_AddTitleInfo(TRUE, initial, i, sort_priority); + } + + for (i = 0; i < MAX_NUM_TITLE_MESSAGES; i++) + { + struct TitleMessageInfo *tmi = getTitleMessageInfo(i, initial); + char *filename = getLevelSetTitleMessageFilename(i, initial); + int sort_priority = tmi->sort_priority; + + if (filename != NULL) + InitializeTitleControlsExt_AddTitleInfo(FALSE, initial, i, sort_priority); + } +} + +static void InitializeTitleControls(boolean show_title_initial) +{ + num_title_screens = 0; + + if (show_title_initial) + InitializeTitleControls_CheckTitleInfo(TRUE); + + InitializeTitleControls_CheckTitleInfo(FALSE); + + /* sort title screens according to sort_priority and title number */ + qsort(title_controls, num_title_screens, sizeof(struct TitleControlInfo), + compareTitleControlInfo); +} + +static boolean visibleMenuPos(struct MenuPosInfo *pos) +{ + return (pos != NULL && pos->x != -1 && pos->y != -1); +} + +static boolean visibleTextPos(struct TextPosInfo *pos) +{ + return (pos != NULL && pos->x != -1 && pos->y != -1); +} + static void InitializeMainControls() { boolean local_team_mode = (!options.network && setup.team_mode); int i; /* set main control text values to dynamically determined values */ - sprintf(main_text_name, "%s", local_team_mode ? "Team:" : "Name:"); - sprintf(main_text_current_level, "%s", int2str(level_nr, 3)); - sprintf(main_text_first_level, "%03d", leveldir_current->first_level); - sprintf(main_text_last_level, "%03d", leveldir_current->last_level); - sprintf(main_input_name, "%s", setup.player_name); + sprintf(main_text_name, "%s", local_team_mode ? "Team:" : "Name:"); + + 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; + main_text_level_imported_by = leveldir_current->imported_by; + main_text_level_tested_by = leveldir_current->tested_by; /* set main control screen positions to dynamically determined values */ for (i = 0; main_controls[i].nr != -1; i++) @@ -385,13 +812,18 @@ static void InitializeMainControls() struct MainControlInfo *mci = &main_controls[i]; int nr = mci->nr; struct MenuPosInfo *pos_button = mci->pos_button; - struct MenuPosInfo *pos_text = mci->pos_text; - struct MenuPosInfo *pos_input = mci->pos_input; - char *text = mci->text; - char *input = mci->input; + struct TextPosInfo *pos_text = mci->pos_text; + struct TextPosInfo *pos_input = mci->pos_input; + char *text = (mci->text ? *mci->text : NULL); + char *input = (mci->input ? *mci->input : NULL); int button_graphic = mci->button_graphic; +#if 1 + int font_text = (pos_text ? pos_text->font : -1); + int font_input = (pos_input ? pos_input->font : -1); +#else int font_text = mci->font_text; int font_input = mci->font_input; +#endif int font_text_width = (font_text != -1 ? getFontWidth(font_text) : 0); int font_text_height = (font_text != -1 ? getFontHeight(font_text) : 0); @@ -418,11 +850,16 @@ static void InitializeMainControls() menu.main.input.name.y = menu.main.text.name.y; #endif +#if 1 + menu.main.input.name.width = input_width; + menu.main.input.name.height = input_height; +#else menu.main.input.name.width = font_input_width * MAX_PLAYER_NAME_LEN; menu.main.input.name.height = font_input_height; +#endif } - if (pos_button != NULL) + if (pos_button != NULL) /* (x/y may be -1/-1 here) */ { if (pos_button->width == 0) pos_button->width = button_width; @@ -430,15 +867,18 @@ static void InitializeMainControls() pos_button->height = button_height; } - if (pos_text != NULL) + if (pos_text != NULL) /* (x/y may be -1/-1 here) */ { /* calculate width for non-clickable text -- needed for text alignment */ boolean calculate_text_width = (pos_button == NULL && text != NULL); - if (pos_text->x == -1 && pos_button != NULL) - pos_text->x = pos_button->x + pos_button->width; - if (pos_text->y == -1 && pos_button != NULL) - pos_text->y = pos_button->y; + if (visibleMenuPos(pos_button)) + { + if (pos_text->x == -1) + pos_text->x = pos_button->x + pos_button->width; + if (pos_text->y == -1) + pos_text->y = pos_button->y; + } if (pos_text->width == -1 || calculate_text_width) pos_text->width = text_width; @@ -446,12 +886,15 @@ static void InitializeMainControls() pos_text->height = text_height; } - if (pos_input != NULL) + if (pos_input != NULL) /* (x/y may be -1/-1 here) */ { - if (pos_input->x == -1 && pos_text != NULL) - pos_input->x = pos_text->x + pos_text->width; - if (pos_input->y == -1 && pos_text != NULL) - pos_input->y = pos_text->y; + if (visibleTextPos(pos_text)) + { + if (pos_input->x == -1) + pos_input->x = pos_text->x + pos_text->width; + if (pos_input->y == -1) + pos_input->y = pos_text->y; + } if (pos_input->width == -1) pos_input->width = input_width; @@ -473,17 +916,22 @@ static void DrawCursorAndText_Main_Ext(int nr, boolean active_text, if (mci->nr == nr || nr == -1) { struct MenuPosInfo *pos_button = mci->pos_button; - struct MenuPosInfo *pos_text = mci->pos_text; - struct MenuPosInfo *pos_input = mci->pos_input; - char *text = mci->text; - char *input = mci->input; + struct TextPosInfo *pos_text = mci->pos_text; + struct TextPosInfo *pos_input = mci->pos_input; + char *text = (mci->text ? *mci->text : NULL); + char *input = (mci->input ? *mci->input : NULL); int button_graphic = mci->button_graphic; +#if 1 + int font_text = (pos_text ? pos_text->font : -1); + int font_input = (pos_input ? pos_input->font : -1); +#else int font_text = mci->font_text; int font_input = mci->font_input; +#endif if (active_text) { - button_graphic = BUTTON_GRAPHIC_ACTIVE(button_graphic); + button_graphic = BUTTON_ACTIVE(button_graphic); font_text = FONT_ACTIVE(font_text); } @@ -492,7 +940,7 @@ static void DrawCursorAndText_Main_Ext(int nr, boolean active_text, font_input = FONT_ACTIVE(font_input); } - if (pos_button != NULL) + if (visibleMenuPos(pos_button)) { struct MenuPosInfo *pos = pos_button; int x = mSX + pos->x; @@ -502,23 +950,29 @@ static void DrawCursorAndText_Main_Ext(int nr, boolean active_text, DrawGraphicThruMaskExt(drawto, x, y, button_graphic, 0); } - if (pos_text != NULL && text != NULL) + if (visibleTextPos(pos_text) && text != NULL) { - struct MenuPosInfo *pos = pos_text; - int x = mSX + ALIGNED_XPOS(pos->x, pos->width, pos->align); - int y = mSY + pos->y; + struct TextPosInfo *pos = pos_text; + int x = mSX + ALIGNED_TEXT_XPOS(pos); + int y = mSY + ALIGNED_TEXT_YPOS(pos); +#if 1 + /* (check why/if this is needed) */ DrawBackgroundForFont(x, y, pos->width, pos->height, font_text); +#endif DrawText(x, y, text, font_text); } - if (pos_input != NULL && input != NULL) + if (visibleTextPos(pos_input) && input != NULL) { - struct MenuPosInfo *pos = pos_input; - int x = mSX + ALIGNED_XPOS(pos->x, pos->width, pos->align); - int y = mSY + pos->y; + struct TextPosInfo *pos = pos_input; + int x = mSX + ALIGNED_TEXT_XPOS(pos); + int y = mSY + ALIGNED_TEXT_YPOS(pos); +#if 1 + /* (check why/if this is needed) */ DrawBackgroundForFont(x, y, pos->width, pos->height, font_input); +#endif DrawText(x, y, input, font_input); } } @@ -553,8 +1007,20 @@ static boolean insideMenuPosRect(struct MenuPosInfo *rect, int x, int y) if (rect == NULL) return FALSE; - int rect_x = ALIGNED_XPOS(rect->x, rect->width, rect->align); - int rect_y = rect->y; + int rect_x = ALIGNED_TEXT_XPOS(rect); + int rect_y = ALIGNED_TEXT_YPOS(rect); + + return (x >= rect_x && x < rect_x + rect->width && + y >= rect_y && y < rect_y + rect->height); +} + +static boolean insideTextPosRect(struct TextPosInfo *rect, int x, int y) +{ + if (rect == NULL) + return FALSE; + + int rect_x = ALIGNED_TEXT_XPOS(rect); + int rect_y = ALIGNED_TEXT_YPOS(rect); return (x >= rect_x && x < rect_x + rect->width && y >= rect_y && y < rect_y + rect->height); @@ -575,7 +1041,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); @@ -600,8 +1066,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); @@ -636,12 +1104,6 @@ static int getLevelRangeTextPos() } #endif -static int getTitleScreenGraphic() -{ - return (show_titlescreen_initial ? IMG_TITLESCREEN_INITIAL_1 : - IMG_TITLESCREEN_1); -} - int effectiveGameStatus() { if (game_status == GAME_MODE_INFO && info_mode == INFO_MODE_TITLE) @@ -650,9 +1112,9 @@ int effectiveGameStatus() return game_status; } -void DrawTitleScreenImage(int nr) +void DrawTitleScreenImage(int nr, boolean initial) { - int graphic = getTitleScreenGraphic() + nr; + int graphic = getTitleScreenGraphic(nr, initial); Bitmap *bitmap = graphic_info[graphic].bitmap; #if 1 int width = graphic_info[graphic].width; @@ -683,9 +1145,13 @@ void DrawTitleScreenImage(int nr) height = WIN_YSIZE; } + /* always display title screens centered */ dst_x = (WIN_XSIZE - width) / 2; dst_y = (WIN_YSIZE - height) / 2; + SetDrawBackgroundMask(REDRAW_ALL); + SetWindowBackgroundImage(getTitleBackground(nr, initial, TRUE)); + ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE); if (DrawingOnBackground(dst_x, dst_y)) @@ -696,50 +1162,86 @@ void DrawTitleScreenImage(int nr) redraw_mask = REDRAW_ALL; /* reset fading control values to default config settings */ +#if 1 + +#if 0 + title = getTitleFading(nr, initial, TRUE); +#endif + +#else + 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].anim_mode != ANIM_DEFAULT) + title.anim_mode = graphic_info[graphic].anim_mode; if (graphic_info[graphic].fade_delay > -1) - title.fade_delay_final = graphic_info[graphic].fade_delay; + title.fade_delay = graphic_info[graphic].fade_delay; if (graphic_info[graphic].post_delay > -1) - title.post_delay_final = graphic_info[graphic].post_delay; + title.post_delay = graphic_info[graphic].post_delay; if (graphic_info[graphic].auto_delay > -1) - title.auto_delay_final = graphic_info[graphic].auto_delay; + title.auto_delay = graphic_info[graphic].auto_delay; +#endif } -void DrawTitleScreenMessage(char *filename) +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; - int pad_y = 32; + 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) return; + /* force TITLE font on title message screen */ + game_status = getTitleMessageGameMode(initial); + + /* if chars set to "-1", automatically determine by text and font width */ + if (tmi->chars == -1) + tmi->chars = tmi->width / getFontWidth(tmi->font); + else + tmi->width = tmi->chars * getFontWidth(tmi->font); + + /* if lines set to "-1", automatically determine by text and font height */ + if (tmi->lines == -1) + tmi->lines = tmi->height / getFontHeight(tmi->font); + else + tmi->height = tmi->lines * getFontHeight(tmi->font); + SetDrawBackgroundMask(REDRAW_ALL); - SetWindowBackgroundImageIfDefined(IMG_BACKGROUND_MESSAGE); + SetWindowBackgroundImage(getTitleBackground(nr, initial, FALSE)); ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE); - /* force MESSAGE font on title message screen */ - game_status = GAME_MODE_MESSAGE; - +#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 - DrawTextFromFile(sx, sy, filename, font_nr, max_chars_per_line, - max_lines_per_screen, FALSE); +#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->parse_comments); +#else + DrawTextFile(sx, sy, filename, font_nr, max_chars_per_line, -1, + max_lines_per_screen, -1, tmi->autowrap, tmi->centered, + tmi->parse_comments); +#endif game_status = last_game_status; /* restore current game status */ } @@ -748,13 +1250,32 @@ void DrawTitleScreen() { KeyboardAutoRepeatOff(); +#if 0 SetMainBackgroundImage(IMG_BACKGROUND_TITLE); +#endif HandleTitleScreen(0, 0, 0, 0, MB_MENU_INITIALIZE); StopAnimation(); } +boolean CheckTitleScreen(boolean levelset_has_changed) +{ + static boolean show_title_initial = TRUE; + boolean show_titlescreen = FALSE; + + /* needed to be able to skip title screen, if no image or message defined */ + InitializeTitleControls(show_title_initial); + + if (setup.show_titlescreen && (show_title_initial || levelset_has_changed)) + show_titlescreen = TRUE; + + /* show initial title images and messages only once at program start */ + show_title_initial = FALSE; + + return (show_titlescreen && num_title_screens > 0); +} + void DrawMainMenuExt(int redraw_mask, boolean do_fading) { static LevelDirTree *leveldir_last_valid = NULL; @@ -768,6 +1289,37 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) int i; #endif +#if 0 + /* !!! CHANGE THIS !!! */ + title = title_default; +#endif + +#if 0 + { + int graphicA = element_info[EL_EM_DYNAMITE_ACTIVE].special_graphic[GFX_SPECIAL_ARG_EDITOR]; + int graphicB = element_info[EL_EM_DYNAMITE_ACTIVE].special_graphic[GFX_SPECIAL_ARG_PANEL]; + int graphic1 = element_info[EL_CONVEYOR_BELT_1_MIDDLE].special_graphic[GFX_SPECIAL_ARG_EDITOR]; + int graphic2 = element_info[EL_CONVEYOR_BELT_1_MIDDLE_ACTIVE].special_graphic[GFX_SPECIAL_ARG_EDITOR]; + + printf("::: %d [%d] -> %d, %d [%d, %d]\n", + graphicA, graphicB, + graphic_info[graphicA].src_x, + graphic_info[graphicA].src_y, + graphic1, graphic2); + } +#endif + +#if 0 + printf("::: %d, %d\n", fading.anim_mode == ANIM_CROSSFADE, + redraw_mask == REDRAW_ALL); +#endif + + FadeSetLeaveScreen(); + +#if 1 + FadeOut(redraw_mask); +#endif + UnmapAllGadgets(); FadeSoundsAndMusic(); @@ -809,16 +1361,34 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) /* needed if last screen (level choice) changed graphics, sounds or music */ ReloadCustomArtwork(0); -#ifdef TARGET_SDL +#if defined(TARGET_SDL) SetDrawtoField(DRAW_BACKBUFFER); #endif +#if 0 + if (levelset_has_changed) + fading = title_default; +#endif + +#if 1 + if (CheckTitleScreen(levelset_has_changed)) + { + game_status = GAME_MODE_TITLE; + + DrawTitleScreen(); + + return; + } + +#else + if (setup.show_titlescreen && ((levelset_has_changed && (graphic_info[IMG_TITLESCREEN_1].bitmap != NULL || - getLevelSetMessageFilename() != NULL)) || - (show_titlescreen_initial && - graphic_info[IMG_TITLESCREEN_INITIAL_1].bitmap != NULL))) + getLevelSetMessageFilename(1, FALSE) != NULL)) || + (show_title_initial && + (graphic_info[IMG_TITLESCREEN_INITIAL_1].bitmap != NULL || + getLevelSetMessageFilename(1, TRUE) != NULL)))) { game_status = GAME_MODE_TITLE; @@ -826,6 +1396,7 @@ 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) @@ -834,6 +1405,32 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) LoadLevel(level_nr); SetMainBackgroundImage(IMG_BACKGROUND_MAIN); + +#if 0 + FadeOut(redraw_mask); +#endif + +#if 1 + if (redraw_mask == REDRAW_ALL) + { +#if 0 + int door_state = GetDoorState(); +#endif + + RedrawBackground(); + + // OpenDoor(door_state | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); + +#if 0 +#if 1 + OpenDoor(DOOR_NO_DELAY | DOOR_FORCE_REDRAW); +#else + OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); +#endif +#endif + } +#endif + ClearWindow(); #if 1 @@ -923,16 +1520,67 @@ 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(); + + OpenDoor(door_state | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); + } +#endif + +#if 0 + { + game_status = GAME_MODE_PSEUDO_PREVIEW; + + DrawText(20, 400, "text_3.PREVIEW", FONT_TEXT_3); + DrawText(20, 420, "text_4.PREVIEW", FONT_TEXT_4); + + game_status = GAME_MODE_MAIN; + + DrawText(20, 440, "text_3.MAIN", FONT_TEXT_3); + DrawText(20, 460, "text_4.MAIN", FONT_TEXT_4); + } +#endif +#if 1 + FadeIn(redraw_mask); +#else +#if 1 + if (!do_fading) + 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 + +#if 1 + FadeSetEnterMenu(); +#else + fading = title_default; +#endif + + SetMouseCursor(CURSOR_DEFAULT); InitAnimation(); @@ -983,77 +1631,127 @@ static void gotoTopLevelDir() void HandleTitleScreen(int mx, int my, int dx, int dy, int button) { static unsigned long title_delay = 0; - static int title_nr = 0; - static boolean showing_message = FALSE; - char *filename = getLevelSetMessageFilename(); + static int title_screen_nr = 0; + static int last_sound = -1, last_music = -1; boolean return_to_main_menu = FALSE; boolean use_fading_main_menu = TRUE; - boolean use_cross_fading = !show_titlescreen_initial; /* default */ - boolean no_title_info = (graphic_info[IMG_TITLESCREEN_1].bitmap == NULL && - filename == NULL); +#if 0 +#if 1 + boolean use_cross_fading = FALSE; +#else + boolean use_cross_fading = !show_title_initial; /* default */ +#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 0 + boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE); +#endif + +#if 0 int last_game_status = game_status; /* save current game status */ +#endif title_delay = 0; - title_nr = 0; - showing_message = FALSE; + title_screen_nr = 0; + tci = &title_controls[title_screen_nr]; - if (show_titlescreen_initial && - graphic_info[IMG_TITLESCREEN_INITIAL_1].bitmap == NULL) - show_titlescreen_initial = FALSE; + 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 (no_title_info) + if (num_title_screens == 0) { DrawInfoScreen_NotAvailable("Title screen information:", "No title screen for this level set."); - title.auto_delay_final = -1; +#if 0 + /* use default settings for fading, but always disable auto delay */ + fading = title_default; + fading.auto_delay = -1; +#endif return; } FadeSoundsAndMusic(); +#if 1 FadeOut(REDRAW_ALL); +#endif } - /* force TITLE music on title info screen */ - game_status = GAME_MODE_TITLE; + if (tci->is_image) + DrawTitleScreenImage(tci->local_nr, tci->initial); + else + DrawTitleScreenMessage(tci->local_nr, tci->initial); - PlayMenuSound(); - PlayMenuMusic(); + fading_default = (tci->initial ? title_initial_default : title_default); - game_status = last_game_status; /* restore current game status */ + fading = fading_next = getTitleFading(tci); - if (graphic_info[getTitleScreenGraphic()].bitmap != NULL) +#if 1 +#if 1 + if (!(fading_last.fade_mode & FADE_TYPE_TRANSFORM) && + fading_next.fade_mode & FADE_TYPE_TRANSFORM) { - DrawTitleScreenImage(title_nr); + fading.fade_mode = FADE_MODE_FADE; + fading.fade_delay = fading_default.fade_delay; } - else - { - DrawTitleScreenMessage(filename); +#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); + music = getTitleMusic(tci); - showing_message = TRUE; + if (sound != last_sound) + PlayMenuSoundExt(sound); + if (music != last_music) + PlayMenuMusicExt(music); - title.fade_delay_final = title.fade_delay; - title.post_delay_final = title.post_delay; - title.auto_delay_final = -1; - } + last_sound = sound; + last_music = music; +#endif + + SetMouseCursor(CURSOR_NONE); + // printf("::: mode: %d, delay: %d\n", fading.fade_mode, fading.fade_delay); + +#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) { @@ -1062,11 +1760,17 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) } else if (button == MB_MENU_CHOICE) { - int anim_mode; +#if 0 + boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE); +#endif - if (game_status == GAME_MODE_INFO && no_title_info) + 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); @@ -1074,62 +1778,105 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) return; } - title_nr++; + title_screen_nr++; + tci = &title_controls[title_screen_nr]; - if (show_titlescreen_initial && - (title_nr >= MAX_NUM_TITLE_SCREENS || - graphic_info[IMG_TITLESCREEN_INITIAL_1 + title_nr].bitmap == NULL)) + if (title_screen_nr < num_title_screens) { - show_titlescreen_initial = FALSE; +#if 1 +#if 0 + boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE); +#endif +#else + int anim_mode; - title_nr = 0; /* restart with title screens for current level set */ - } + 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); +#endif - anim_mode = graphic_info[getTitleScreenGraphic() + title_nr].anim_mode; + sound = getTitleSound(tci); + music = getTitleMusic(tci); - use_cross_fading = (anim_mode == ANIM_FADE ? FALSE : - anim_mode == ANIM_CROSSFADE ? TRUE : - use_cross_fading); + if (sound == SND_UNDEFINED || sound != last_sound) + FadeSounds(); + if (music == MUS_UNDEFINED || music != last_music) + FadeMusic(); - if (!use_cross_fading) +#if 1 FadeOut(REDRAW_ALL); +#endif - if (title_nr < MAX_NUM_TITLE_SCREENS && - graphic_info[getTitleScreenGraphic() + title_nr].bitmap != NULL) - { - if (use_cross_fading) - FadeCrossSaveBackbuffer(); + if (tci->is_image) + DrawTitleScreenImage(tci->local_nr, tci->initial); + else + DrawTitleScreenMessage(tci->local_nr, tci->initial); - DrawTitleScreenImage(title_nr); + fading_next = getTitleFading(tci); - if (use_cross_fading) - FadeCross(REDRAW_ALL); - else - FadeIn(REDRAW_ALL); +#if 1 + sound = getTitleSound(tci); + music = getTitleMusic(tci); - DelayReached(&title_delay, 0); /* reset delay counter */ - } - else if (!showing_message && filename != NULL) - { - if (use_cross_fading) - FadeCrossSaveBackbuffer(); + if (sound != last_sound) + PlayMenuSoundExt(sound); + if (music != last_music) + PlayMenuMusicExt(music); - DrawTitleScreenMessage(filename); + last_sound = sound; + last_music = music; +#endif - if (use_cross_fading) - FadeCross(REDRAW_ALL); - else - FadeIn(REDRAW_ALL); +#if 0 + printf("::: %d -> %d\n", fading.fade_mode, fading_next.fade_mode); +#endif - DelayReached(&title_delay, 0); /* reset delay counter */ +#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; - showing_message = TRUE; + DelayReached(&title_delay, 0); /* reset delay counter */ } else { FadeSoundsAndMusic(); +#if 0 +#if 1 + { +#if 0 + boolean use_cross_fading = (fading.anim_mode == ANIM_CROSSFADE); +#endif + +#if 1 + FadeOut(REDRAW_ALL); +#endif + } +#else FadeOut(REDRAW_ALL); +#endif +#endif return_to_main_menu = TRUE; } @@ -1137,20 +1884,26 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) if (return_to_main_menu) { - show_titlescreen_initial = FALSE; - +#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); @@ -1184,7 +1937,7 @@ void HandleMainMenu_SelectLevel(int step, int direction) if (new_level_nr != old_level_nr) { - struct MainControlInfo *mci= getMainControlInfo(MAIN_CONTROL_CURRENT_LEVEL); + struct MainControlInfo *mci= getMainControlInfo(MAIN_CONTROL_LEVEL_NUMBER); PlaySound(SND_MENU_ITEM_SELECTING); @@ -1192,7 +1945,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->font_text); + 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 @@ -1232,8 +1986,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) for (i = 0; main_controls[i].nr != -1; i++) { if (insideMenuPosRect(main_controls[i].pos_button, mx - mSX, my - mSY) || - insideMenuPosRect(main_controls[i].pos_text, mx - mSX, my - mSY) || - insideMenuPosRect(main_controls[i].pos_input, mx - mSX, my - mSY)) + insideTextPosRect(main_controls[i].pos_text, mx - mSX, my - mSY) || + insideTextPosRect(main_controls[i].pos_input, mx - mSX, my - mSY)) { pos = main_controls[i].nr; @@ -1308,6 +2062,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) @@ -1315,6 +2071,10 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) game_status = GAME_MODE_INFO; info_mode = INFO_MODE_MAIN; +#if 0 + fading = menu.navigation; +#endif + DrawInfoScreen(); } else if (pos == MAIN_CONTROL_GAME) @@ -1408,6 +2168,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(); @@ -1478,44 +2239,86 @@ static int num_info_info; static void execInfoTitleScreen() { +#if 0 + FadeSetEnterScreen(); +#endif + info_mode = INFO_MODE_TITLE; DrawInfoScreen(); } static void execInfoElements() { +#if 0 + FadeSetEnterScreen(); +#endif + info_mode = INFO_MODE_ELEMENTS; DrawInfoScreen(); } static void execInfoMusic() { +#if 0 + FadeSetEnterScreen(); +#endif + info_mode = INFO_MODE_MUSIC; DrawInfoScreen(); } static void execInfoCredits() { +#if 0 + FadeSetEnterScreen(); +#endif + info_mode = INFO_MODE_CREDITS; DrawInfoScreen(); } static void execInfoProgram() { +#if 0 + FadeSetEnterScreen(); +#endif + info_mode = INFO_MODE_PROGRAM; DrawInfoScreen(); } +static void execInfoVersion() +{ +#if 0 + FadeSetEnterScreen(); +#endif + + info_mode = INFO_MODE_VERSION; + DrawInfoScreen(); +} + static void execInfoLevelSet() { +#if 0 + FadeSetEnterScreen(); +#endif + info_mode = INFO_MODE_LEVELSET; DrawInfoScreen(); } static void execExitInfo() { +#if 0 + FadeSetLeaveMenu(); +#endif + game_status = GAME_MODE_MAIN; +#if 1 + DrawMainMenuExt(REDRAW_FIELD, FALSE); +#else DrawMainMenu(); +#endif } static struct TokenInfo info_info_main[] = @@ -1525,6 +2328,7 @@ static struct TokenInfo info_info_main[] = { TYPE_ENTER_SCREEN, execInfoMusic, "Music Info" }, { TYPE_ENTER_SCREEN, execInfoCredits, "Credits" }, { TYPE_ENTER_SCREEN, execInfoProgram, "Program Info" }, + { TYPE_ENTER_SCREEN, execInfoVersion, "Version Info" }, { TYPE_ENTER_SCREEN, execInfoLevelSet, "Level Set Info" }, { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execExitInfo, "Exit" }, @@ -1554,6 +2358,23 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading) UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); + /* (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 + ClearWindow(); DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Info Screen"); @@ -1590,12 +2411,25 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading) PlayMenuSound(); PlayMenuMusic(); - DrawMaskedBorder(REDRAW_ALL); + DrawMaskedBorder(redraw_mask); +#if 1 + FadeIn(redraw_mask); +#else +#if 1 + if (!do_fading) + BackToFront(); + else if (fading.anim_mode == ANIM_CROSSFADE) + FadeCross(redraw_mask); + else + FadeIn(redraw_mask); +#else if (do_fading) FadeIn(redraw_mask); else BackToFront(); +#endif +#endif InitAnimation(); } @@ -1631,6 +2465,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'! */ @@ -1693,6 +2529,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(); } } @@ -1701,13 +2539,21 @@ 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 1 FadeOut(REDRAW_FIELD); +#endif ClearWindow(); DrawHeadline(); @@ -1718,7 +2564,9 @@ void DrawInfoScreen_NotAvailable(char *text_title, char *text_error) DrawTextSCentered(ybottom, FONT_TEXT_4, "Press any key or button for info menu"); +#if 1 FadeIn(REDRAW_FIELD); +#endif } void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) @@ -1726,7 +2574,9 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) static int infoscreen_step[MAX_INFO_ELEMENTS_ON_SCREEN]; static int infoscreen_frame[MAX_INFO_ELEMENTS_ON_SCREEN]; int xstart = mSX + 16; - int ystart = mSY + 64 + 2 * 32; + int ystart1 = mSY - SY + 100; + int ystart2 = mSY + 64 + 2 * 32; + int ybottom = mSY - SY + SYSIZE - 20; int ystep = TILEY + 4; int element, action, direction; int graphic; @@ -1742,9 +2592,9 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) ClearWindow(); DrawHeadline(); - DrawTextSCentered(100, FONT_TEXT_1, "The Game Elements:"); + DrawTextSCentered(ystart1, FONT_TEXT_1, "The Game Elements:"); - DrawTextSCentered(SYSIZE - 20, FONT_TEXT_4, + DrawTextSCentered(ybottom, FONT_TEXT_4, "Press any key or button for next page"); FrameCounter = 0; @@ -1816,9 +2666,9 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) j++; - ClearRectangleOnBackground(drawto, xstart, ystart + (i - start) * ystep, + ClearRectangleOnBackground(drawto, xstart, ystart2 + (i - start) * ystep, TILEX, TILEY); - DrawGraphicAnimationExt(drawto, xstart, ystart + (i - start) * ystep, + DrawGraphicAnimationExt(drawto, xstart, ystart2 + (i - start) * ystep, graphic, sync_frame, USE_MASKING); if (init) @@ -1849,7 +2699,11 @@ 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; @@ -1877,8 +2731,14 @@ 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() @@ -1895,14 +2755,18 @@ void DrawInfoScreen_Elements() { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_ELEMENTS); +#if 1 FadeOut(REDRAW_FIELD); +#endif LoadHelpAnimInfo(); LoadHelpTextInfo(); HandleInfoScreen_Elements(MB_MENU_INITIALIZE); +#if 1 FadeIn(REDRAW_FIELD); +#endif InitAnimation(); } @@ -1958,7 +2822,10 @@ void HandleInfoScreen_Elements(int button) if (page >= num_pages) { FadeSoundsAndMusic(); + +#if 0 FadeOut(REDRAW_FIELD); +#endif info_mode = INFO_MODE_MAIN; DrawAndFadeInInfoScreen(REDRAW_FIELD); @@ -1988,7 +2855,9 @@ void DrawInfoScreen_Music() { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC); +#if 1 FadeOut(REDRAW_FIELD); +#endif ClearWindow(); DrawHeadline(); @@ -1997,14 +2866,18 @@ void DrawInfoScreen_Music() HandleInfoScreen_Music(MB_MENU_INITIALIZE); +#if 1 FadeIn(REDRAW_FIELD); +#endif } void HandleInfoScreen_Music(int button) { static struct MusicFileInfo *list = NULL; - int ystart = 150, dy = 30; - int ybottom = SYSIZE - 20; + int ystart1 = mSY - SY + 100; + int ystart2 = mSY - SY + 150; + int ybottom = mSY - SY + SYSIZE - 20; + int dy = 30; if (button == MB_MENU_INITIALIZE) { @@ -2017,7 +2890,8 @@ void HandleInfoScreen_Music(int button) ClearWindow(); DrawHeadline(); - DrawTextSCentered(100, FONT_TEXT_1, "No music info for this level set."); + DrawTextSCentered(ystart1, FONT_TEXT_1, + "No music info for this level set."); DrawTextSCentered(ybottom, FONT_TEXT_4, "Press any key or button for info menu"); @@ -2052,7 +2926,10 @@ void HandleInfoScreen_Music(int button) if (list == NULL) { FadeSoundsAndMusic(); + +#if 0 FadeOut(REDRAW_FIELD); +#endif info_mode = INFO_MODE_MAIN; DrawAndFadeInInfoScreen(REDRAW_FIELD); @@ -2077,51 +2954,51 @@ void HandleInfoScreen_Music(int button) else PlaySound(sound); - DrawTextSCentered(100, FONT_TEXT_1, "The Game Background Sounds:"); + DrawTextSCentered(ystart1, FONT_TEXT_1, "The Game Background Sounds:"); } else { PlayMusic(list->music); - DrawTextSCentered(100, FONT_TEXT_1, "The Game Background Music:"); + DrawTextSCentered(ystart1, FONT_TEXT_1, "The Game Background Music:"); } if (!strEqual(list->title, UNKNOWN_NAME)) { if (!strEqual(list->title_header, UNKNOWN_NAME)) - DrawTextSCentered(ystart + y++ * dy, FONT_TEXT_2, list->title_header); + DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->title_header); - DrawTextFCentered(ystart + y++ * dy, FONT_TEXT_3, "\"%s\"", list->title); + DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "\"%s\"", list->title); } if (!strEqual(list->artist, UNKNOWN_NAME)) { if (!strEqual(list->artist_header, UNKNOWN_NAME)) - DrawTextSCentered(ystart + y++ * dy, FONT_TEXT_2, list->artist_header); + DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->artist_header); else - DrawTextSCentered(ystart + y++ * dy, FONT_TEXT_2, "by"); + DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, "by"); - DrawTextFCentered(ystart + y++ * dy, FONT_TEXT_3, "%s", list->artist); + DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "%s", list->artist); } if (!strEqual(list->album, UNKNOWN_NAME)) { if (!strEqual(list->album_header, UNKNOWN_NAME)) - DrawTextSCentered(ystart + y++ * dy, FONT_TEXT_2, list->album_header); + DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->album_header); else - DrawTextSCentered(ystart + y++ * dy, FONT_TEXT_2, "from the album"); + DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, "from the album"); - DrawTextFCentered(ystart + y++ * dy, FONT_TEXT_3, "\"%s\"", list->album); + DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "\"%s\"", list->album); } if (!strEqual(list->year, UNKNOWN_NAME)) { if (!strEqual(list->year_header, UNKNOWN_NAME)) - DrawTextSCentered(ystart + y++ * dy, FONT_TEXT_2, list->year_header); + DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, list->year_header); else - DrawTextSCentered(ystart + y++ * dy, FONT_TEXT_2, "from the year"); + DrawTextSCentered(ystart2 + y++ * dy, FONT_TEXT_2, "from the year"); - DrawTextFCentered(ystart + y++ * dy, FONT_TEXT_3, "%s", list->year); + DrawTextFCentered(ystart2 + y++ * dy, FONT_TEXT_3, "%s", list->year); } DrawTextSCentered(ybottom, FONT_TEXT_4, @@ -2137,8 +3014,10 @@ void HandleInfoScreen_Music(int button) static boolean DrawInfoScreen_CreditsScreen(int screen_nr) { - int ystart = 150, ystep = 30; - int ybottom = SYSIZE - 20; + 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; @@ -2146,155 +3025,155 @@ static boolean DrawInfoScreen_CreditsScreen(int screen_nr) ClearWindow(); DrawHeadline(); - DrawTextSCentered(100, FONT_TEXT_1, "Credits:"); + DrawTextSCentered(ystart1, FONT_TEXT_1, "Credits:"); if (screen_nr == 0) { - DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2, "Special thanks to"); - DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3, "Peter Liepa"); - DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2, "for creating"); - DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3, "\"Boulder Dash\""); - DrawTextSCentered(ystart + 4 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2, "in the year"); - DrawTextSCentered(ystart + 5 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3, "1984"); - DrawTextSCentered(ystart + 6 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_2, "published by"); - DrawTextSCentered(ystart + 7 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_3, "First Star Software"); } else if (screen_nr == 1) { - DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2, "Special thanks to"); - DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3, "Klaus Heinz & Volker Wertich"); - DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2, "for creating"); - DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3, "\"Emerald Mine\""); - DrawTextSCentered(ystart + 4 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2, "in the year"); - DrawTextSCentered(ystart + 5 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3, "1987"); - DrawTextSCentered(ystart + 6 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_2, "published by"); - DrawTextSCentered(ystart + 7 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_3, "Kingsoft"); } else if (screen_nr == 2) { - DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2, "Special thanks to"); - DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3, "Michael Stopp & Philip Jespersen"); - DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2, "for creating"); - DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3, "\"Supaplex\""); - DrawTextSCentered(ystart + 4 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2, "in the year"); - DrawTextSCentered(ystart + 5 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3, "1991"); - DrawTextSCentered(ystart + 6 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_2, "published by"); - DrawTextSCentered(ystart + 7 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_3, "Digital Integration"); } else if (screen_nr == 3) { - DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2, "Special thanks to"); - DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3, "Hiroyuki Imabayashi"); - DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2, "for creating"); - DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3, "\"Sokoban\""); - DrawTextSCentered(ystart + 4 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2, "in the year"); - DrawTextSCentered(ystart + 5 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3, "1982"); - DrawTextSCentered(ystart + 6 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_2, "published by"); - DrawTextSCentered(ystart + 7 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_3, "Thinking Rabbit"); } else if (screen_nr == 4) { - DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2, "Special thanks to"); - DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3, "Alan Bond"); - DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2, "and"); - DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3, "Jürgen Bonhagen"); - DrawTextSCentered(ystart + 4 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2, "for the continuous creation"); - DrawTextSCentered(ystart + 5 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_2, "of outstanding level sets"); } else if (screen_nr == 5) { - DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2, "Thanks to"); - DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3, "Peter Elzner"); - DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2, "for ideas and inspiration by"); - DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3, "Diamond Caves"); - DrawTextSCentered(ystart + 5 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_2, "Thanks to"); - DrawTextSCentered(ystart + 6 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_3, "Steffest"); - DrawTextSCentered(ystart + 7 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_2, "for ideas and inspiration by"); - DrawTextSCentered(ystart + 8 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 8 * ystep, FONT_TEXT_3, "DX-Boulderdash"); } else if (screen_nr == 6) { - DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2, "Thanks to"); - DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3, "David Tritscher"); - DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2, "for the new Emerald Mine engine"); } else if (screen_nr == 7) { - DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2, "Thanks to"); - DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_3, "Guido Schulz"); - DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2, "for the initial DOS port"); - DrawTextSCentered(ystart + 4 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2, "Thanks to"); - DrawTextSCentered(ystart + 5 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3, "Karl Hörnell"); - DrawTextSCentered(ystart + 6 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_2, "for some additional toons"); } else if (screen_nr == 8) { - DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2, "And not to forget:"); - DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_2, "Many thanks to"); - DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_3, "All those who contributed"); - DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3, "levels to this game"); - DrawTextSCentered(ystart + 4 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_3, "since 1995"); } #if 0 @@ -2316,11 +3195,15 @@ void DrawInfoScreen_Credits() FadeSoundsAndMusic(); +#if 1 FadeOut(REDRAW_FIELD); +#endif HandleInfoScreen_Credits(MB_MENU_INITIALIZE); +#if 1 FadeIn(REDRAW_FIELD); +#endif } void HandleInfoScreen_Credits(int button) @@ -2361,7 +3244,10 @@ void HandleInfoScreen_Credits(int button) else { FadeSoundsAndMusic(); + +#if 0 FadeOut(REDRAW_FIELD); +#endif info_mode = INFO_MODE_MAIN; DrawAndFadeInInfoScreen(REDRAW_FIELD); @@ -2375,52 +3261,227 @@ void HandleInfoScreen_Credits(int button) void DrawInfoScreen_Program() { - int ystart = 150, ystep = 30; - int ybottom = SYSIZE - 20; + int ystart1 = mSY - SY + 100; + int ystart2 = mSY - SY + 150; + int ybottom = mSY - SY + SYSIZE - 20; + int ystep = 30; SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM); +#if 1 FadeOut(REDRAW_FIELD); +#endif ClearWindow(); DrawHeadline(); - DrawTextSCentered(100, FONT_TEXT_1, "Program Information:"); + DrawTextSCentered(ystart1, FONT_TEXT_1, "Program Information:"); - DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2, "This game is Freeware!"); - DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_2, "If you like it, send e-mail to:"); - DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_3, PROGRAM_EMAIL_STRING); - DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_2, "or SnailMail to:"); - DrawTextSCentered(ystart + 4 * ystep + 0, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 4 * ystep + 0, FONT_TEXT_3, "Holger Schemel"); - DrawTextSCentered(ystart + 4 * ystep + 20, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 4 * ystep + 20, FONT_TEXT_3, "Detmolder Strasse 189"); - DrawTextSCentered(ystart + 4 * ystep + 40, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 4 * ystep + 40, FONT_TEXT_3, "33604 Bielefeld"); - DrawTextSCentered(ystart + 4 * ystep + 60, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 4 * ystep + 60, FONT_TEXT_3, "Germany"); - DrawTextSCentered(ystart + 7 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_2, "More information and levels:"); - DrawTextSCentered(ystart + 8 * ystep, FONT_TEXT_3, + DrawTextSCentered(ystart2 + 8 * ystep, FONT_TEXT_3, PROGRAM_WEBSITE_STRING); - DrawTextSCentered(ystart + 9 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 9 * ystep, FONT_TEXT_2, "If you have created new levels,"); - DrawTextSCentered(ystart + 10 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 10 * ystep, FONT_TEXT_2, "send them to me to include them!"); - DrawTextSCentered(ystart + 11 * ystep, FONT_TEXT_2, + DrawTextSCentered(ystart2 + 11 * ystep, FONT_TEXT_2, ":-)"); DrawTextSCentered(ybottom, FONT_TEXT_4, "Press any key or button for info menu"); +#if 1 + FadeIn(REDRAW_FIELD); +#endif +} + +void HandleInfoScreen_Program(int button) +{ + if (button == MB_MENU_LEAVE) + { + PlaySound(SND_MENU_ITEM_SELECTING); + + info_mode = INFO_MODE_MAIN; + DrawInfoScreen(); + + return; + } + else if (button == MB_MENU_CHOICE) + { + PlaySound(SND_MENU_ITEM_SELECTING); + + FadeSoundsAndMusic(); + +#if 0 + FadeOut(REDRAW_FIELD); +#endif + + info_mode = INFO_MODE_MAIN; + DrawAndFadeInInfoScreen(REDRAW_FIELD); + } + else + { + PlayMenuSoundIfLoop(); + } +} + +void DrawInfoScreen_Version() +{ + int font_header = FONT_TEXT_3; + int font_text = FONT_TEXT_2; + int xstep = getFontWidth(font_text); + int ystep = getFontHeight(font_text); + int ystart1 = mSY - SY + 100; + int ystart2 = mSY - SY + 150; + int ybottom = mSY - SY + SYSIZE - 20; + int xstart1 = mSX + 2 * xstep; + int xstart2 = mSX + 19 * xstep; +#if defined(TARGET_SDL) + int xstart3 = mSX + 29 * xstep; + SDL_version sdl_version_compiled; + const SDL_version *sdl_version_linked; + int driver_name_len = 8; + char driver_name[driver_name_len]; +#endif + + SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION); + +#if 1 + FadeOut(REDRAW_FIELD); +#endif + + ClearWindow(); + DrawHeadline(); + + DrawTextSCentered(ystart1, FONT_TEXT_1, "Version Information:"); + + DrawTextF(xstart1, ystart2, font_header, "Name"); + DrawTextF(xstart2, ystart2, font_text, PROGRAM_TITLE_STRING); + + ystart2 += ystep; + DrawTextF(xstart1, ystart2, font_header, "Version"); + DrawTextF(xstart2, ystart2, font_text, getProgramFullVersionString()); + + ystart2 += ystep; + DrawTextF(xstart1, ystart2, font_header, "Platform"); + DrawTextF(xstart2, ystart2, font_text, PLATFORM_STRING); + + ystart2 += ystep; + DrawTextF(xstart1, ystart2, font_header, "Target"); + DrawTextF(xstart2, ystart2, font_text, TARGET_STRING); + + ystart2 += ystep; + DrawTextF(xstart1, ystart2, font_header, "Compile time"); + DrawTextF(xstart2, ystart2, font_text, getCompileDateString()); + +#if defined(TARGET_SDL) + ystart2 += 3 * ystep; + DrawTextF(xstart1, ystart2, font_header, "Library"); + DrawTextF(xstart2, ystart2, font_header, "compiled"); + DrawTextF(xstart3, ystart2, font_header, "linked"); + + SDL_VERSION(&sdl_version_compiled); + sdl_version_linked = SDL_Linked_Version(); + + ystart2 += 2 * ystep; + DrawTextF(xstart1, ystart2, font_text, "SDL"); + DrawTextF(xstart2, ystart2, font_text, "%d.%d.%d", + sdl_version_compiled.major, + sdl_version_compiled.minor, + sdl_version_compiled.patch); + DrawTextF(xstart3, ystart2, font_text, "%d.%d.%d", + sdl_version_linked->major, + sdl_version_linked->minor, + sdl_version_linked->patch); + + SDL_IMAGE_VERSION(&sdl_version_compiled); + sdl_version_linked = IMG_Linked_Version(); + + ystart2 += ystep; + DrawTextF(xstart1, ystart2, font_text, "SDL_image"); + DrawTextF(xstart2, ystart2, font_text, "%d.%d.%d", + sdl_version_compiled.major, + sdl_version_compiled.minor, + sdl_version_compiled.patch); + DrawTextF(xstart3, ystart2, font_text, "%d.%d.%d", + sdl_version_linked->major, + sdl_version_linked->minor, + sdl_version_linked->patch); + + SDL_MIXER_VERSION(&sdl_version_compiled); + sdl_version_linked = Mix_Linked_Version(); + + ystart2 += ystep; + DrawTextF(xstart1, ystart2, font_text, "SDL_mixer"); + DrawTextF(xstart2, ystart2, font_text, "%d.%d.%d", + sdl_version_compiled.major, + sdl_version_compiled.minor, + sdl_version_compiled.patch); + DrawTextF(xstart3, ystart2, font_text, "%d.%d.%d", + sdl_version_linked->major, + sdl_version_linked->minor, + sdl_version_linked->patch); + + SDL_NET_VERSION(&sdl_version_compiled); + sdl_version_linked = SDLNet_Linked_Version(); + + ystart2 += ystep; + DrawTextF(xstart1, ystart2, font_text, "SDL_net"); + DrawTextF(xstart2, ystart2, font_text, "%d.%d.%d", + sdl_version_compiled.major, + sdl_version_compiled.minor, + sdl_version_compiled.patch); + DrawTextF(xstart3, ystart2, font_text, "%d.%d.%d", + sdl_version_linked->major, + sdl_version_linked->minor, + sdl_version_linked->patch); + + ystart2 += 3 * ystep; + DrawTextF(xstart1, ystart2, font_header, "Driver"); + DrawTextF(xstart2, ystart2, font_header, "Requested"); + DrawTextF(xstart3, ystart2, font_header, "Used"); + + SDL_VideoDriverName(driver_name, driver_name_len); + + ystart2 += 2 * ystep; + DrawTextF(xstart1, ystart2, font_text, "SDL_VideoDriver"); + DrawTextF(xstart2, ystart2, font_text, "%s", setup.system.sdl_videodriver); + DrawTextF(xstart3, ystart2, font_text, "%s", driver_name); + + SDL_AudioDriverName(driver_name, driver_name_len); + + ystart2 += ystep; + DrawTextF(xstart1, ystart2, font_text, "SDL_AudioDriver"); + DrawTextF(xstart2, ystart2, font_text, "%s", setup.system.sdl_audiodriver); + DrawTextF(xstart3, ystart2, font_text, "%s", driver_name); +#endif + + DrawTextSCentered(ybottom, FONT_TEXT_4, + "Press any key or button for info menu"); + +#if 1 FadeIn(REDRAW_FIELD); +#endif } -void HandleInfoScreen_Program(int button) +void HandleInfoScreen_Version(int button) { if (button == MB_MENU_LEAVE) { @@ -2436,7 +3497,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); @@ -2449,39 +3513,46 @@ void HandleInfoScreen_Program(int button) void DrawInfoScreen_LevelSet() { - int ystart = 150; - int ybottom = SYSIZE - 20; + struct TitleMessageInfo *tmi = &readme; char *filename = getLevelSetInfoFilename(); - int font_nr = FONT_LEVEL_NUMBER; - int font_width = getFontWidth(font_nr); - int font_height = getFontHeight(font_nr); - int pad_x = 32; - int pad_y = ystart; - int sx = SX + pad_x; - int sy = SY + pad_y; - int max_chars_per_line = (SXSIZE - 2 * pad_x) / font_width; - int max_lines_per_screen = (SYSIZE - pad_y) / font_height - 1; + + /* if chars set to "-1", automatically determine by text and font width */ + if (tmi->chars == -1) + tmi->chars = tmi->width / getFontWidth(tmi->font); + else + tmi->width = tmi->chars * getFontWidth(tmi->font); + + /* if lines set to "-1", automatically determine by text and font height */ + if (tmi->lines == -1) + tmi->lines = tmi->height / getFontHeight(tmi->font); + else + tmi->height = tmi->lines * getFontHeight(tmi->font); SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET); +#if 1 FadeOut(REDRAW_FIELD); +#endif ClearWindow(); DrawHeadline(); - DrawTextSCentered(100, FONT_TEXT_1, "Level Set Information:"); - - DrawTextSCentered(ybottom, FONT_TEXT_4, - "Press any key or button for info menu"); + DrawTextCentered(mSY + 100, FONT_TEXT_1, "Level Set Information:"); if (filename != NULL) - DrawTextFromFile(sx, sy, filename, font_nr, max_chars_per_line, - max_lines_per_screen, TRUE); + 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->parse_comments); else - DrawTextSCentered(ystart, FONT_TEXT_2, - "No information for this level set."); + DrawTextCentered(mSY + ALIGNED_TEXT_YPOS(tmi), FONT_TEXT_2, + "No information for this level set."); + + 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) @@ -2500,7 +3571,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); @@ -2525,6 +3599,8 @@ static void DrawInfoScreenExt(int redraw_mask, boolean do_fading) DrawInfoScreen_Credits(); else if (info_mode == INFO_MODE_PROGRAM) DrawInfoScreen_Program(); + else if (info_mode == INFO_MODE_VERSION) + DrawInfoScreen_Version(); else if (info_mode == INFO_MODE_LEVELSET) DrawInfoScreen_LevelSet(); else @@ -2546,7 +3622,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) @@ -2561,6 +3637,8 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button) HandleInfoScreen_Credits(button); else if (info_mode == INFO_MODE_PROGRAM) HandleInfoScreen_Program(button); + else if (info_mode == INFO_MODE_VERSION) + HandleInfoScreen_Version(button); else if (info_mode == INFO_MODE_LEVELSET) HandleInfoScreen_LevelSet(button); else @@ -2576,18 +3654,19 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button) 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 MenuPosInfo *pos = mci->pos_input; - int startx = mSX + ALIGNED_XPOS(pos->x, pos->width, pos->align); - int starty = mSY + pos->y; + 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 = mci->font_input; + int font_nr = pos->font; int font_active_nr = FONT_ACTIVE(font_nr); int font_width = getFontWidth(font_active_nr); #if 1 @@ -2600,35 +3679,42 @@ void HandleTypeName(int newxpos, Key key) 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; + + DrawBackgroundForFont(startx,starty, pos->width, pos->height, font_active_nr); if (newxpos) { + 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); - - return; +#endif } - - if (((key >= KSYM_A && key <= KSYM_Z) || - (key >= KSYM_a && key <= KSYM_z)) && - xpos < MAX_PLAYER_NAME_LEN) + else if (is_valid_key_char && xpos < MAX_PLAYER_NAME_LEN) { - char ascii; - - if (key >= KSYM_A && key <= KSYM_Z) - ascii = 'A' + (char)(key - KSYM_A); - else - ascii = 'a' + (char)(key - KSYM_a); - - setup.player_name[xpos] = ascii; + setup.player_name[xpos] = key_char; 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) { @@ -2636,17 +3722,56 @@ void HandleTypeName(int newxpos, Key key) 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; + + game_status = GAME_MODE_MAIN; + } + else if (key == KSYM_Escape) + { + strcpy(setup.player_name, last_player_name); + + is_active = FALSE; + game_status = GAME_MODE_MAIN; } + + if (is_active) + { + pos->width = (strlen(setup.player_name) + 1) * 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); + } + else + { + pos->width = strlen(setup.player_name) * font_width; + startx = mSX + ALIGNED_TEXT_XPOS(pos); + + DrawText(startx, starty, setup.player_name, font_nr); + } } @@ -2663,12 +3788,19 @@ static void DrawChooseTree(TreeInfo **ti_ptr) CloseDoor(DOOR_CLOSE_2); +#if 1 + FadeOut(REDRAW_FIELD); +#endif + ClearWindow(); HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr); MapScreenTreeGadgets(*ti_ptr); - FadeToFront(); +#if 1 + FadeIn(REDRAW_FIELD); +#endif + InitAnimation(); } @@ -2704,8 +3836,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 */ @@ -2799,8 +3933,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; @@ -2843,6 +3979,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) @@ -2852,18 +3990,22 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, } else if (game_status == GAME_MODE_SETUP) { - if (game_status == GAME_MODE_SETUP) - { - if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE) - execSetupGraphics(); - else - execSetupArtwork(); - } + if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED) + execSetupGame(); + else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE || + setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY) + execSetupGraphics(); + else + execSetupArtwork(); } else { game_status = GAME_MODE_MAIN; +#if 1 + DrawMainMenuExt(REDRAW_FIELD, FALSE); +#else DrawMainMenu(); +#endif } return; @@ -2873,8 +4015,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; @@ -2945,6 +4089,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; @@ -2957,6 +4103,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; @@ -2995,6 +4143,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; @@ -3002,11 +4152,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; @@ -3022,7 +4176,10 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, if (game_status == GAME_MODE_SETUP) { - if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE) + if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED) + execSetupGame(); + else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE || + setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY) execSetupGraphics(); else execSetupArtwork(); @@ -3072,7 +4229,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(); @@ -3081,7 +4244,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) @@ -3176,7 +4341,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; @@ -3198,30 +4366,105 @@ 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; 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; + + for (i = 0; game_speeds_list[i].value != -1; i++) + { + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + int value = game_speeds_list[i].value; + char *text = game_speeds_list[i].text; + + ti->node_top = &game_speeds; + ti->sort_priority = 10000 - 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, "Game Speed"); + + pushTreeInfo(&game_speeds, ti); + } + + /* sort game speed values to start with slowest game speed */ + sortTreeInfo(&game_speeds); + + /* set current game speed to configured game speed value */ + game_speed_current = + getTreeInfoFromIdentifier(game_speeds, i_to_a(setup.game_frame_delay)); + + /* if that fails, set current game speed to reliable default value */ + if (game_speed_current == NULL) + game_speed_current = + getTreeInfoFromIdentifier(game_speeds, i_to_a(GAME_FRAME_DELAY)); + + /* if that also fails, set current game speed to first available speed */ + if (game_speed_current == NULL) + game_speed_current = game_speeds; + } + + setup.game_frame_delay = atoi(game_speed_current->identifier); + + /* needed for displaying game speed text instead of identifier */ + game_speed_text = game_speed_current->name; + setup_mode = SETUP_MODE_GAME; DrawSetupScreen(); } +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; @@ -3240,7 +4483,7 @@ static void execSetupGraphics() ti->sort_priority = x * 10000 + y; sprintf(identifier, "%dx%d", x, y); - sprintf(name, "%d x %d [%d:%d]", x, y, xx, yy); + sprintf(name, "%d x %d [%d:%d]", x, y, xx, yy); setString(&ti->identifier, identifier); setString(&ti->name, name); @@ -3278,12 +4521,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; @@ -3291,14 +4587,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; @@ -3317,44 +4631,76 @@ static void execSetupArtwork() static void execSetupChooseGraphics() { +#if 0 + FadeSetEnterMenu(); +#endif + setup_mode = SETUP_MODE_CHOOSE_GRAPHICS; DrawSetupScreen(); } static void execSetupChooseSounds() { +#if 0 + FadeSetEnterMenu(); +#endif + setup_mode = SETUP_MODE_CHOOSE_SOUNDS; DrawSetupScreen(); } static void execSetupChooseMusic() { +#if 0 + FadeSetEnterMenu(); +#endif + setup_mode = SETUP_MODE_CHOOSE_MUSIC; DrawSetupScreen(); } static void execSetupInput() { +#if 0 + FadeSetEnterMenu(); +#endif + setup_mode = SETUP_MODE_INPUT; DrawSetupScreen(); } -static void execSetupShortcut1() +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); +#else DrawMainMenu(); +#endif } static void execSaveAndExitSetup() @@ -3371,8 +4717,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" }, @@ -3388,6 +4734,8 @@ static struct TokenInfo setup_info_game[] = { TYPE_SWITCH, &setup.skip_levels, "Skip Unsolved Levels:" }, { TYPE_SWITCH, &setup.time_limit, "Time Limit:" }, { TYPE_SWITCH, &setup.autorecord, "Auto-Record Tapes:" }, + { TYPE_ENTER_LIST, execSetupChooseGameSpeed, "Game Speed:" }, + { TYPE_STRING, &game_speed_text, "" }, { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Back" }, @@ -3432,7 +4780,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:" }, @@ -3505,7 +4857,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, "" }, @@ -3522,7 +4874,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], "" }, @@ -3747,6 +5099,10 @@ static void DrawSetupScreen_Generic() UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_2); +#if 1 + FadeOut(REDRAW_FIELD); +#endif + ClearWindow(); if (setup_mode == SETUP_MODE_MAIN) @@ -3779,14 +5135,14 @@ 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"; } @@ -3837,9 +5193,18 @@ static void DrawSetupScreen_Generic() "Joysticks deactivated in setup menu"); #endif - FadeToFront(); +#if 1 + HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE); +#endif + +#if 1 + FadeIn(REDRAW_FIELD); +#endif + InitAnimation(); +#if 0 HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE); +#endif } void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) @@ -3875,6 +5240,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'! */ @@ -3945,6 +5312,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 @@ -3962,6 +5331,10 @@ void DrawSetupScreen_Input() int i; #endif +#if 1 + FadeOut(REDRAW_FIELD); +#endif + ClearWindow(); #if 1 @@ -4009,7 +5382,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(); } @@ -4251,6 +5628,8 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) { InitJoysticks(); + FadeSetLeaveMenu(); + setup_mode = SETUP_MODE_MAIN; DrawSetupScreen(); } @@ -4281,12 +5660,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, @@ -4296,6 +5680,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 */ @@ -4312,6 +5702,9 @@ void CustomizeKeyboard(int player_nr) if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6)) { + if (key == KSYM_Escape) + FadeSkipNextFadeIn(); + finished = TRUE; break; } @@ -4410,6 +5803,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++) @@ -4441,7 +5837,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(); @@ -4465,6 +5866,7 @@ static boolean CalibrateJoystickMain(int player_nr) break; case KSYM_Escape: + FadeSkipNextFadeIn(); result = 0; break; @@ -4607,8 +6009,12 @@ void DrawSetupScreen() if (setup_mode == SETUP_MODE_INPUT) DrawSetupScreen_Input(); + else if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED) + 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) @@ -4632,8 +6038,12 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) { if (setup_mode == SETUP_MODE_INPUT) HandleSetupScreen_Input(mx, my, dx, dy, button); + else if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED) + 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) @@ -5015,8 +6425,10 @@ void CreateScreenGadgets() CreateScreenMenubuttons(); +#if 0 /* force LEVELS draw offset for scrollbar / scrollbutton gadgets */ game_status = GAME_MODE_LEVELS; +#endif CreateScreenScrollbuttons(); CreateScreenScrollbars();