X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=51a30367e49f618bb741edd3413f628119e1bbe0;hp=e86895089a59a74a9b4178b432266b3e3cbb3fb2;hb=04cfb5daeff6cbceef152fc01ad5852407c0c918;hpb=0ec311a1d294eca8b0cf6b6a31f288b5c631ce8f diff --git a/src/screens.c b/src/screens.c index e8689508..51a30367 100644 --- a/src/screens.c +++ b/src/screens.c @@ -23,23 +23,25 @@ #include "cartoons.h" #include "network.h" #include "init.h" +#include "config.h" /* screens in the setup menu */ #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_CHOOSE_GAME_SPEED 2 +#define SETUP_MODE_EDITOR 3 +#define SETUP_MODE_INPUT 4 +#define SETUP_MODE_SHORTCUT_1 5 +#define SETUP_MODE_SHORTCUT_2 6 +#define SETUP_MODE_GRAPHICS 7 +#define SETUP_MODE_CHOOSE_SCREEN_MODE 8 +#define SETUP_MODE_SOUND 9 +#define SETUP_MODE_ARTWORK 10 +#define SETUP_MODE_CHOOSE_GRAPHICS 11 +#define SETUP_MODE_CHOOSE_SOUNDS 12 +#define SETUP_MODE_CHOOSE_MUSIC 13 + +#define MAX_SETUP_MODES 14 /* for input setup functions */ #define SETUPINPUT_SCREEN_POS_START 0 @@ -54,9 +56,10 @@ #define INFO_MODE_MUSIC 3 #define INFO_MODE_CREDITS 4 #define INFO_MODE_PROGRAM 5 -#define INFO_MODE_LEVELSET 6 +#define INFO_MODE_VERSION 6 +#define INFO_MODE_LEVELSET 7 -#define MAX_INFO_MODES 7 +#define MAX_INFO_MODES 8 /* for various menu stuff */ #define MENU_SCREEN_START_XPOS 1 @@ -134,6 +137,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,24 +157,78 @@ 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 int setup_mode = SETUP_MODE_MAIN; static int info_mode = INFO_MODE_MAIN; static TreeInfo *screen_modes = NULL; static TreeInfo *screen_mode_current = NULL; -#define DRAW_OFFSET_MODE(x) (x >= GAME_MODE_MAIN && \ - x <= GAME_MODE_SETUP ? x : \ - x == GAME_MODE_PSEUDO_TYPENAME ? \ +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 }, +}; + +#define DRAW_MODE(s) ((s) >= GAME_MODE_MAIN && \ + (s) <= GAME_MODE_SETUP ? (s) : \ + (s) == GAME_MODE_PSEUDO_TYPENAME ? \ GAME_MODE_MAIN : GAME_MODE_DEFAULT) -#define mSX (SX + menu.draw_xoffset[DRAW_OFFSET_MODE(game_status)]) -#define mSY (SY + menu.draw_yoffset[DRAW_OFFSET_MODE(game_status)]) +#define DRAW_MODE_INFO(i) ((i) >= INFO_MODE_ELEMENTS && \ + (i) <= INFO_MODE_LEVELSET ? (i) : \ + INFO_MODE_MAIN) + +#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)]) +#define DRAW_YOFFSET_INFO(i) (DRAW_MODE_INFO(i) == INFO_MODE_MAIN ? \ + menu.draw_yoffset[GAME_MODE_INFO] : \ + menu.draw_yoffset_info[DRAW_MODE_INFO(i)]) + +#define DRAW_XOFFSET(s) ((s) == GAME_MODE_INFO ? \ + DRAW_XOFFSET_INFO(info_mode) : \ + menu.draw_xoffset[DRAW_MODE(s)]) +#define DRAW_YOFFSET(s) ((s) == GAME_MODE_INFO ? \ + DRAW_YOFFSET_INFO(info_mode) : \ + menu.draw_yoffset[DRAW_MODE(s)]) + +#define mSX (SX + DRAW_XOFFSET(game_status)) +#define mSY (SY + DRAW_YOFFSET(game_status)) #define NUM_MENU_ENTRIES_ON_SCREEN (menu.list_size[game_status] > 2 ? \ menu.list_size[game_status] : \ @@ -182,171 +240,373 @@ 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_LEVELSET_INFO 13 -#define MAIN_CONTROL_LEVEL_INFO 14 - -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 */ -static struct +#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 { int nr; - struct Rect *pos_button; + struct MenuPosInfo *pos_button; int button_graphic; - struct Rect *pos_text; - char *text; - int font_text; + struct TextPosInfo *pos_text; + char **text; - struct Rect *pos_input; - char *input; - int font_input; -} -main_controls[] = + 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.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.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.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.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.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.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.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.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.level_number, &main_text_level_number, + NULL, NULL, + }, + { + MAIN_CONTROL_LEVEL_INFO_1, NULL, -1, - &menu.main.text.last_level, main_text_last_level, FONT_TEXT_3, - NULL, NULL, -1, + &menu.main.text.level_info_1, NULL, + NULL, NULL, }, { - MAIN_CONTROL_LEVELSET_INFO, + MAIN_CONTROL_LEVEL_INFO_2, NULL, -1, - &menu.main.text.levelset_info, NULL, -1, - NULL, NULL, -1, + &menu.main.text.level_info_2, NULL, + NULL, NULL, }, { - MAIN_CONTROL_LEVEL_INFO, + MAIN_CONTROL_LEVEL_NAME, NULL, -1, - &menu.main.text.level_info, NULL, -1, - NULL, 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, &main_text_title_1, + NULL, NULL, + }, + { + MAIN_CONTROL_TITLE_2, + NULL, -1, + &menu.main.text.title_2, &main_text_title_2, + NULL, NULL, + }, + { + MAIN_CONTROL_TITLE_3, + 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]); +} + +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:"); + sprintf(main_text_first_level, "%03d", leveldir_current->first_level); + sprintf(main_text_last_level, "%03d", leveldir_current->last_level); + sprintf(main_text_level_number, "%s", int2str(level_nr, 3)); + + 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++) { - int nr = main_controls[i].nr; - struct Rect *pos_button = main_controls[i].pos_button; - struct Rect *pos_text = main_controls[i].pos_text; - struct Rect *pos_input = main_controls[i].pos_input; - char *text = main_controls[i].text; - char *input = main_controls[i].input; - int font_text = main_controls[i].font_text; - int font_input = main_controls[i].font_input; - int button_graphic = main_controls[i].button_graphic; + struct MainControlInfo *mci = &main_controls[i]; + int nr = mci->nr; + struct MenuPosInfo *pos_button = mci->pos_button; + 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); @@ -355,8 +615,10 @@ static void InitializeMainControls() int text_chars = (text != NULL ? strlen(text) : 0); int input_chars = (input != NULL ? strlen(input) : 0); - int button_width = graphic_info[button_graphic].width; - int button_height = graphic_info[button_graphic].height; + int button_width = + (button_graphic != -1 ? graphic_info[button_graphic].width : 0); + int button_height = + (button_graphic != -1 ? graphic_info[button_graphic].height : 0); int text_width = font_text_width * text_chars; int text_height = font_text_height; int input_width = font_input_width * input_chars; @@ -364,16 +626,23 @@ static void InitializeMainControls() if (nr == MAIN_CONTROL_NAME) { +#if 0 if (menu.main.input.name.x == -1) menu.main.input.name.x = menu.main.text.name.x + text_width; if (menu.main.input.name.y == -1) 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; @@ -381,16 +650,35 @@ static void InitializeMainControls() pos_button->height = button_height; } - if (pos_text != NULL) + if (pos_text != NULL) /* (x/y may be -1/-1 here) */ { - if (pos_text->width == -1) + /* calculate width for non-clickable text -- needed for text alignment */ + boolean calculate_text_width = (pos_button == NULL && text != NULL); + + 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; if (pos_text->height == -1) pos_text->height = text_height; } - if (pos_input != NULL) + if (pos_input != NULL) /* (x/y may be -1/-1 here) */ { + 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; if (pos_input->height == -1) @@ -399,81 +687,172 @@ static void InitializeMainControls() } } -static void DrawMainControlButton(int pos, boolean active) +static void DrawCursorAndText_Main_Ext(int nr, boolean active_text, + boolean active_input) { int i; for (i = 0; main_controls[i].nr != -1; i++) { - if (main_controls[i].nr == pos) + struct MainControlInfo *mci = &main_controls[i]; + + if (mci->nr == nr || nr == -1) { - struct Rect *pos_button = main_controls[i].pos_button; - int graphic = main_controls[i].button_graphic; - int x = mSX + pos_button->x; - int y = mSY + pos_button->y; + struct MenuPosInfo *pos_button = mci->pos_button; + 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) - graphic = BUTTON_GRAPHIC_ACTIVE(graphic); + if (active_text) + { + button_graphic = BUTTON_GRAPHIC_ACTIVE(button_graphic); + font_text = FONT_ACTIVE(font_text); + } - DrawBackground(x, y, pos_button->width, pos_button->height); - DrawGraphicThruMaskExt(drawto, x, y, graphic, 0); + if (active_input) + { + font_input = FONT_ACTIVE(font_input); + } - break; + if (visibleMenuPos(pos_button)) + { + struct MenuPosInfo *pos = pos_button; + int x = mSX + pos->x; + int y = mSY + pos->y; + + DrawBackgroundForGraphic(x, y, pos->width, pos->height, button_graphic); + DrawGraphicThruMaskExt(drawto, x, y, button_graphic, 0); + } + + if (visibleTextPos(pos_text) && text != NULL) + { + 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 (visibleTextPos(pos_input) && input != NULL) + { + 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); + } } } } -static boolean insideRect(struct Rect *rect, int x, int y) +static void DrawCursorAndText_Main(int nr, boolean active_text) +{ + DrawCursorAndText_Main_Ext(nr, active_text, FALSE); +} + +#if 0 +static void DrawCursorAndText_Main_Input(int nr, boolean active_text) +{ + DrawCursorAndText_Main_Ext(nr, active_text, TRUE); +} +#endif + +static struct MainControlInfo *getMainControlInfo(int nr) +{ + int i; + + for (i = 0; main_controls[i].nr != -1; i++) + if (main_controls[i].nr == nr) + return &main_controls[i]; + + return NULL; +} + +static boolean insideMenuPosRect(struct MenuPosInfo *rect, int x, int y) { - return (rect != NULL && - x >= rect->x && x < rect->x + rect->width && - y >= rect->y && y < rect->y + rect->height); + 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); } -static void drawCursorExt(int xpos, int ypos, int color, int g) +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); +} + +static void drawCursorExt(int xpos, int ypos, boolean active, int graphic) { static int cursor_array[SCR_FIELDY]; + int x = mSX + TILEX * xpos; + int y = mSY + TILEY * (MENU_SCREEN_START_YPOS + ypos); if (xpos == 0) { - if (g != 0) - cursor_array[ypos] = g; + if (graphic != -1) + cursor_array[ypos] = graphic; else - g = cursor_array[ypos]; + graphic = cursor_array[ypos]; } - if (color == FC_RED) - g = BUTTON_GRAPHIC_ACTIVE(g); - - ypos += MENU_SCREEN_START_YPOS; + if (active) + graphic = BUTTON_GRAPHIC_ACTIVE(graphic); - DrawBackground(mSX + xpos * TILEX, mSY + ypos * TILEY, TILEX, TILEY); - DrawGraphicThruMaskExt(drawto, mSX + xpos * TILEX, mSY + ypos * TILEY, g, 0); + DrawBackgroundForGraphic(x, y, TILEX, TILEY, graphic); + DrawGraphicThruMaskExt(drawto, x, y, graphic, 0); } static void initCursor(int ypos, int graphic) { - drawCursorExt(0, ypos, FC_BLUE, graphic); + drawCursorExt(0, ypos, FALSE, graphic); } -static void drawCursor(int ypos, int color) +static void drawCursor(int ypos, boolean active) { - drawCursorExt(0, ypos, color, 0); + drawCursorExt(0, ypos, active, -1); } static void drawCursorXY(int xpos, int ypos, int graphic) { - drawCursorExt(xpos, ypos, -1, graphic); + drawCursorExt(xpos, ypos, FALSE, graphic); } -static void drawChooseTreeCursor(int ypos, int color) +static void drawChooseTreeCursor(int ypos, boolean active) { int last_game_status = game_status; /* save current game status */ /* force LEVELS draw offset on artwork setup screen */ game_status = GAME_MODE_LEVELS; - drawCursorExt(0, ypos, color, 0); + drawCursorExt(0, ypos, active, -1); game_status = last_game_status; /* restore current game status */ } @@ -506,13 +885,28 @@ static int getLevelRangeTextPos() } #endif -void DrawTitleScreenImage(int nr) +int effectiveGameStatus() +{ + if (game_status == GAME_MODE_INFO && info_mode == INFO_MODE_TITLE) + return GAME_MODE_TITLE; + + return game_status; +} + +void DrawTitleScreenImage(int nr, boolean initial) { - int graphic = IMG_TITLESCREEN_1 + nr; + int graphic = getTitleScreenGraphic(nr, initial); Bitmap *bitmap = graphic_info[graphic].bitmap; +#if 1 + int width = graphic_info[graphic].width; + int height = graphic_info[graphic].height; + int src_x = graphic_info[graphic].src_x; + int src_y = graphic_info[graphic].src_y; +#else int width = graphic_info[graphic].src_image_width; int height = graphic_info[graphic].src_image_height; int src_x = 0, src_y = 0; +#endif int dst_x, dst_y; if (bitmap == NULL) @@ -535,6 +929,9 @@ void DrawTitleScreenImage(int nr) dst_x = (WIN_XSIZE - width) / 2; dst_y = (WIN_YSIZE - height) / 2; + SetDrawBackgroundMask(REDRAW_ALL); + SetWindowBackgroundImage(IMG_BACKGROUND_TITLE); + ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE); if (DrawingOnBackground(dst_x, dst_y)) @@ -543,19 +940,89 @@ void DrawTitleScreenImage(int nr) BlitBitmap(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y); redraw_mask = REDRAW_ALL; + + /* reset fading control values to default config settings */ + title.fade_delay_final = title.fade_delay; + title.post_delay_final = title.post_delay; + title.auto_delay_final = title.auto_delay; + + /* override default settings with image config settings, if defined */ + if (graphic_info[graphic].fade_delay > -1) + title.fade_delay_final = graphic_info[graphic].fade_delay; + if (graphic_info[graphic].post_delay > -1) + title.post_delay_final = graphic_info[graphic].post_delay; + if (graphic_info[graphic].auto_delay > -1) + title.auto_delay_final = graphic_info[graphic].auto_delay; +} + +void DrawTitleScreenMessage(int nr, boolean initial) +{ + char *filename = getLevelSetTitleMessageFilename(nr, initial); + struct TitleMessageInfo *tmi = getTitleMessageInfo(nr, initial); + int font_nr = FONT_TEXT_1; + int font_width; + int font_height; + int pad_x = 16 + 4; + int pad_y = 32 + 14; + int sx = pad_x; + int sy = pad_y; + int max_chars_per_line; + int max_lines_per_screen; + int last_game_status = game_status; /* save current game status */ + + if (filename == NULL) + return; + + SetDrawBackgroundMask(REDRAW_ALL); + SetWindowBackgroundImage(IMG_BACKGROUND_MESSAGE); + + ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE); + + /* force MESSAGE font on title message screen */ + game_status = GAME_MODE_MESSAGE; + + 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; + + DrawTextFile(sx, sy, filename, font_nr, max_chars_per_line, -1, + max_lines_per_screen, -1, tmi->autowrap, tmi->centered, + tmi->skip_comments); + + game_status = last_game_status; /* restore current game status */ } 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; @@ -565,7 +1032,9 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) char *name_text = (local_team_mode ? "Team:" : "Name:"); int name_width, level_width; #endif +#if 0 int i; +#endif UnmapAllGadgets(); FadeSoundsAndMusic(); @@ -608,13 +1077,29 @@ 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 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) + ((levelset_has_changed && + (graphic_info[IMG_TITLESCREEN_1].bitmap != NULL || + getLevelSetMessageFilename(1, FALSE) != NULL)) || + (show_title_initial && + (graphic_info[IMG_TITLESCREEN_INITIAL_1].bitmap != NULL || + getLevelSetMessageFilename(1, TRUE) != NULL)))) { game_status = GAME_MODE_TITLE; @@ -622,6 +1107,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) @@ -632,21 +1118,22 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) SetMainBackgroundImage(IMG_BACKGROUND_MAIN); ClearWindow(); - DrawHeadline(); - #if 1 InitializeMainControls(); +#if 1 + DrawCursorAndText_Main(-1, FALSE); +#else for (i = 0; main_controls[i].nr != -1; i++) { - struct Rect *pos_button = main_controls[i].pos_button; - struct Rect *pos_text = main_controls[i].pos_text; - struct Rect *pos_input = main_controls[i].pos_input; - char *text = main_controls[i].text; - char *input = main_controls[i].input; - int font_text = main_controls[i].font_text; - int font_input = main_controls[i].font_input; - int button_graphic = main_controls[i].button_graphic; + struct MenuPosInfo *pos_button = main_controls[i].pos_button; + struct MenuPosInfo *pos_text = main_controls[i].pos_text; + struct MenuPosInfo *pos_input = main_controls[i].pos_input; + char *text = main_controls[i].text; + char *input = main_controls[i].input; + int button_graphic = main_controls[i].button_graphic; + int font_text = main_controls[i].font_text; + int font_input = main_controls[i].font_input; if (pos_button != NULL) DrawGraphicThruMaskExt(drawto, mSX + pos_button->x, mSY + pos_button->y, @@ -658,9 +1145,12 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) if (pos_input != NULL && input != NULL) DrawText(mSX + pos_input->x, mSY + pos_input->y, input, font_input); } +#endif #else + DrawHeadline(); + DrawText(mSX + 32, mSY + 2 * 32, name_text, FONT_MENU_1); DrawText(mSX + 32, mSY + 3 * 32, "Levelset", FONT_MENU_1); DrawText(mSX + 32, mSY + 4 * 32, "Hall Of Fame", FONT_MENU_1); @@ -695,12 +1185,12 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) for (i = 0; i < 8; i++) initCursor(i, (i == 1 || i == 4 || i == 6 ? IMG_MENU_BUTTON_ENTER_MENU : IMG_MENU_BUTTON)); + + DrawTextSCentered(326, FONT_TITLE_2, PROGRAM_GAME_BY_STRING); #endif DrawPreviewLevel(TRUE); - DrawTextSCentered(326, FONT_TITLE_2, "A Game by Artsoft Entertainment"); - HandleMainMenu(0, 0, 0, 0, MB_MENU_INITIALIZE); TapeStop(); @@ -726,6 +1216,8 @@ void DrawMainMenuExt(int redraw_mask, boolean do_fading) else BackToFront(); + SetMouseCursor(CURSOR_DEFAULT); + InitAnimation(); OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2); @@ -772,25 +1264,206 @@ static void gotoTopLevelDir() } #endif +#if 1 void HandleTitleScreen(int mx, int my, int dx, int dy, int button) { + static unsigned long title_delay = 0; + static int title_screen_nr = 0; + boolean return_to_main_menu = FALSE; + boolean use_fading_main_menu = TRUE; +#if 1 + boolean use_cross_fading = FALSE; +#else + boolean use_cross_fading = !show_title_initial; /* default */ +#endif + struct TitleControlInfo *tci; + + if (button == MB_MENU_INITIALIZE) + { + int last_game_status = game_status; /* save current game status */ + + title_delay = 0; + title_screen_nr = 0; + tci = &title_controls[title_screen_nr]; + +#if 0 + /* determine number of title screens to display (images and messages) */ + InitializeTitleControls(); +#endif + + if (game_status == GAME_MODE_INFO) + { + if (num_title_screens == 0) + { + DrawInfoScreen_NotAvailable("Title screen information:", + "No title screen for this level set."); + + title.auto_delay_final = -1; + + return; + } + + FadeSoundsAndMusic(); + + FadeOut(REDRAW_ALL); + } + + /* force TITLE music on title info screen */ + game_status = GAME_MODE_TITLE; + + PlayMenuSound(); + PlayMenuMusic(); + + game_status = last_game_status; /* restore current game status */ + + if (tci->is_image) + { + DrawTitleScreenImage(tci->local_nr, tci->initial); + } + else + { + DrawTitleScreenMessage(tci->local_nr, tci->initial); + + title.fade_delay_final = title.fade_delay; + title.post_delay_final = title.post_delay; + title.auto_delay_final = -1; + } + + SetMouseCursor(CURSOR_NONE); + + FadeIn(REDRAW_ALL); + + DelayReached(&title_delay, 0); /* reset delay counter */ + + return; + } + + if (title.auto_delay_final > -1 && + DelayReached(&title_delay, title.auto_delay_final)) + button = MB_MENU_CHOICE; + + if (button == MB_MENU_LEAVE) + { + return_to_main_menu = TRUE; + use_fading_main_menu = FALSE; + } + else if (button == MB_MENU_CHOICE) + { + int anim_mode; + + if (game_status == GAME_MODE_INFO && num_title_screens == 0) + { + FadeOut(REDRAW_FIELD); + + info_mode = INFO_MODE_MAIN; + DrawAndFadeInInfoScreen(REDRAW_FIELD); + + return; + } + + title_screen_nr++; + tci = &title_controls[title_screen_nr]; + + if (tci->is_image) + anim_mode = + graphic_info[getTitleScreenGraphic(tci->local_nr, + tci->initial)].anim_mode; + else + anim_mode = ANIM_FADE; /* ??? */ + + use_cross_fading = (anim_mode == ANIM_FADE ? FALSE : + anim_mode == ANIM_CROSSFADE ? TRUE : + use_cross_fading); + + if (title_screen_nr < num_title_screens) + { + if (!use_cross_fading) + FadeOut(REDRAW_ALL); + + if (use_cross_fading) + FadeCrossSaveBackbuffer(); + + if (tci->is_image) + DrawTitleScreenImage(tci->local_nr, tci->initial); + else + DrawTitleScreenMessage(tci->local_nr, tci->initial); + + if (use_cross_fading) + FadeCross(REDRAW_ALL); + else + FadeIn(REDRAW_ALL); + + DelayReached(&title_delay, 0); /* reset delay counter */ + } + else + { + FadeSoundsAndMusic(); + + FadeOut(REDRAW_ALL); + + return_to_main_menu = TRUE; + } + } + + if (return_to_main_menu) + { + RedrawBackground(); + + SetMouseCursor(CURSOR_DEFAULT); + + if (game_status == GAME_MODE_INFO) + { + OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); + + info_mode = INFO_MODE_MAIN; + DrawInfoScreenExt(REDRAW_ALL, use_fading_main_menu); + } + else /* default: return to main menu */ + { + OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); + + game_status = GAME_MODE_MAIN; + DrawMainMenuExt(REDRAW_ALL, use_fading_main_menu); + } + } +} + +#else + +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(); boolean return_to_main_menu = FALSE; boolean use_fading_main_menu = TRUE; - boolean use_cross_fading = TRUE; + boolean use_cross_fading = !show_title_initial; /* default */ + boolean no_title_info = (graphic_info[IMG_TITLESCREEN_1].bitmap == NULL && + getLevelSetMessageFilename(1, FALSE) == NULL); if (button == MB_MENU_INITIALIZE) { int last_game_status = game_status; /* save current game status */ + + title_delay = 0; title_nr = 0; + showing_message = FALSE; + + if (show_title_initial && + graphic_info[IMG_TITLESCREEN_INITIAL_1].bitmap == NULL && + getLevelSetMessageFilename(1, TRUE) == NULL) + show_title_initial = FALSE; if (game_status == GAME_MODE_INFO) { - if (graphic_info[IMG_TITLESCREEN_1].bitmap == NULL) + if (no_title_info) { DrawInfoScreen_NotAvailable("Title screen information:", "No title screen for this level set."); + title.auto_delay_final = -1; + return; } @@ -807,45 +1480,101 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) game_status = last_game_status; /* restore current game status */ - DrawTitleScreenImage(title_nr); + if (graphic_info[getTitleScreenGraphic(0, show_title_initial)].bitmap != NULL) + { + DrawTitleScreenImage(title_nr, show_title_initial); + } + else + { + DrawTitleScreenMessage(filename); + + showing_message = TRUE; + + title.fade_delay_final = title.fade_delay; + title.post_delay_final = title.post_delay; + title.auto_delay_final = -1; + } FadeIn(REDRAW_ALL); + DelayReached(&title_delay, 0); /* reset delay counter */ + return; } - else if (button == MB_MENU_LEAVE) + + if (title.auto_delay_final > -1 && + DelayReached(&title_delay, title.auto_delay_final)) + button = MB_MENU_CHOICE; + + if (button == MB_MENU_LEAVE) { return_to_main_menu = TRUE; use_fading_main_menu = FALSE; } else if (button == MB_MENU_CHOICE) { - if (game_status == GAME_MODE_INFO && - graphic_info[IMG_TITLESCREEN_1].bitmap == NULL) + int anim_mode; + + if (game_status == GAME_MODE_INFO && no_title_info) { + FadeOut(REDRAW_FIELD); + info_mode = INFO_MODE_MAIN; - DrawInfoScreen(); + DrawAndFadeInInfoScreen(REDRAW_FIELD); return; } title_nr++; + if (show_title_initial && + (title_nr >= MAX_NUM_TITLE_IMAGES || + graphic_info[IMG_TITLESCREEN_INITIAL_1 + title_nr].bitmap == NULL)) + { + show_title_initial = FALSE; + + title_nr = 0; /* restart with title screens for current level set */ + } + + anim_mode = graphic_info[getTitleScreenGraphic(title_nr, show_title_initial)].anim_mode; + + use_cross_fading = (anim_mode == ANIM_FADE ? FALSE : + anim_mode == ANIM_CROSSFADE ? TRUE : + use_cross_fading); + if (!use_cross_fading) FadeOut(REDRAW_ALL); - if (title_nr < MAX_NUM_TITLE_SCREENS && - graphic_info[IMG_TITLESCREEN_1 + title_nr].bitmap != NULL) + if (title_nr < MAX_NUM_TITLE_IMAGES && + graphic_info[getTitleScreenGraphic(title_nr, show_title_initial)].bitmap != NULL) { if (use_cross_fading) FadeCrossSaveBackbuffer(); - DrawTitleScreenImage(title_nr); + DrawTitleScreenImage(title_nr, show_title_initial); if (use_cross_fading) FadeCross(REDRAW_ALL); else FadeIn(REDRAW_ALL); + + DelayReached(&title_delay, 0); /* reset delay counter */ + } + else if (!showing_message && filename != NULL) + { + if (use_cross_fading) + FadeCrossSaveBackbuffer(); + + DrawTitleScreenMessage(filename); + + if (use_cross_fading) + FadeCross(REDRAW_ALL); + else + FadeIn(REDRAW_ALL); + + DelayReached(&title_delay, 0); /* reset delay counter */ + + showing_message = TRUE; } else { @@ -859,6 +1588,8 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) if (return_to_main_menu) { + show_title_initial = FALSE; + RedrawBackground(); if (game_status == GAME_MODE_INFO) @@ -877,6 +1608,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) } } } +#endif void HandleMainMenu_SelectLevel(int step, int direction) { @@ -904,9 +1636,18 @@ void HandleMainMenu_SelectLevel(int step, int direction) if (new_level_nr != old_level_nr) { + struct MainControlInfo *mci= getMainControlInfo(MAIN_CONTROL_LEVEL_NUMBER); + + PlaySound(SND_MENU_ITEM_SELECTING); + level_nr = new_level_nr; +#if 1 + DrawText(mSX + mci->pos_text->x, mSY + mci->pos_text->y, + int2str(level_nr, 3), mci->pos_text->font); +#else DrawText(mSX + 11 * 32, mSY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1); +#endif LoadLevel(level_nr); DrawPreviewLevel(TRUE); @@ -931,7 +1672,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (button == MB_MENU_INITIALIZE) { - DrawMainControlButton(choice, TRUE); + DrawCursorAndText_Main(choice, TRUE); return; } @@ -942,9 +1683,9 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) for (i = 0; main_controls[i].nr != -1; i++) { - if (insideRect(main_controls[i].pos_button, mx - mSX, my - mSY) || - insideRect(main_controls[i].pos_text, mx - mSX, my - mSY) || - insideRect(main_controls[i].pos_input, mx - mSX, my - mSY)) + if (insideMenuPosRect(main_controls[i].pos_button, 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; @@ -971,14 +1712,18 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) { if (pos != choice) { - DrawMainControlButton(pos, TRUE); - DrawMainControlButton(choice, FALSE); + PlaySound(SND_MENU_ITEM_ACTIVATING); + + DrawCursorAndText_Main(choice, FALSE); + DrawCursorAndText_Main(pos, TRUE); choice = pos; } } else { + PlaySound(SND_MENU_ITEM_SELECTING); + if (pos == MAIN_CONTROL_NAME) { game_status = GAME_MODE_PSEUDO_TYPENAME; @@ -1063,7 +1808,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (button == MB_MENU_INITIALIZE) { - drawCursor(choice, FC_RED); + drawCursor(choice, TRUE); + return; } @@ -1096,8 +1842,9 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) { if (y != choice) { - drawCursor(y, FC_RED); - drawCursor(choice, FC_BLUE); + drawCursor(choice, FALSE); + drawCursor(y, TRUE); + choice = y; } } @@ -1211,6 +1958,12 @@ static void execInfoProgram() DrawInfoScreen(); } +static void execInfoVersion() +{ + info_mode = INFO_MODE_VERSION; + DrawInfoScreen(); +} + static void execInfoLevelSet() { info_mode = INFO_MODE_LEVELSET; @@ -1230,6 +1983,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" }, @@ -1237,6 +1991,21 @@ static struct TokenInfo info_info_main[] = { 0, NULL, NULL } }; +static void DrawCursorAndText_Info(int pos, boolean active) +{ + int xpos = MENU_SCREEN_START_XPOS; + int ypos = MENU_SCREEN_START_YPOS + pos; + int font_nr = FONT_MENU_1; + + if (active) + font_nr = FONT_ACTIVE(font_nr); + + DrawText(mSX + xpos * 32, mSY + ypos * 32, info_info[pos].text, font_nr); + + if (info_info[pos].type & ~TYPE_SKIP_ENTRY) + drawCursor(pos, active); +} + static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading) { int i; @@ -1253,11 +2022,11 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading) for (i = 0; info_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) { +#if 0 int xpos = MENU_SCREEN_START_XPOS; int ypos = MENU_SCREEN_START_YPOS + i; int font_nr = FONT_MENU_1; - - DrawText(mSX + xpos * 32, mSY + ypos * 32, info_info[i].text, font_nr); +#endif if (info_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST)) initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); @@ -1266,6 +2035,12 @@ static void DrawInfoScreen_Main(int redraw_mask, boolean do_fading) else if (info_info[i].type & ~TYPE_SKIP_ENTRY) initCursor(i, IMG_MENU_BUTTON); +#if 1 + DrawCursorAndText_Info(i, FALSE); +#else + DrawText(mSX + xpos * 32, mSY + ypos * 32, info_info[i].text, font_nr); +#endif + num_info_info++; } @@ -1299,7 +2074,12 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button) choice++; choice_store[info_mode] = choice; - drawCursor(choice, FC_RED); +#if 1 + DrawCursorAndText_Info(choice, TRUE); +#else + drawCursor(choice, TRUE); +#endif + return; } else if (button == MB_MENU_LEAVE) @@ -1311,6 +2091,7 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button) void (*menu_callback_function)(void) = info_info[y].value; menu_callback_function(); + break; /* absolutely needed because function changes 'info_info'! */ } } @@ -1350,13 +2131,23 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button) { if (y != choice) { - drawCursor(y, FC_RED); - drawCursor(choice, FC_BLUE); + PlaySound(SND_MENU_ITEM_ACTIVATING); + +#if 1 + DrawCursorAndText_Info(choice, FALSE); + DrawCursorAndText_Info(y, TRUE); +#else + drawCursor(choice, FALSE); + drawCursor(y, TRUE); +#endif + choice = choice_store[info_mode] = y; } } else if (!(info_info[y].type & TYPE_GHOSTED)) { + PlaySound(SND_MENU_ITEM_SELECTING); + if (info_info[y].type & TYPE_ENTER_OR_LEAVE) { void (*menu_callback_function)(void) = info_info[choice].value; @@ -1369,20 +2160,30 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button) void DrawInfoScreen_NotAvailable(char *text_title, char *text_error) { - int ystart = 150; +#if 1 + int ystart1 = mSY - SY + 100; + int ystart2 = mSY - SY + 150; + int ybottom = mSY - SY + SYSIZE - 20; +#else + int ystart1 = 100; + int ystart2 = 150; int ybottom = SYSIZE - 20; +#endif SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET); + FadeOut(REDRAW_FIELD); + ClearWindow(); DrawHeadline(); - DrawTextSCentered(100, FONT_TEXT_1, text_title); + DrawTextSCentered(ystart1, FONT_TEXT_1, text_title); + DrawTextSCentered(ystart2, FONT_TEXT_2, text_error); DrawTextSCentered(ybottom, FONT_TEXT_4, "Press any key or button for info menu"); - DrawTextSCentered(ystart, FONT_TEXT_2, text_error); + FadeIn(REDRAW_FIELD); } void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) @@ -1390,7 +2191,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; @@ -1406,9 +2209,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; @@ -1480,9 +2283,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) @@ -1513,7 +2316,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; @@ -1541,8 +2348,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() @@ -1578,7 +2391,6 @@ void HandleInfoScreen_Elements(int button) static int num_pages; static int page; int anims_per_page = MAX_INFO_ELEMENTS_ON_SCREEN; - int button_released = !button; int i; if (button == MB_MENU_INITIALIZE) @@ -1586,6 +2398,7 @@ void HandleInfoScreen_Elements(int button) boolean new_element = TRUE; num_anims = 0; + for (i = 0; helpanim_info[i].element != HELPANIM_LIST_END; i++) { if (helpanim_info[i].element == HELPANIM_LIST_NEXT) @@ -1600,18 +2413,24 @@ void HandleInfoScreen_Elements(int button) num_pages = (num_anims + anims_per_page - 1) / anims_per_page; page = 0; } - else if (button == MB_MENU_LEAVE) + + if (button == MB_MENU_LEAVE) { + PlaySound(SND_MENU_ITEM_SELECTING); + info_mode = INFO_MODE_MAIN; DrawInfoScreen(); return; } - - if (button_released || button == MB_MENU_INITIALIZE) + else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE) { if (button != MB_MENU_INITIALIZE) + { + PlaySound(SND_MENU_ITEM_SELECTING); + page++; + } if (page >= num_pages) { @@ -1661,9 +2480,10 @@ void DrawInfoScreen_Music() void HandleInfoScreen_Music(int button) { static struct MusicFileInfo *list = NULL; - int ystart = 150, dy = 30; - int ybottom = SYSIZE - 20; - int button_released = !button; + int ystart1 = mSY - SY + 100; + int ystart2 = mSY - SY + 150; + int ybottom = mSY - SY + SYSIZE - 20; + int dy = 30; if (button == MB_MENU_INITIALIZE) { @@ -1676,7 +2496,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"); @@ -1684,21 +2505,29 @@ void HandleInfoScreen_Music(int button) return; } } - else if (button == MB_MENU_LEAVE) + + if (button == MB_MENU_LEAVE) { + PlaySound(SND_MENU_ITEM_SELECTING); + + FadeSoundsAndMusic(); + info_mode = INFO_MODE_MAIN; DrawInfoScreen(); return; } - - if (button_released || button == MB_MENU_INITIALIZE) + else if (button == MB_MENU_CHOICE || button == MB_MENU_INITIALIZE) { int y = 0; if (button != MB_MENU_INITIALIZE) + { + PlaySound(SND_MENU_ITEM_SELECTING); + if (list != NULL) list = list->next; + } if (list == NULL) { @@ -1728,51 +2557,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, @@ -1788,8 +2617,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; @@ -1797,155 +2628,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 @@ -1986,6 +2817,8 @@ void HandleInfoScreen_Credits(int button) } else if (button == MB_MENU_LEAVE) { + PlaySound(SND_MENU_ITEM_SELECTING); + info_mode = INFO_MODE_MAIN; DrawInfoScreen(); @@ -1995,6 +2828,8 @@ void HandleInfoScreen_Credits(int button) { boolean show_screen; + PlaySound(SND_MENU_ITEM_SELECTING); + screen_nr++; FadeCrossSaveBackbuffer(); @@ -2010,9 +2845,85 @@ void HandleInfoScreen_Credits(int button) FadeSoundsAndMusic(); FadeOut(REDRAW_FIELD); - info_mode = INFO_MODE_MAIN; - DrawAndFadeInInfoScreen(REDRAW_FIELD); - } + info_mode = INFO_MODE_MAIN; + DrawAndFadeInInfoScreen(REDRAW_FIELD); + } + } + else + { + PlayMenuSoundIfLoop(); + } +} + +void DrawInfoScreen_Program() +{ + int ystart1 = mSY - SY + 100; + int ystart2 = mSY - SY + 150; + int ybottom = mSY - SY + SYSIZE - 20; + int ystep = 30; + + SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM); + + FadeOut(REDRAW_FIELD); + + ClearWindow(); + DrawHeadline(); + + DrawTextSCentered(ystart1, FONT_TEXT_1, "Program Information:"); + + DrawTextSCentered(ystart2 + 0 * ystep, FONT_TEXT_2, + "This game is Freeware!"); + DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_2, + "If you like it, send e-mail to:"); + DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_3, + PROGRAM_EMAIL_STRING); + DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_2, + "or SnailMail to:"); + DrawTextSCentered(ystart2 + 4 * ystep + 0, FONT_TEXT_3, + "Holger Schemel"); + DrawTextSCentered(ystart2 + 4 * ystep + 20, FONT_TEXT_3, + "Detmolder Strasse 189"); + DrawTextSCentered(ystart2 + 4 * ystep + 40, FONT_TEXT_3, + "33604 Bielefeld"); + DrawTextSCentered(ystart2 + 4 * ystep + 60, FONT_TEXT_3, + "Germany"); + DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_2, + "More information and levels:"); + DrawTextSCentered(ystart2 + 8 * ystep, FONT_TEXT_3, + PROGRAM_WEBSITE_STRING); + DrawTextSCentered(ystart2 + 9 * ystep, FONT_TEXT_2, + "If you have created new levels,"); + DrawTextSCentered(ystart2 + 10 * ystep, FONT_TEXT_2, + "send them to me to include them!"); + DrawTextSCentered(ystart2 + 11 * ystep, FONT_TEXT_2, + ":-)"); + + DrawTextSCentered(ybottom, FONT_TEXT_4, + "Press any key or button for info menu"); + + FadeIn(REDRAW_FIELD); +} + +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(); + FadeOut(REDRAW_FIELD); + + info_mode = INFO_MODE_MAIN; + DrawAndFadeInInfoScreen(REDRAW_FIELD); } else { @@ -2020,46 +2931,134 @@ void HandleInfoScreen_Credits(int button) } } -void DrawInfoScreen_Program() +void DrawInfoScreen_Version() { - int ystart = 150, ystep = 30; - int ybottom = SYSIZE - 20; + 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_PROGRAM); + SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION); FadeOut(REDRAW_FIELD); ClearWindow(); DrawHeadline(); - DrawTextSCentered(100, FONT_TEXT_1, "Program Information:"); - - DrawTextSCentered(ystart + 0 * ystep, FONT_TEXT_2, - "This game is Freeware!"); - DrawTextSCentered(ystart + 1 * ystep, FONT_TEXT_2, - "If you like it, send e-mail to:"); - DrawTextSCentered(ystart + 2 * ystep, FONT_TEXT_3, - PROGRAM_EMAIL_STRING); - DrawTextSCentered(ystart + 3 * ystep, FONT_TEXT_2, - "or SnailMail to:"); - DrawTextSCentered(ystart + 4 * ystep + 0, FONT_TEXT_3, - "Holger Schemel"); - DrawTextSCentered(ystart + 4 * ystep + 20, FONT_TEXT_3, - "Detmolder Strasse 189"); - DrawTextSCentered(ystart + 4 * ystep + 40, FONT_TEXT_3, - "33604 Bielefeld"); - DrawTextSCentered(ystart + 4 * ystep + 60, FONT_TEXT_3, - "Germany"); - DrawTextSCentered(ystart + 7 * ystep, FONT_TEXT_2, - "More information and levels:"); - DrawTextSCentered(ystart + 8 * ystep, FONT_TEXT_3, - PROGRAM_WEBSITE_STRING); - DrawTextSCentered(ystart + 9 * ystep, FONT_TEXT_2, - "If you have created new levels,"); - DrawTextSCentered(ystart + 10 * ystep, FONT_TEXT_2, - "send them to me to include them!"); - DrawTextSCentered(ystart + 11 * ystep, FONT_TEXT_2, - ":-)"); + 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"); @@ -2067,20 +3066,21 @@ void DrawInfoScreen_Program() FadeIn(REDRAW_FIELD); } -void HandleInfoScreen_Program(int button) +void HandleInfoScreen_Version(int button) { - int button_released = !button; - if (button == MB_MENU_LEAVE) { + PlaySound(SND_MENU_ITEM_SELECTING); + info_mode = INFO_MODE_MAIN; DrawInfoScreen(); return; } - - if (button_released) + else if (button == MB_MENU_CHOICE) { + PlaySound(SND_MENU_ITEM_SELECTING); + FadeSoundsAndMusic(); FadeOut(REDRAW_FIELD); @@ -2095,18 +3095,66 @@ void HandleInfoScreen_Program(int button) void DrawInfoScreen_LevelSet() { - int ystart = 150; - int ybottom = SYSIZE - 20; + struct TitleMessageInfo *tmi = &readme; + int ystart1 = mSY - SY + 100; + int ystart2 = mSY - SY + 150; + int ybottom = mSY - SY + SYSIZE - 20; char *filename = getLevelSetInfoFilename(); +#if 1 +#if 1 + int font_nr = tmi->font; +#else + int font_nr = FONT_INFO_LEVELSET; +#endif +#else int font_nr = FONT_LEVEL_NUMBER; +#endif +#if 0 int font_width = getFontWidth(font_nr); int font_height = getFontHeight(font_nr); +#endif +#if 1 +#if 0 + int sx = mSX + ALIGNED_TEXT_XPOS(tmi); + int sy = mSY + ALIGNED_TEXT_YPOS(tmi); +#endif +#if 0 + int width = tmi->width; + int height = tmi->height; +#endif +#else 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; + int pad_y = 150; + int sx = mSX + pad_x; + int sy = mSY + pad_y; + int width = SXSIZE - 2 * pad_x; + int height = SYSIZE - pad_y; +#endif +#if 1 +#if 0 + int max_chars = tmi->chars; + int max_lines = tmi->lines; +#endif +#else + int max_chars_per_line = width / font_width; +#if 1 + int max_lines_per_screen = height / font_height; +#else + int max_lines_per_screen = height / font_height - 1; /* minus footer line */ +#endif +#endif + + /* if chars set to "-1", automatically determine by text and font width */ + if (tmi->chars == -1) + tmi->chars = tmi->width / getFontWidth(font_nr); + else + tmi->width = tmi->chars * getFontWidth(font_nr); + + /* if lines set to "-1", automatically determine by text and font height */ + if (tmi->lines == -1) + tmi->lines = tmi->height / getFontHeight(font_nr); + else + tmi->height = tmi->lines * getFontHeight(font_nr); SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET); @@ -2115,16 +3163,17 @@ void DrawInfoScreen_LevelSet() ClearWindow(); DrawHeadline(); - DrawTextSCentered(100, FONT_TEXT_1, "Level Set Information:"); + DrawTextSCentered(ystart1, FONT_TEXT_1, "Level Set Information:"); DrawTextSCentered(ybottom, FONT_TEXT_4, "Press any key or button for info menu"); if (filename != NULL) - DrawTextFromFile(sx, sy, filename, font_nr, max_chars_per_line, - max_lines_per_screen); + DrawTextFile(mSX + ALIGNED_TEXT_XPOS(tmi), mSY + ALIGNED_TEXT_YPOS(tmi), + filename, font_nr, tmi->chars, -1, tmi->lines, -1, + tmi->autowrap, tmi->centered, tmi->skip_comments); else - DrawTextSCentered(ystart, FONT_TEXT_2, + DrawTextSCentered(ystart2, FONT_TEXT_2, "No information for this level set."); FadeIn(REDRAW_FIELD); @@ -2132,18 +3181,19 @@ void DrawInfoScreen_LevelSet() void HandleInfoScreen_LevelSet(int button) { - int button_released = !button; - if (button == MB_MENU_LEAVE) { + PlaySound(SND_MENU_ITEM_SELECTING); + info_mode = INFO_MODE_MAIN; DrawInfoScreen(); return; } - - if (button_released) + else if (button == MB_MENU_CHOICE) { + PlaySound(SND_MENU_ITEM_SELECTING); + FadeSoundsAndMusic(); FadeOut(REDRAW_FIELD); @@ -2170,6 +3220,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 @@ -2206,6 +3258,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 @@ -2221,55 +3275,124 @@ 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 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; - int font_width = getFontWidth(FONT_INPUT_1_ACTIVE); +#endif + int font_nr = pos->font; + int font_active_nr = FONT_ACTIVE(font_nr); + int font_width = getFontWidth(font_active_nr); +#if 1 +#if 0 + int startx = mSX + mci->pos_input->x; + int starty = mSY + mci->pos_input->y; +#endif +#else int name_width = getFontWidth(FONT_MENU_1) * strlen("Name:"); int startx = mSX + 32 + name_width; int starty = mSY + ypos * 32; +#endif + char key_char = getValidConfigValueChar(getCharFromKey(key)); + boolean is_valid_key_char = (key_char != 0 && (key_char != ' ' || xpos > 0)); + boolean is_active = TRUE; + + DrawBackgroundForFont(startx,starty, pos->width, pos->height, font_active_nr); if (newxpos) { + strcpy(last_player_name, setup.player_name); + xpos = newxpos; - DrawText(startx, starty, setup.player_name, FONT_INPUT_1_ACTIVE); - DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_1_ACTIVE); +#if 0 + /* add one character width for added cursor character */ + pos->width += font_width; + startx = mSX + ALIGNED_TEXT_XPOS(pos); - return; + DrawText(startx, starty, setup.player_name, font_active_nr); + DrawText(startx + xpos * font_width, starty, "_", font_active_nr); +#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++; - DrawText(startx, starty, setup.player_name, FONT_INPUT_1_ACTIVE); - DrawText(startx + xpos * font_width, starty, "_", FONT_INPUT_1_ACTIVE); +#if 0 + /* add one character width for added name text character */ + pos->width += font_width; + startx = mSX + ALIGNED_TEXT_XPOS(pos); + + DrawText(startx, starty, setup.player_name, font_active_nr); + DrawText(startx + xpos * font_width, starty, "_", font_active_nr); +#endif } else if ((key == KSYM_Delete || key == KSYM_BackSpace) && xpos > 0) { xpos--; + setup.player_name[xpos] = 0; - DrawText(startx + xpos * font_width, starty, "_ ", FONT_INPUT_1_ACTIVE); +#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) { - DrawText(startx, starty, setup.player_name, FONT_INPUT_1); - DrawText(startx + xpos * font_width, starty, " ", FONT_INPUT_1_ACTIVE); +#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); + } } @@ -2330,10 +3453,17 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, /* force LEVELS font on artwork setup screen */ game_status = GAME_MODE_LEVELS; +#if 1 + /* clear tree list area, but not title or scrollbar */ + DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32, + SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset, + NUM_MENU_ENTRIES_ON_SCREEN * 32); +#else /* clear tree list area, but not title or scrollbar */ DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32, SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset, MAX_MENU_ENTRIES_ON_SCREEN * 32); +#endif for (i = 0; i < num_page_entries; i++) { @@ -2377,6 +3507,7 @@ static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti) TreeInfo *node, *node_first; int x, last_redraw_mask = redraw_mask; int ypos = MENU_TITLE2_YPOS; + int font_nr = FONT_TITLE_2; if (ti->type != TREE_TYPE_LEVEL_DIR) return; @@ -2384,16 +3515,16 @@ static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti) node_first = getTreeInfoFirstGroupEntry(ti); node = getTreeInfoFromPos(node_first, entry_pos); - DrawBackground(SX, SY + ypos, SXSIZE, getFontHeight(FONT_TITLE_2)); + DrawBackgroundForFont(SX, SY + ypos, SXSIZE, getFontHeight(font_nr), font_nr); if (node->parent_link) - DrawTextFCentered(ypos, FONT_TITLE_2, "leave group \"%s\"", + DrawTextFCentered(ypos, font_nr, "leave group \"%s\"", node->class_desc); else if (node->level_group) - DrawTextFCentered(ypos, FONT_TITLE_2, "enter group \"%s\"", + DrawTextFCentered(ypos, font_nr, "enter group \"%s\"", node->class_desc); else if (ti->type == TREE_TYPE_LEVEL_DIR) - DrawTextFCentered(ypos, FONT_TITLE_2, "%3d levels (%s)", + DrawTextFCentered(ypos, font_nr, "%3d levels (%s)", node->levels, node->class_desc); /* let BackToFront() redraw only what is needed */ @@ -2452,12 +3583,14 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, drawChooseTreeList(ti->cl_first, num_page_entries, ti); drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti); - drawChooseTreeCursor(ti->cl_cursor, FC_RED); + drawChooseTreeCursor(ti->cl_cursor, TRUE); return; } else if (button == MB_MENU_LEAVE) { + PlaySound(SND_MENU_ITEM_SELECTING); + if (ti->node_parent) { *ti_ptr = ti->node_parent; @@ -2465,13 +3598,12 @@ 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) + execSetupGraphics(); + else + execSetupArtwork(); } else { @@ -2520,7 +3652,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, drawChooseTreeList(ti->cl_first, num_page_entries, ti); drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti); - drawChooseTreeCursor(ti->cl_cursor, FC_RED); + drawChooseTreeCursor(ti->cl_cursor, TRUE); + AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, ti->cl_first, ti); } @@ -2534,7 +3667,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, drawChooseTreeList(ti->cl_first, num_page_entries, ti); drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti); - drawChooseTreeCursor(ti->cl_cursor, FC_RED); + drawChooseTreeCursor(ti->cl_cursor, TRUE); + AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, ti->cl_first, ti); } @@ -2556,6 +3690,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, if (node_cursor->node_group) { + PlaySound(SND_MENU_ITEM_SELECTING); + node_cursor->cl_first = ti->cl_first; node_cursor->cl_cursor = ti->cl_cursor; *ti_ptr = node_cursor->node_group; @@ -2566,6 +3702,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, } else if (dx == -1 && ti->node_parent) { + PlaySound(SND_MENU_ITEM_SELECTING); + *ti_ptr = ti->node_parent; DrawChooseTree(ti_ptr); @@ -2581,9 +3719,12 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, { if (y != ti->cl_cursor) { - drawChooseTreeCursor(y, FC_RED); - drawChooseTreeCursor(ti->cl_cursor, FC_BLUE); + PlaySound(SND_MENU_ITEM_ACTIVATING); + + drawChooseTreeCursor(ti->cl_cursor, FALSE); + drawChooseTreeCursor(y, TRUE); drawChooseTreeInfo(ti->cl_first + y, ti); + ti->cl_cursor = y; } } @@ -2592,6 +3733,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, TreeInfo *node_first, *node_cursor; int entry_pos = ti->cl_first + y; + PlaySound(SND_MENU_ITEM_SELECTING); + node_first = getTreeInfoFirstGroupEntry(ti); node_cursor = getTreeInfoFromPos(node_first, entry_pos); @@ -2624,7 +3767,9 @@ 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) execSetupGraphics(); else execSetupArtwork(); @@ -2660,6 +3805,15 @@ void DrawHallOfFame(int highlight_position) { UnmapAllGadgets(); FadeSoundsAndMusic(); + + /* (this is needed when called from GameEnd() after winning a game) */ + KeyboardAutoRepeatOn(); + ActivateJoystick(); + + /* (this is needed when called from GameEnd() after winning a game) */ + SetDrawDeactivationMask(REDRAW_NONE); + SetDrawBackgroundMask(REDRAW_FIELD); + CloseDoor(DOOR_CLOSE_2); if (highlight_position < 0) @@ -2756,6 +3910,8 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) } else if (button == MB_MENU_LEAVE) { + PlaySound(SND_MENU_ITEM_SELECTING); + FadeSound(SND_BACKGROUND_SCORES); game_status = GAME_MODE_MAIN; @@ -2764,6 +3920,8 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) } else if (button == MB_MENU_CHOICE) { + PlaySound(SND_MENU_ITEM_SELECTING); + FadeSound(SND_BACKGROUND_SCORES); FadeOut(REDRAW_FIELD); @@ -2787,6 +3945,7 @@ static struct TokenInfo *setup_info; static int num_setup_info; static char *screen_mode_text; +static char *game_speed_text; static char *graphics_set_name; static char *sounds_set_name; static char *music_set_name; @@ -2799,10 +3958,63 @@ static void execSetupMain() static void execSetupGame() { + 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() +{ + setup_mode = SETUP_MODE_CHOOSE_GAME_SPEED; + DrawSetupScreen(); +} + static void execSetupEditor() { setup_mode = SETUP_MODE_EDITOR; @@ -2829,7 +4041,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); @@ -2977,6 +4189,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" }, @@ -2996,6 +4210,7 @@ static struct TokenInfo setup_info_editor[] = { TYPE_SWITCH, &setup.editor.el_dx_boulderdash,"DX-Boulderdash:" }, #endif { TYPE_SWITCH, &setup.editor.el_chars, "Text Characters:" }, + { TYPE_SWITCH, &setup.editor.el_steel_chars, "Text Characters (Steel):" }, { TYPE_SWITCH, &setup.editor.el_custom, "Custom & Group Elements:" }, #if 0 { TYPE_SWITCH, &setup.editor.el_headlines, "Headlines:" }, @@ -3073,6 +4288,26 @@ static struct TokenInfo setup_info_artwork[] = { 0, NULL, NULL } }; +static struct TokenInfo setup_info_input[] = +{ + { TYPE_SWITCH, NULL, "Player:" }, + { TYPE_SWITCH, NULL, "Device:" }, + { TYPE_ENTER_MENU, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + + { 0, NULL, NULL } +}; + static struct TokenInfo setup_info_shortcut_1[] = { { TYPE_KEYTEXT, NULL, "Quick Save Game to Tape:", }, @@ -3121,7 +4356,7 @@ static Key getSetupKey() NextEvent(&event); - switch(event.type) + switch (event.type) { case EVENT_KEYPRESS: { @@ -3289,6 +4524,24 @@ static void changeSetupValue(int pos) drawSetupValue(pos); } +static void DrawCursorAndText_Setup(int pos, boolean active) +{ + int xpos = MENU_SCREEN_START_XPOS; + int ypos = MENU_SCREEN_START_YPOS + pos; + int font_nr = getSetupTextFont(setup_info[pos].type); + + if (setup_info == setup_info_input) + font_nr = FONT_MENU_1; + + if (active) + font_nr = FONT_ACTIVE(font_nr); + + DrawText(mSX + xpos * 32, mSY + ypos * 32, setup_info[pos].text, font_nr); + + if (setup_info[pos].type & ~TYPE_SKIP_ENTRY) + drawCursor(pos, active); +} + static void DrawSetupScreen_Generic() { char *title_string = NULL; @@ -3346,9 +4599,12 @@ static void DrawSetupScreen_Generic() for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) { void *value_ptr = setup_info[i].value; +#if 1 +#else int xpos = MENU_SCREEN_START_XPOS; int ypos = MENU_SCREEN_START_YPOS + i; int font_nr; +#endif /* set some entries to "unchangeable" according to other variables */ if ((value_ptr == &setup.sound_simple && !audio.sound_available) || @@ -3358,10 +4614,6 @@ static void DrawSetupScreen_Generic() (value_ptr == &screen_mode_text && !video.fullscreen_available)) setup_info[i].type |= TYPE_GHOSTED; - font_nr = getSetupTextFont(setup_info[i].type); - - DrawText(mSX + xpos * 32, mSY + ypos * 32, setup_info[i].text, font_nr); - if (setup_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST)) initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); else if (setup_info[i].type & (TYPE_LEAVE_MENU|TYPE_LEAVE_LIST)) @@ -3369,6 +4621,14 @@ static void DrawSetupScreen_Generic() else if (setup_info[i].type & ~TYPE_SKIP_ENTRY) initCursor(i, IMG_MENU_BUTTON); +#if 1 + DrawCursorAndText_Setup(i, FALSE); +#else + font_nr = getSetupTextFont(setup_info[i].type); + + DrawText(mSX + xpos * 32, mSY + ypos * 32, setup_info[i].text, font_nr); +#endif + if (setup_info[i].type & TYPE_VALUE) drawSetupValue(i); @@ -3400,12 +4660,18 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) choice++; choice_store[setup_mode] = choice; - drawCursor(choice, FC_RED); +#if 1 + DrawCursorAndText_Setup(choice, TRUE); +#else + drawCursor(choice, TRUE); +#endif return; } else if (button == MB_MENU_LEAVE) { + PlaySound(SND_MENU_ITEM_SELECTING); + for (y = 0; y < num_setup_info; y++) { if (setup_info[y].type & TYPE_LEAVE_MENU) @@ -3451,13 +4717,23 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) { if (y != choice && setup_info[y].type & ~TYPE_SKIP_ENTRY) { - drawCursor(y, FC_RED); - drawCursor(choice, FC_BLUE); + PlaySound(SND_MENU_ITEM_ACTIVATING); + +#if 1 + DrawCursorAndText_Setup(choice, FALSE); + DrawCursorAndText_Setup(y, TRUE); +#else + drawCursor(choice, FALSE); + drawCursor(y, TRUE); +#endif + choice = choice_store[setup_mode] = y; } } else if (!(setup_info[y].type & TYPE_GHOSTED)) { + PlaySound(SND_MENU_ITEM_SELECTING); + /* when selecting key headline, execute function for key value change */ if (setup_info[y].type & TYPE_KEYTEXT && setup_info[y + 1].type & TYPE_KEY) @@ -3485,10 +4761,31 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) void DrawSetupScreen_Input() { +#if 1 + int i; +#endif + ClearWindow(); +#if 1 + setup_info = setup_info_input; +#endif + DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Setup Input"); +#if 1 + for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) + { + if (setup_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST)) + initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); + else if (setup_info[i].type & (TYPE_LEAVE_MENU|TYPE_LEAVE_LIST)) + initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU); + else if (setup_info[i].type & ~TYPE_SKIP_ENTRY) + initCursor(i, IMG_MENU_BUTTON); + + DrawCursorAndText_Setup(i, FALSE); + } +#else initCursor(0, IMG_MENU_BUTTON); initCursor(1, IMG_MENU_BUTTON); initCursor(2, IMG_MENU_BUTTON_ENTER_MENU); @@ -3497,6 +4794,7 @@ void DrawSetupScreen_Input() DrawText(mSX + 32, mSY + 2 * 32, "Player:", FONT_MENU_1); DrawText(mSX + 32, mSY + 3 * 32, "Device:", FONT_MENU_1); DrawText(mSX + 32, mSY + 15 * 32, "Back", FONT_MENU_1); +#endif #if 0 DeactivateJoystickForCalibration(); @@ -3539,7 +4837,7 @@ static void setJoystickDeviceToNr(char *device_name, int device_nr) strlen(device_name)); } -static void drawPlayerSetupInputInfo(int player_nr) +static void drawPlayerSetupInputInfo(int player_nr, boolean active) { int i; static struct SetupKeyboardInfo custom_key; @@ -3563,6 +4861,7 @@ static void drawPlayerSetupInputInfo(int player_nr) "Joystick3", "Joystick4" }; + int text_font_nr = (active ? FONT_MENU_1_ACTIVE : FONT_MENU_1); InitJoysticks(); @@ -3583,19 +4882,21 @@ static void drawPlayerSetupInputInfo(int player_nr) int font_nr = (joystick.fd[player_nr] < 0 ? FONT_VALUE_OLD : FONT_VALUE_1); DrawText(mSX + 8 * 32, mSY + 3 * 32, text, font_nr); - DrawText(mSX + 32, mSY + 4 * 32, "Calibrate", FONT_MENU_1); + DrawText(mSX + 32, mSY + 4 * 32, "Calibrate", text_font_nr); } else { DrawText(mSX + 8 * 32, mSY + 3 * 32, "Keyboard ", FONT_VALUE_1); - DrawText(mSX + 1 * 32, mSY + 4 * 32, "Customize", FONT_MENU_1); + DrawText(mSX + 1 * 32, mSY + 4 * 32, "Customize", text_font_nr); } DrawText(mSX + 32, mSY + 5 * 32, "Actual Settings:", FONT_MENU_1); + drawCursorXY(1, 4, IMG_MENU_BUTTON_LEFT); drawCursorXY(1, 5, IMG_MENU_BUTTON_RIGHT); drawCursorXY(1, 6, IMG_MENU_BUTTON_UP); drawCursorXY(1, 7, IMG_MENU_BUTTON_DOWN); + DrawText(mSX + 2 * 32, mSY + 6 * 32, ":", FONT_VALUE_OLD); DrawText(mSX + 2 * 32, mSY + 7 * 32, ":", FONT_VALUE_OLD); DrawText(mSX + 2 * 32, mSY + 8 * 32, ":", FONT_VALUE_OLD); @@ -3633,7 +4934,7 @@ void HandleSetupScreen_Input_Player(int step, int direction) { input_player_nr = new_player_nr; - drawPlayerSetupInputInfo(input_player_nr); + drawPlayerSetupInputInfo(input_player_nr, FALSE); } } @@ -3649,8 +4950,13 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) if (button == MB_MENU_INITIALIZE) { - drawPlayerSetupInputInfo(input_player_nr); - drawCursor(choice, FC_RED); + drawPlayerSetupInputInfo(input_player_nr, (choice == 2)); + +#if 1 + DrawCursorAndText_Setup(choice, TRUE); +#else + drawCursor(choice, TRUE); +#endif return; } @@ -3695,8 +5001,16 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) { if (y != choice) { - drawCursor(y, FC_RED); - drawCursor(choice, FC_BLUE); +#if 1 + DrawCursorAndText_Setup(choice, FALSE); + DrawCursorAndText_Setup(y, TRUE); + + drawPlayerSetupInputInfo(input_player_nr, (y == 2)); +#else + drawCursor(choice, FALSE); + drawCursor(y, TRUE); +#endif + choice = y; } } @@ -3724,7 +5038,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) setJoystickDeviceToNr(device_name, new_device_nr); } - drawPlayerSetupInputInfo(input_player_nr); + drawPlayerSetupInputInfo(input_player_nr, FALSE); } else if (y == 2) { @@ -3793,7 +5107,7 @@ void CustomizeKeyboard(int player_nr) NextEvent(&event); - switch(event.type) + switch (event.type) { case EVENT_KEYPRESS: { @@ -3943,10 +5257,10 @@ static boolean CalibrateJoystickMain(int player_nr) NextEvent(&event); - switch(event.type) + switch (event.type) { case EVENT_KEYPRESS: - switch(GetEventKey((KeyEvent *)&event, TRUE)) + switch (GetEventKey((KeyEvent *)&event, TRUE)) { case KSYM_Return: if (check_remaining == 0) @@ -4096,6 +5410,8 @@ 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_GRAPHICS) @@ -4111,10 +5427,18 @@ void DrawSetupScreen() PlayMenuMusic(); } +void RedrawSetupScreenAfterFullscreenToggle() +{ + if (setup_mode == SETUP_MODE_GRAPHICS) + DrawSetupScreen(); +} + 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_GRAPHICS) @@ -4444,10 +5768,17 @@ static void CreateScreenScrollbars() GDI_SCROLLBAR_ITEMS_MAX, items_max, GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible, GDI_SCROLLBAR_ITEM_POSITION, item_position, +#if 1 + GDI_WHEEL_AREA_X, SX, + GDI_WHEEL_AREA_Y, SY, + GDI_WHEEL_AREA_WIDTH, SXSIZE, + GDI_WHEEL_AREA_HEIGHT, SYSIZE, +#else GDI_WHEEL_AREA_X, 0, GDI_WHEEL_AREA_Y, 0, GDI_WHEEL_AREA_WIDTH, WIN_XSIZE, GDI_WHEEL_AREA_HEIGHT, WIN_YSIZE, +#endif GDI_STATE, GD_BUTTON_UNPRESSED, GDI_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1, gd_y1, GDI_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2, gd_y2,