X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftext.c;h=17475e8c721247b0d92a51532229275e6676e78b;hb=963345fd2614535471086111e64eded2cd9818e4;hp=02a23c3d43b02a053ffabf7fced633d441531de4;hpb=6229b51a03a4113fa799587e0f58fcea0f634d41;p=rocksndiamonds.git diff --git a/src/libgame/text.c b/src/libgame/text.c index 02a23c3d..17475e8c 100644 --- a/src/libgame/text.c +++ b/src/libgame/text.c @@ -4,7 +4,7 @@ // (c) 1995-2014 by Artsoft Entertainment // Holger Schemel // info@artsoft.org -// http://www.artsoft.org/ +// https://www.artsoft.org/ // ---------------------------------------------------------------------------- // text.c // ============================================================================ @@ -136,7 +136,7 @@ int maxWordLengthInRequestString(char *text) // simple text drawing functions // ============================================================================ -void DrawInitText(char *text, int ypos, int font_nr) +static void DrawInitTextExt(char *text, int ypos, int font_nr, boolean update) { LimitScreenUpdates(TRUE); @@ -155,10 +155,26 @@ void DrawInitText(char *text, int ypos, int font_nr) ClearRectangle(drawto, 0, y, width, height); DrawTextExt(drawto, x, y, text, font_nr, BLIT_OPAQUE); - BlitBitmap(drawto, window, 0, 0, video.width, video.height, 0, 0); + if (update) + BlitBitmap(drawto, window, 0, 0, video.width, video.height, 0, 0); } } +void DrawInitText(char *text, int ypos, int font_nr) +{ + DrawInitTextExt(text, ypos, font_nr, FALSE); +} + +void DrawInitTextHead(char *text) +{ + DrawInitTextExt(text, 120, FC_GREEN, FALSE); +} + +void DrawInitTextItem(char *text) +{ + DrawInitTextExt(text, 150, FC_YELLOW, TRUE); +} + void DrawTextF(int x, int y, int font_nr, char *format, ...) { char buffer[MAX_OUTPUT_LINESIZE + 1]; @@ -169,7 +185,7 @@ void DrawTextF(int x, int y, int font_nr, char *format, ...) va_end(ap); if (strlen(buffer) > MAX_OUTPUT_LINESIZE) - Error(ERR_EXIT, "string too long in DrawTextF() -- aborting"); + Fail("string too long in DrawTextF() -- aborting"); DrawText(gfx.sx + x, gfx.sy + y, buffer, font_nr); } @@ -184,7 +200,7 @@ void DrawTextFCentered(int y, int font_nr, char *format, ...) va_end(ap); if (strlen(buffer) > MAX_OUTPUT_LINESIZE) - Error(ERR_EXIT, "string too long in DrawTextFCentered() -- aborting"); + Fail("string too long in DrawTextFCentered() -- aborting"); DrawText(gfx.sx + (gfx.sxsize - getTextWidth(buffer, font_nr)) / 2, gfx.sy + y, buffer, font_nr); @@ -639,7 +655,7 @@ int DrawTextBufferVA(int x, int y, char *format, va_list ap, int font_nr, int text_length = vsnprintf(text_buffer, MAX_OUTPUT_LINESIZE, format, ap); if (text_length >= MAX_OUTPUT_LINESIZE) - Error(ERR_WARN, "string too long in DrawTextBufferVA() -- truncated"); + Warn("string too long in DrawTextBufferVA() -- truncated"); int num_lines_printed = DrawTextBuffer(x, y, text_buffer, font_nr, line_length, cut_length, max_lines,