X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftext.c;h=117c9b1cda08765556a2549163ab6326a8559221;hb=6c9f59b4;hp=dbec20df90e98aac1882d7e875d555310db2d49a;hpb=4cd59cef0737229da365e385a8762e681a5e471f;p=rocksndiamonds.git diff --git a/src/libgame/text.c b/src/libgame/text.c index dbec20df..117c9b1c 100644 --- a/src/libgame/text.c +++ b/src/libgame/text.c @@ -138,10 +138,6 @@ int maxWordLengthInRequestString(char *text) void DrawInitText(char *text, int ypos, int font_nr) { - LimitScreenUpdates(TRUE); - - UPDATE_BUSY_STATE(); - if (window != NULL && gfx.draw_init_text && gfx.num_fonts > 0 && @@ -159,6 +155,26 @@ void DrawInitText(char *text, int ypos, int font_nr) } } +void DrawInitTextHead(char *text) +{ + // always draw headlines when loading initial stuff + LimitScreenUpdates(FALSE); + + UPDATE_BUSY_STATE(); + + DrawInitText(text, 120, FC_GREEN); +} + +void DrawInitTextItem(char *text) +{ + // limit drawing (potentially many) loading items + LimitScreenUpdates(TRUE); + + UPDATE_BUSY_STATE(); + + DrawInitText(text, 150, FC_YELLOW); +} + 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);