X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fgadgets.c;h=66a8e2b340bfcd7848cb05e3e349b15c1c3bbb1a;hb=07bd1f7e496e8914d56ec4422b33492b8f66b1d0;hp=2405c137aeab6bb16af471e140241587677b784b;hpb=078d932701464a5152c3889007e5818f87f609c7;p=rocksndiamonds.git diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c index 2405c137..66a8e2b3 100644 --- a/src/libgame/gadgets.c +++ b/src/libgame/gadgets.c @@ -138,28 +138,29 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) int font_type = gi->text.font_type; int font_width = getFontWidth(font_type); int border = gi->border.size; + strcpy(text, gi->text.value); strcat(text, " "); /* left part of gadget */ - BlitBitmap(gd->bitmap, drawto, - gd->x, gd->y, border, gi->height, gi->x, gi->y); + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x, gd->y, border, gi->height, gi->x, gi->y); /* middle part of gadget */ for (i=0; i<=gi->text.size; i++) - BlitBitmap(gd->bitmap, drawto, - gd->x + border, gd->y, font_width, gi->height, - gi->x + border + i * font_width, gi->y); + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x + border, gd->y, font_width, gi->height, + gi->x + border + i * font_width, gi->y); /* right part of gadget */ - BlitBitmap(gd->bitmap, drawto, - gd->x + gi->border.width - border, gd->y, - border, gi->height, gi->x + gi->width - border, gi->y); + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x + gi->border.width -border, gd->y, border, + gi->height, gi->x + gi->width - border, gi->y); /* gadget text value */ DrawTextExt(drawto, gi->x + border, gi->y + border, text, - font_type, FONT_OPAQUE); + font_type, FONT_MASKED); cursor_letter = gi->text.value[gi->text.cursor_position]; cursor_string[0] = '~'; @@ -171,7 +172,7 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) DrawTextExt(drawto, gi->x + border + gi->text.cursor_position * font_width, gi->y + border, cursor_string, - font_type, FONT_OPAQUE); + font_type, FONT_MASKED); } break;