X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=b22e82997d487ff03f6c566d311001053e2f1449;hb=2b8e172616210fa577b4ea3c4a777a3c09b40bb9;hp=61cb7106041aa68ad59b2af9b755d9d807d11c3e;hpb=d225818b7c89b2b60e52ac228e47ce303b5d8ef8;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 61cb7106..b22e8299 100644 --- a/src/screens.c +++ b/src/screens.c @@ -3763,7 +3763,7 @@ static void drawHallOfFameList(int first_entry, int highlight_position) int font_nr4 = (active ? FONT_TEXT_4_ACTIVE : FONT_TEXT_4); int dx1 = 3 * getFontWidth(font_nr1); int dx2 = dx1 + getFontWidth(font_nr1); - int dx3 = SXSIZE - 5 * getFontWidth(font_nr4); + int dx3 = SXSIZE - 2 * (mSX - SX) - 5 * getFontWidth(font_nr4); int num_dots = (dx3 - dx2) / getFontWidth(font_nr3); int sy = mSY + 64 + i * 32; @@ -5344,10 +5344,12 @@ static void DrawSetupScreen_Generic() DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, title_string); + // determine maximal number of setup entries that can be displayed on screen num_setup_info = 0; - for (i = 0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++) + for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) num_setup_info++; + // determine maximal number of setup entries available for this setup screen max_setup_info = 0; for (i = 0; setup_info[i].type != 0; i++) max_setup_info++;