X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=0743c5147429bda0140b4b3050a4ac8b4bc72bba;hb=6d7ebf6db8a9a57f2e3e398da1d2f7d8d084523f;hp=e5f0e6da1eecaee7f7a72b41ac23dea97efab15a;hpb=c74a890afba46c41f6ba6ef691bc89da0dd0135c;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index e5f0e6da..0743c514 100644 --- a/src/screens.c +++ b/src/screens.c @@ -57,13 +57,17 @@ #define MAX_INFO_MODES 6 /* for various menu stuff */ -#define MAX_INFO_ELEMENTS_ON_SCREEN 10 -#define MAX_MENU_ENTRIES_ON_SCREEN (SCR_FIELDY - 2) +#define MENU_SCREEN_START_XPOS 1 #define MENU_SCREEN_START_YPOS 2 #define MENU_SCREEN_VALUE_XPOS 14 #define MENU_SCREEN_MAX_XPOS (SCR_FIELDX - 1) #define MENU_TITLE1_YPOS 8 #define MENU_TITLE2_YPOS 46 +#define MAX_INFO_ELEMENTS_ON_SCREEN 10 +#define MAX_MENU_ENTRIES_ON_SCREEN (SCR_FIELDY - MENU_SCREEN_START_YPOS) +#define MAX_MENU_TEXT_LENGTH_BIG (MENU_SCREEN_VALUE_XPOS - \ + MENU_SCREEN_START_XPOS) +#define MAX_MENU_TEXT_LENGTH_MEDIUM (MAX_MENU_TEXT_LENGTH_BIG * 2) /* buttons and scrollbars identifiers */ #define SCREEN_CTRL_ID_SCROLL_UP 0 @@ -74,6 +78,30 @@ #define NUM_SCREEN_SCROLLBARS 1 #define NUM_SCREEN_GADGETS 3 +/* graphic position and size values for buttons and scrollbars */ +#define SC_SCROLLBUTTON_XSIZE TILEX +#define SC_SCROLLBUTTON_YSIZE TILEY + +#define SC_SCROLLBAR_XPOS (SXSIZE - SC_SCROLLBUTTON_XSIZE) + +#define SC_SCROLL_VERTICAL_XSIZE SC_SCROLLBUTTON_XSIZE +#define SC_SCROLL_VERTICAL_YSIZE ((MAX_MENU_ENTRIES_ON_SCREEN - 2) * \ + SC_SCROLLBUTTON_YSIZE) + +#define SC_SCROLL_UP_XPOS SC_SCROLLBAR_XPOS +#define SC_SCROLL_UP_YPOS (2 * SC_SCROLLBUTTON_YSIZE) + +#define SC_SCROLL_VERTICAL_XPOS SC_SCROLLBAR_XPOS +#define SC_SCROLL_VERTICAL_YPOS (SC_SCROLL_UP_YPOS + \ + SC_SCROLLBUTTON_YSIZE) + +#define SC_SCROLL_DOWN_XPOS SC_SCROLLBAR_XPOS +#define SC_SCROLL_DOWN_YPOS (SC_SCROLL_VERTICAL_YPOS + \ + SC_SCROLL_VERTICAL_YSIZE) + +#define SC_BORDER_SIZE 14 + + /* forward declarations of internal functions */ static void HandleScreenGadgets(struct GadgetInfo *); static void HandleSetupScreen_Generic(int, int, int, int, int); @@ -136,6 +164,8 @@ static void drawCursorExt(int xpos, int ypos, int color, int g) g == IMG_MENU_BUTTON_RIGHT ? IMG_MENU_BUTTON_RIGHT_ACTIVE : g == IMG_MENU_BUTTON_LEAVE_MENU ? IMG_MENU_BUTTON_LEAVE_MENU_ACTIVE : g == IMG_MENU_BUTTON_ENTER_MENU ? IMG_MENU_BUTTON_ENTER_MENU_ACTIVE : + g == IMG_MENU_BUTTON_LAST_LEVEL ? IMG_MENU_BUTTON_LAST_LEVEL_ACTIVE : + g == IMG_MENU_BUTTON_NEXT_LEVEL ? IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE : IMG_MENU_BUTTON_ACTIVE); ypos += MENU_SCREEN_START_YPOS; @@ -235,9 +265,94 @@ static void ToggleFullscreenIfNeeded() } } +static int getLastLevelButtonPos() +{ + return 10; +} + +static int getCurrentLevelTextPos() +{ + return (getLastLevelButtonPos() + 1); +} + +static int getNextLevelButtonPos() +{ + return getLastLevelButtonPos() + 3 + 1; +} + +static int getLevelRangeTextPos() +{ + return getNextLevelButtonPos() + 1; +} + +void DrawTitleScreenImage(int nr) +{ + int graphic = IMG_TITLESCREEN_1 + nr; + Bitmap *bitmap = graphic_info[graphic].bitmap; + int width = graphic_info[graphic].src_image_width; + int height = graphic_info[graphic].src_image_height; + int src_x = 0, src_y = 0; + int dst_x, dst_y; + + if (bitmap == NULL) + return; + + if (width > WIN_XSIZE) + { + src_x = (width - WIN_XSIZE) / 2; + width = WIN_XSIZE; + } + + if (height > WIN_YSIZE) + { + src_y = (height - WIN_YSIZE) / 2; + height = WIN_YSIZE; + } + + dst_x = (WIN_XSIZE - width) / 2; + dst_y = (WIN_YSIZE - height) / 2; + +#if 1 + ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE); +#else + DrawBackground(0, 0, WIN_XSIZE, WIN_YSIZE); +#endif + + if (DrawingOnBackground(dst_x, dst_y)) + BlitBitmapMasked(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y); + else + BlitBitmap(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y); + + redraw_mask = REDRAW_ALL; +} + +void DrawTitleScreen() +{ + KeyboardAutoRepeatOff(); + + SetMainBackgroundImage(IMG_BACKGROUND_TITLE); + +#if 0 + CloseDoor(DOOR_CLOSE_1); +#endif + + HandleTitleScreen(0, 0, 0, 0, MB_MENU_INITIALIZE); + + PlayMenuSound(); + PlayMenuMusic(); + +#if 1 + FadeIn(1000); +#else + FadeToFront(); +#endif + StopAnimation(); +} + void DrawMainMenu() { static LevelDirTree *leveldir_last_valid = NULL; + boolean levelset_has_changed = FALSE; char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:"); #if 1 char *level_text = "Levelset"; @@ -277,6 +392,9 @@ void DrawMainMenu() if (!validLevelSeries(leveldir_current)) leveldir_current = getFirstValidTreeInfoEntry(leveldir_last_valid); + if (leveldir_current != leveldir_last_valid) + levelset_has_changed = TRUE; + /* store valid level series information */ leveldir_last_valid = leveldir_current; @@ -287,6 +405,14 @@ void DrawMainMenu() SetDrawtoField(DRAW_BACKBUFFER); #endif + if (levelset_has_changed && graphic_info[IMG_TITLESCREEN_1].bitmap != NULL) + { + game_status = GAME_MODE_TITLE; + DrawTitleScreen(); + + return; + } + #if 0 /* map gadgets for main menu screen */ MapTapeButtons(); @@ -315,20 +441,30 @@ void DrawMainMenu() /* calculated after (possible) reload of custom artwork */ name_width = getTextWidth(name_text, FONT_MENU_1); +#if 1 + level_width = 9 * 32; +#else #if 1 level_width = 9 * getFontWidth(FONT_MENU_1); #else level_width = getTextWidth(level_text, FONT_MENU_1); +#endif #endif DrawText(mSX + 32 + name_width, mSY + 2 * 32, setup.player_name, FONT_INPUT_1); + +#if 1 + DrawText(mSX + getCurrentLevelTextPos() * 32, mSY + 3 * 32, + int2str(level_nr, 3), FONT_VALUE_1); +#else #if 1 DrawText(mSX + level_width + 2 * 32, mSY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1); #else DrawText(mSX + level_width + 5 * 32, mSY + 3 * 32, int2str(level_nr, 3), FONT_VALUE_1); +#endif #endif DrawMicroLevel(MICROLEVEL_XPOS, MICROLEVEL_YPOS, TRUE); @@ -338,12 +474,17 @@ void DrawMainMenu() #if 1 { int text_height = getFontHeight(FONT_TEXT_3); +#if 1 + int xpos = getLevelRangeTextPos() * 32; +#else + int xpos = level_width + 6 * 32; +#endif int ypos2 = -SY + 3 * 32 + 16; int ypos1 = ypos2 - text_height; - DrawTextF(mSX + level_width + 6 * 32, mSY + ypos1, FONT_TEXT_3, + DrawTextF(mSX + xpos, mSY + ypos1, FONT_TEXT_3, "%03d", leveldir_current->first_level); - DrawTextF(mSX + level_width + 6 * 32, mSY + ypos2, FONT_TEXT_3, + DrawTextF(mSX + xpos, mSY + ypos2, FONT_TEXT_3, "%03d", leveldir_current->last_level); } #else @@ -370,12 +511,17 @@ void DrawMainMenu() initCursor(i, (i == 1 || i == 4 || i == 6 ? IMG_MENU_BUTTON_ENTER_MENU : IMG_MENU_BUTTON)); +#if 1 + drawCursorXY(getLastLevelButtonPos(), 1, IMG_MENU_BUTTON_LAST_LEVEL); + drawCursorXY(getNextLevelButtonPos(), 1, IMG_MENU_BUTTON_NEXT_LEVEL); +#else #if 1 drawCursorXY(level_width / 32 + 1, 1, IMG_MENU_BUTTON_LEFT); drawCursorXY(level_width / 32 + 5, 1, IMG_MENU_BUTTON_RIGHT); #else drawCursorXY(level_width / 32 + 4, 1, IMG_MENU_BUTTON_LEFT); drawCursorXY(level_width / 32 + 8, 1, IMG_MENU_BUTTON_RIGHT); +#endif #endif DrawTextSCentered(326, FONT_TITLE_2, "A Game by Artsoft Entertainment"); @@ -432,6 +578,71 @@ static void gotoTopLevelDir() } #endif +void HandleTitleScreen(int mx, int my, int dx, int dy, int button) +{ + static int title_nr = 0; + boolean return_to_main_menu = FALSE; + boolean use_cross_fading = TRUE; + int fade_delay = 1000; + int post_delay = 500; + + if (button == MB_MENU_INITIALIZE) + { + title_nr = 0; + + DrawTitleScreenImage(title_nr); + + return; + } + else if (button == MB_MENU_LEAVE) + { + return_to_main_menu = TRUE; + } + else if (button == MB_MENU_CHOICE) + { + title_nr++; + + if (!use_cross_fading) + { + FadeOut(fade_delay); + Delay(post_delay); + } + + if (title_nr < MAX_NUM_TITLE_SCREENS && + graphic_info[IMG_TITLESCREEN_1 + title_nr].bitmap != NULL) + { + Bitmap *drawto_last = drawto; + + if (use_cross_fading) + drawto = bitmap_db_title; + + DrawTitleScreenImage(title_nr); + + drawto = drawto_last; + + if (use_cross_fading) + FadeCross(bitmap_db_title, fade_delay); + else + FadeIn(fade_delay); + } + else + { + FadeOut(fade_delay); + Delay(post_delay); + + return_to_main_menu = TRUE; + } + } + + if (return_to_main_menu) + { + RedrawBackground(); + + game_status = GAME_MODE_MAIN; + DrawMainMenu(); + } +} + void HandleMainMenu(int mx, int my, int dx, int dy, int button) { static unsigned long level_delay = 0; @@ -552,7 +763,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) else if (y == 3) { if (leveldir_current->readonly && - strcmp(setup.player_name, "Artsoft") != 0) + !strEqual(setup.player_name, "Artsoft")) Request("This level is read only !", REQ_CONFIRM); game_status = GAME_MODE_EDITOR; DrawLevelEd(); @@ -669,10 +880,11 @@ static void DrawInfoScreen_Main() for (i = 0; info_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) { + int xpos = MENU_SCREEN_START_XPOS; int ypos = MENU_SCREEN_START_YPOS + i; int font_nr = FONT_MENU_1; - DrawText(mSX + 32, mSY + ypos * 32, info_info[i].text, font_nr); + DrawText(mSX + xpos * 32, mSY + ypos * 32, info_info[i].text, font_nr); if (info_info[i].type & TYPE_ENTER_MENU) initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); @@ -1098,17 +1310,17 @@ void HandleInfoScreen_Music(int button) DrawTextSCentered(100, FONT_TEXT_1, "The Game Background Music:"); } - if (strcmp(list->title, UNKNOWN_NAME) != 0) + if (!strEqual(list->title, UNKNOWN_NAME)) { - if (strcmp(list->title_header, UNKNOWN_NAME) != 0) + if (!strEqual(list->title_header, UNKNOWN_NAME)) DrawTextSCentered(ystart + y++ * dy, FONT_TEXT_2, list->title_header); DrawTextFCentered(ystart + y++ * dy, FONT_TEXT_3, "\"%s\"", list->title); } - if (strcmp(list->artist, UNKNOWN_NAME) != 0) + if (!strEqual(list->artist, UNKNOWN_NAME)) { - if (strcmp(list->artist_header, UNKNOWN_NAME) != 0) + if (!strEqual(list->artist_header, UNKNOWN_NAME)) DrawTextSCentered(ystart + y++ * dy, FONT_TEXT_2, list->artist_header); else DrawTextSCentered(ystart + y++ * dy, FONT_TEXT_2, "by"); @@ -1116,9 +1328,9 @@ void HandleInfoScreen_Music(int button) DrawTextFCentered(ystart + y++ * dy, FONT_TEXT_3, "%s", list->artist); } - if (strcmp(list->album, UNKNOWN_NAME) != 0) + if (!strEqual(list->album, UNKNOWN_NAME)) { - if (strcmp(list->album_header, UNKNOWN_NAME) != 0) + if (!strEqual(list->album_header, UNKNOWN_NAME)) DrawTextSCentered(ystart + y++ * dy, FONT_TEXT_2, list->album_header); else DrawTextSCentered(ystart + y++ * dy, FONT_TEXT_2, "from the album"); @@ -1126,9 +1338,9 @@ void HandleInfoScreen_Music(int button) DrawTextFCentered(ystart + y++ * dy, FONT_TEXT_3, "\"%s\"", list->album); } - if (strcmp(list->year, UNKNOWN_NAME) != 0) + if (!strEqual(list->year, UNKNOWN_NAME)) { - if (strcmp(list->year_header, UNKNOWN_NAME) != 0) + if (!strEqual(list->year_header, UNKNOWN_NAME)) DrawTextSCentered(ystart + y++ * dy, FONT_TEXT_2, list->year_header); else DrawTextSCentered(ystart + y++ * dy, FONT_TEXT_2, "from the year"); @@ -1461,8 +1673,6 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, TreeInfo *ti) { int i; - char buffer[SCR_FIELDX * 2]; - int max_buffer_len = (SCR_FIELDX - 2) * 2; char *title_string = NULL; #if 0 int xoffset_sets = 16; @@ -1502,14 +1712,24 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, /* clear tree list area, but not title or scrollbar */ DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32, - SXSIZE - 32 + menu.scrollbar_xoffset, + SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset, MAX_MENU_ENTRIES_ON_SCREEN * 32); for (i = 0; i < num_page_entries; i++) { TreeInfo *node, *node_first; int entry_pos = first_entry + i; + int xpos = MENU_SCREEN_START_XPOS; int ypos = MENU_SCREEN_START_YPOS + i; + int startx = mSX + xpos * 32; + int starty = mSY + ypos * 32; + int font_nr = FONT_TEXT_1; + int font_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset; + int startx_text = startx + font_xoffset; + int startx_scrollbar = mSX + SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset; + int text_size = startx_scrollbar - startx_text; + int max_buffer_len = text_size / getFontWidth(font_nr); + char buffer[max_buffer_len + 1]; node_first = getTreeInfoFirstGroupEntry(ti); node = getTreeInfoFromPos(node_first, entry_pos); @@ -1517,7 +1737,7 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, strncpy(buffer, node->name, max_buffer_len); buffer[max_buffer_len] = '\0'; - DrawText(mSX + 32, mSY + ypos * 32, buffer, FONT_TEXT_1 + node->color); + DrawText(startx, starty, buffer, font_nr + node->color); if (node->parent_link) initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU); @@ -1862,8 +2082,10 @@ static void drawHallOfFameList(int first_entry, int highlight_position) DrawText(mSX, sy, int2str(entry + 1, 3), font_nr1); DrawText(mSX + dx1, sy, ".", font_nr1); DrawText(mSX + dx2, sy, ".........................", font_nr3); - if (strcmp(highscore[entry].Name, EMPTY_PLAYER_NAME) != 0) + + if (!strEqual(highscore[entry].Name, EMPTY_PLAYER_NAME)) DrawText(mSX + dx2, sy, highscore[entry].Name, font_nr2); + DrawText(mSX + dx3, sy, int2str(highscore[entry].Score, 5), font_nr4); } @@ -2065,6 +2287,7 @@ static struct TokenInfo setup_info_game[] = static struct TokenInfo setup_info_editor[] = { +#if 0 { TYPE_SWITCH, &setup.editor.el_boulderdash, "Boulder Dash:" }, { TYPE_SWITCH, &setup.editor.el_emerald_mine, "Emerald Mine:" }, { TYPE_SWITCH, &setup.editor.el_emerald_mine_club, "Emerald Mine Club:" }, @@ -2073,12 +2296,15 @@ static struct TokenInfo setup_info_editor[] = { TYPE_SWITCH, &setup.editor.el_supaplex, "Supaplex:" }, { TYPE_SWITCH, &setup.editor.el_diamond_caves, "Diamond Caves II:" }, { TYPE_SWITCH, &setup.editor.el_dx_boulderdash,"DX-Boulderdash:" }, +#endif { TYPE_SWITCH, &setup.editor.el_chars, "Text Characters:" }, { TYPE_SWITCH, &setup.editor.el_custom, "Custom & Group Elements:" }, { TYPE_SWITCH, &setup.editor.el_headlines, "Headlines:" }, { TYPE_SWITCH, &setup.editor.el_user_defined, "User defined element list:" }, { TYPE_SWITCH, &setup.editor.el_dynamic, "Dynamic level elements:" }, { TYPE_EMPTY, NULL, "" }, + { TYPE_SWITCH, &setup.editor.show_element_token, "Show element token:" }, + { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Back" }, { 0, NULL, NULL } @@ -2088,14 +2314,15 @@ static struct TokenInfo setup_info_graphics[] = { { TYPE_SWITCH, &setup.fullscreen, "Fullscreen Mode:" }, { TYPE_SWITCH, &setup.scroll_delay, "Delayed Scrolling:" }, - { TYPE_SWITCH, &setup.soft_scrolling, "Soft Scrolling:" }, #if 0 + { TYPE_SWITCH, &setup.soft_scrolling, "Soft Scrolling:" }, { TYPE_SWITCH, &setup.double_buffering,"Double-Buffering:" }, { TYPE_SWITCH, &setup.fading, "Fading:" }, #endif { TYPE_SWITCH, &setup.quick_switch, "Quick Player Focus Switch:" }, { TYPE_SWITCH, &setup.quick_doors, "Quick Menu Doors:" }, { TYPE_SWITCH, &setup.toons, "Toons:" }, + { TYPE_ECS_AGA, &setup.prefer_aga_graphics,"EMC graphics preference:" }, { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Back" }, @@ -2220,11 +2447,41 @@ static Key getSetupKey() return key; } +static int getSetupTextFont(int type) +{ + if (type & (TYPE_SWITCH | + TYPE_YES_NO | + TYPE_STRING | + TYPE_ECS_AGA | + TYPE_KEYTEXT)) + return FONT_MENU_2; + else + return FONT_MENU_1; +} + +static int getSetupValueFont(int type, void *value) +{ + if (type & TYPE_KEY) + return (type & TYPE_QUERY ? FONT_INPUT_1_ACTIVE : FONT_VALUE_1); + else if (type & TYPE_STRING) + return FONT_VALUE_2; + else if (type & TYPE_ECS_AGA) + return FONT_VALUE_1; + else if (type & TYPE_BOOLEAN_STYLE) + return (*(boolean *)value ? FONT_OPTION_ON : FONT_OPTION_OFF); + else + return FONT_VALUE_1; +} + static void drawSetupValue(int pos) { + boolean font_draw_xoffset_modified = FALSE; + int font_draw_xoffset_old = -1; int xpos = MENU_SCREEN_VALUE_XPOS; int ypos = MENU_SCREEN_START_YPOS + pos; - int font_nr = FONT_VALUE_1; + int startx = mSX + xpos * 32; + int starty = mSY + ypos * 32; + int font_nr, font_width; int type = setup_info[pos].type; void *value = setup_info[pos].value; char *value_string = getSetupValue(type, value); @@ -2236,7 +2493,7 @@ static void drawSetupValue(int pos) if (type & TYPE_KEY) { #if 1 - xpos = 1; + xpos = MENU_SCREEN_START_XPOS; #else xpos = 3; #endif @@ -2244,33 +2501,99 @@ static void drawSetupValue(int pos) if (type & TYPE_QUERY) { value_string = ""; +#if 0 font_nr = FONT_INPUT_1_ACTIVE; +#endif } } else if (type & TYPE_STRING) { int max_value_len = (SCR_FIELDX - 2) * 2; - xpos = 1; + xpos = MENU_SCREEN_START_XPOS; +#if 0 font_nr = FONT_VALUE_2; +#endif if (strlen(value_string) > max_value_len) value_string[max_value_len] = '\0'; } + else if (type & TYPE_ECS_AGA) + { +#if 0 + font_nr = FONT_VALUE_1; +#endif + } else if (type & TYPE_BOOLEAN_STYLE) { +#if 0 font_nr = (*(boolean *)value ? FONT_OPTION_ON : FONT_OPTION_OFF); +#endif + } + + startx = mSX + xpos * 32; + starty = mSY + ypos * 32; + font_nr = getSetupValueFont(type, value); + font_width = getFontWidth(font_nr); + + /* downward compatibility correction for Juergen Bonhagen's menu settings */ + if (setup_mode != SETUP_MODE_INPUT) + { + int check_font_nr = FONT_OPTION_ON; /* known font that needs correction */ + int font1_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset; + int font2_xoffset = getFontBitmapInfo(check_font_nr)->draw_xoffset; + int text_startx = mSX + MENU_SCREEN_START_XPOS * 32; + int text_font_nr = getSetupTextFont(FONT_MENU_2); + int text_font_xoffset = getFontBitmapInfo(text_font_nr)->draw_xoffset; + int text_width = MAX_MENU_TEXT_LENGTH_MEDIUM * getFontWidth(text_font_nr); + boolean correct_font_draw_xoffset = FALSE; + + if (xpos == MENU_SCREEN_START_XPOS && + startx + font1_xoffset < text_startx + text_font_xoffset) + correct_font_draw_xoffset = TRUE; + + if (xpos == MENU_SCREEN_VALUE_XPOS && + startx + font2_xoffset < text_startx + text_width + text_font_xoffset) + correct_font_draw_xoffset = TRUE; + +#if 0 + printf("::: %d + %d < %d + %d + %d\n", + startx, font_xoffset, text_startx, text_width, text_font_xoffset); + printf("::: => need correction == %d\n", correct_font_draw_xoffset); +#endif + + /* check if setup value would overlap with setup text when printed */ + /* (this can happen for extreme/wrong values for font draw offset) */ + if (correct_font_draw_xoffset) + { + font_draw_xoffset_old = getFontBitmapInfo(font_nr)->draw_xoffset; + font_draw_xoffset_modified = TRUE; + + if (type & TYPE_KEY) + getFontBitmapInfo(font_nr)->draw_xoffset += 2 * getFontWidth(font_nr); + else if (!(type & TYPE_STRING)) + getFontBitmapInfo(font_nr)->draw_xoffset = text_font_xoffset + 20 - + MAX_MENU_TEXT_LENGTH_MEDIUM * (16 - getFontWidth(text_font_nr)); + } } +#if 1 + for (i = 0; i <= MENU_SCREEN_MAX_XPOS - xpos; i++) + DrawText(startx + i * font_width, starty, " ", font_nr); +#else #if 1 for (i = xpos; i <= MENU_SCREEN_MAX_XPOS; i++) - DrawText(mSX + i * 32, mSY + ypos * 32, " ", font_nr); + DrawText(mSX + i * 32, starty, " ", font_nr); #else - DrawText(mSX + xpos * 32, mSY + ypos * 32, + DrawText(startx, starty, (xpos == 3 ? " " : " "), font_nr); #endif +#endif + + DrawText(startx, starty, value_string, font_nr); - DrawText(mSX + xpos * 32, mSY + ypos * 32, value_string, font_nr); + if (font_draw_xoffset_modified) + getFontBitmapInfo(font_nr)->draw_xoffset = font_draw_xoffset_old; } static void changeSetupValue(int pos) @@ -2356,8 +2679,13 @@ 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; + int xpos = MENU_SCREEN_START_XPOS; int ypos = MENU_SCREEN_START_YPOS + i; +#if 1 + int font_nr; +#else int font_nr = FONT_MENU_1; +#endif /* set some entries to "unchangeable" according to other variables */ if ((value_ptr == &setup.sound_simple && !audio.sound_available) || @@ -2366,18 +2694,23 @@ static void DrawSetupScreen_Generic() (value_ptr == &setup.fullscreen && !video.fullscreen_available)) setup_info[i].type |= TYPE_GHOSTED; +#if 1 + font_nr = getSetupTextFont(setup_info[i].type); +#else #if 1 if (setup_info[i].type & (TYPE_SWITCH | TYPE_YES_NO | TYPE_STRING | + TYPE_ECS_AGA | TYPE_KEYTEXT)) font_nr = FONT_MENU_2; #else if (setup_info[i].type & TYPE_STRING) font_nr = FONT_MENU_2; +#endif #endif - DrawText(mSX + 32, mSY + ypos * 32, setup_info[i].text, font_nr); + DrawText(mSX + xpos * 32, mSY + ypos * 32, setup_info[i].text, font_nr); if (setup_info[i].type & TYPE_ENTER_MENU) initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); @@ -3138,25 +3471,8 @@ void HandleGameActions() AutoPlayTape(); /* continue automatically playing next tape */ } -/* ---------- new screen button stuff -------------------------------------- */ - -/* graphic position and size values for buttons and scrollbars */ -#define SC_SCROLLBUTTON_XSIZE TILEX -#define SC_SCROLLBUTTON_YSIZE TILEY - -#define SC_SCROLL_VERTICAL_XSIZE SC_SCROLLBUTTON_XSIZE -#define SC_SCROLL_VERTICAL_YSIZE ((MAX_MENU_ENTRIES_ON_SCREEN - 2) * \ - SC_SCROLLBUTTON_YSIZE) -#define SC_SCROLL_UP_XPOS (SXSIZE - SC_SCROLLBUTTON_XSIZE) -#define SC_SCROLL_UP_YPOS (2 * SC_SCROLLBUTTON_YSIZE) -#define SC_SCROLL_VERTICAL_XPOS SC_SCROLL_UP_XPOS -#define SC_SCROLL_VERTICAL_YPOS (SC_SCROLL_UP_YPOS + \ - SC_SCROLLBUTTON_YSIZE) -#define SC_SCROLL_DOWN_XPOS SC_SCROLL_UP_XPOS -#define SC_SCROLL_DOWN_YPOS (SC_SCROLL_VERTICAL_YPOS + \ - SC_SCROLL_VERTICAL_YSIZE) -#define SC_BORDER_SIZE 14 +/* ---------- new screen button stuff -------------------------------------- */ static struct {