int ypos = MENU_SCREEN_START_YPOS + screen_pos;
int startx = mSX + xpos * 32;
int starty = mSY + ypos * 32;
- int font_nr, font_nr_default, font_width_default;
int type = si->type;
void *value = si->value;
char *value_string = getSetupValue(type, value);
+ int font_nr_default = getSetupValueFont(type, value);
+ int font_width_default = getFontWidth(font_nr_default);
+ int font_nr = font_nr_default;
int i;
if (value_string == NULL)
startx = mSX + xpos * 32;
starty = mSY + ypos * 32;
- font_nr_default = getSetupValueFont(type, value);
- font_width_default = getFontWidth(font_nr_default);
-
- font_nr = font_nr_default;
// special check if right-side setup values moved left due to scrollbar
if (scrollbar_needed && xpos > MENU_SCREEN_START_XPOS)
if (type & TYPE_PLAYER)
{
+ struct FontBitmapInfo *font = getFontBitmapInfo(font_nr);
int player_nr = *(int *)value;
- int xoff = getFontWidth(font_nr);
+ int xoff = font->draw_xoffset + getFontWidth(font_nr);
+ int yoff = font->draw_yoffset + (getFontHeight(font_nr) - TILEY) / 2;
+ int startx2 = startx + xoff;
+ int starty2 = starty + yoff;
+
+ if (DrawingOnBackground(startx2, starty2))
+ ClearRectangleOnBackground(drawto, startx2, starty2, TILEX, TILEY);
- DrawFixedGraphicThruMaskExt(drawto, startx + xoff, starty,
+ DrawFixedGraphicThruMaskExt(drawto, startx2, starty2,
PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0);
}