X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Ftext.c;h=fbf7683ef2a112e74ae3936d49af0b2efc85fe30;hp=63a1389e35097f0a7b02eec8d20e5a36e70fd235;hb=b641818c787e48bbf03ce2a0cd5b542c4c21e523;hpb=2e99b0c26d334eb287486b8933b52b5048c6cc0c diff --git a/src/libgame/text.c b/src/libgame/text.c index 63a1389e..fbf7683e 100644 --- a/src/libgame/text.c +++ b/src/libgame/text.c @@ -1,15 +1,13 @@ -/*********************************************************** -* Artsoft Retro-Game Library * -*----------------------------------------------------------* -* (c) 1994-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* text.c * -***********************************************************/ +// ============================================================================ +// Artsoft Retro-Game Library +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// https://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// text.c +// ============================================================================ #include #include @@ -18,9 +16,9 @@ #include "misc.h" -/* ========================================================================= */ -/* font functions */ -/* ========================================================================= */ +// ============================================================================ +// font functions +// ============================================================================ void InitFontInfo(struct FontBitmapInfo *font_bitmap_info, int num_fonts, int (*select_font_function)(int), @@ -61,6 +59,20 @@ int getFontHeight(int font_nr) return gfx.font_bitmap_info[font_bitmap_id].height; } +int getFontDrawOffsetX(int font_nr) +{ + int font_bitmap_id = gfx.select_font_function(font_nr); + + return gfx.font_bitmap_info[font_bitmap_id].draw_xoffset; +} + +int getFontDrawOffsetY(int font_nr) +{ + int font_bitmap_id = gfx.select_font_function(font_nr); + + return gfx.font_bitmap_info[font_bitmap_id].draw_yoffset; +} + int getTextWidth(char *text, int font_nr) { return (text != NULL ? strlen(text) * getFontWidth(font_nr) : 0); @@ -73,11 +85,11 @@ static int getFontCharPosition(int font_nr, char c) boolean default_font = (font->num_chars == DEFAULT_NUM_CHARS_PER_FONT); int font_pos = (unsigned char)c - 32; - /* map some special characters to their ascii values in default font */ + // map some special characters to their ascii values in default font if (default_font) font_pos = MAP_FONT_ASCII(c) - 32; - /* this allows dynamic special characters together with special font */ + // this allows dynamic special characters together with special font if (font_pos < 0 || font_pos >= font->num_chars) font_pos = 0; @@ -89,25 +101,29 @@ void getFontCharSource(int font_nr, char c, Bitmap **bitmap, int *x, int *y) int font_bitmap_id = gfx.select_font_function(font_nr); struct FontBitmapInfo *font = &gfx.font_bitmap_info[font_bitmap_id]; int font_pos = getFontCharPosition(font_nr, c); + int offset_x = (font->offset_x != 0 ? font->offset_x : font->width); + int offset_y = (font->offset_y != 0 ? font->offset_y : font->height); *bitmap = font->bitmap; - *x = font->src_x + (font_pos % font->num_chars_per_line) * font->width; - *y = font->src_y + (font_pos / font->num_chars_per_line) * font->height; + *x = font->src_x + (font_pos % font->num_chars_per_line) * offset_x; + *y = font->src_y + (font_pos / font->num_chars_per_line) * offset_y; } -/* ========================================================================= */ -/* text string helper functions */ -/* ========================================================================= */ +// ============================================================================ +// text string helper functions +// ============================================================================ -int maxWordLengthInString(char *text) +int maxWordLengthInRequestString(char *text) { char *text_ptr; int word_len = 0, max_word_len = 0; for (text_ptr = text; *text_ptr; text_ptr++) { - word_len = (*text_ptr != ' ' ? word_len + 1 : 0); + word_len = (*text_ptr != ' ' && + *text_ptr != '?' && + *text_ptr != '!' ? word_len + 1 : 0); max_word_len = MAX(word_len, max_word_len); } @@ -116,29 +132,16 @@ int maxWordLengthInString(char *text) } -/* ========================================================================= */ -/* simple text drawing functions */ -/* ========================================================================= */ +// ============================================================================ +// simple text drawing functions +// ============================================================================ -void DrawInitTextExt(char *text, int ypos, int font_nr, boolean force) +void DrawInitText(char *text, int ypos, int font_nr) { -#if 1 -#if 0 - static unsigned int progress_delay = 0; - unsigned int progress_delay_value = 100; /* (in milliseconds) */ -#endif - - // LimitScreenUpdates(TRUE); // (ignore "force" for now) - // LimitScreenUpdates(!force); LimitScreenUpdates(TRUE); UPDATE_BUSY_STATE(); -#if 0 - if (!force && !DelayReached(&progress_delay, progress_delay_value)) - return; -#endif - if (window != NULL && gfx.draw_init_text && gfx.num_fonts > 0 && @@ -154,51 +157,6 @@ void DrawInitTextExt(char *text, int ypos, int font_nr, boolean force) BlitBitmap(drawto, window, 0, 0, video.width, video.height, 0, 0); } -#else - static unsigned int progress_delay = 0; - unsigned int progress_delay_value = 100; /* (in milliseconds) */ - - // LimitScreenUpdates(TRUE); // (ignore "force" for now) - LimitScreenUpdates(!force); - - UPDATE_BUSY_STATE(); - - if (!force && !DelayReached(&progress_delay, progress_delay_value)) - return; - - if (window != NULL && - gfx.draw_init_text && - gfx.num_fonts > 0 && - gfx.font_bitmap_info[font_nr].bitmap != NULL) - { - int x = (video.width - getTextWidth(text, font_nr)) / 2; - int y = ypos; - int width = video.width; - int height = getFontHeight(font_nr); - - ClearRectangle(drawto, 0, y, width, height); - DrawTextExt(drawto, x, y, text, font_nr, BLIT_OPAQUE); - - /* this makes things significantly faster than directly drawing to window */ - BlitBitmap(drawto, window, 0, y, width, height, 0, y); - } -#endif -} - -void DrawInitText(char *text, int ypos, int font_nr) -{ - // DrawInitTextExt(text, ypos, font_nr, TRUE); - DrawInitTextExt(text, ypos, font_nr, FALSE); -} - -void DrawInitTextAlways(char *text, int ypos, int font_nr) -{ - DrawInitTextExt(text, ypos, font_nr, TRUE); -} - -void DrawInitTextIfNeeded(char *text, int ypos, int font_nr) -{ - DrawInitTextExt(text, ypos, font_nr, FALSE); } void DrawTextF(int x, int y, int font_nr, char *format, ...) @@ -243,15 +201,10 @@ void DrawTextSCentered(int y, int font_nr, char *text) gfx.sy + y, text, font_nr); } -void DrawTextCentered(int y, int font_nr, char *text) -{ - DrawText((gfx.sxsize - getTextWidth(text, font_nr)) / 2, y, text, font_nr); -} - void DrawTextSAligned(int x, int y, char *text, int font_nr, int align) { DrawText(gfx.sx + ALIGNED_XPOS(x, getTextWidth(text, font_nr), align), - gfx.sx + y, text, font_nr); + gfx.sy + y, text, font_nr); } void DrawTextAligned(int x, int y, char *text, int font_nr, int align) @@ -269,7 +222,6 @@ void DrawText(int x, int y, char *text, int font_nr) DrawTextExt(drawto, x, y, text, font_nr, mask_mode); -#if 1 if (IN_GFX_FIELD_FULL(x, y)) redraw_mask |= REDRAW_FIELD; else if (IN_GFX_DOOR_1(x, y)) @@ -280,30 +232,14 @@ void DrawText(int x, int y, char *text, int font_nr) redraw_mask |= REDRAW_DOOR_3; else redraw_mask |= REDRAW_ALL; -#else - if (x < gfx.dx) - redraw_mask |= REDRAW_FIELD; - else if (y < gfx.vy || gfx.vy == 0) - redraw_mask |= REDRAW_DOOR_1; -#endif } void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text, int font_nr, int mask_mode) { -#if 1 struct FontBitmapInfo *font = getFontBitmapInfo(font_nr); -#else - int font_bitmap_id = gfx.select_font_function(font_nr); - struct FontBitmapInfo *font = &gfx.font_bitmap_info[font_bitmap_id]; -#endif int font_width = getFontWidth(font_nr); int font_height = getFontHeight(font_nr); -#if 0 - int border_1 = gfx.sx + gfx.sxsize; - int border_2 = gfx.dx + gfx.dxsize; - int dst_x_start = dst_x; -#endif Bitmap *src_bitmap; int src_x, src_y; char *text_ptr = text; @@ -311,11 +247,11 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text, if (font->bitmap == NULL) return; - /* skip text to be printed outside the window (left/right will be clipped) */ + // skip text to be printed outside the window (left/right will be clipped) if (dst_y < 0 || dst_y + font_height > video.height) return; - /* add offset for drawing font characters */ + // add offset for drawing font characters dst_x += font->draw_xoffset; dst_y += font->draw_yoffset; @@ -324,11 +260,11 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text, char c = *text_ptr++; if (c == '\n') - c = ' '; /* print space instead of newline */ + c = ' '; // print space instead of newline getFontCharSource(font_nr, c, &src_bitmap, &src_x, &src_y); - /* clip text at the left side of the window */ + // clip text at the left side of the window if (dst_x < 0) { dst_x += font_width; @@ -336,21 +272,14 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text, continue; } - /* clip text at the right side of the window */ -#if 1 + // clip text at the right side of the window if (dst_x + font_width > video.width) break; -#else - /* (this does not work well when trying to print text to whole screen) */ - if ((dst_x_start < border_1 && dst_x + font_width > border_1) || - (dst_x_start < border_2 && dst_x + font_width > border_2)) - break; -#endif - if (mask_mode == BLIT_INVERSE) /* special mode for text gadgets */ + if (mask_mode == BLIT_INVERSE) // special mode for text gadgets { - /* first step: draw solid colored rectangle (use "cursor" character) */ - if (strlen(text) == 1) /* only one char inverted => draw cursor */ + // first step: draw solid colored rectangle (use "cursor" character) + if (strlen(text) == 1) // only one char inverted => draw cursor { Bitmap *cursor_bitmap; int cursor_x, cursor_y; @@ -362,34 +291,23 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text, font_width, font_height, dst_x, dst_y); } -#if defined(TARGET_SDL) - /* second step: draw masked inverted character */ + // second step: draw masked inverted character SDLCopyInverseMasked(src_bitmap, dst_bitmap, src_x, src_y, font_width, font_height, dst_x, dst_y); -#else - /* second step: draw masked black rectangle (use "space" character) */ - SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc, - dst_x - src_x, dst_y - src_y); - BlitBitmapMasked(src_bitmap, dst_bitmap, 0, 0, - font_width, font_height, dst_x, dst_y); -#endif } else if (mask_mode == BLIT_MASKED || mask_mode == BLIT_ON_BACKGROUND) { if (mask_mode == BLIT_ON_BACKGROUND) { - /* clear font character background */ + // clear font character background ClearRectangleOnBackground(dst_bitmap, dst_x, dst_y, font_width, font_height); } - SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc, - dst_x - src_x, dst_y - src_y); - BlitBitmapMasked(src_bitmap, dst_bitmap, src_x, src_y, font_width, font_height, dst_x, dst_y); } - else /* normal, non-masked font blitting */ + else // normal, non-masked font blitting { BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, font_width, font_height, dst_x, dst_y); @@ -400,14 +318,12 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text, } -/* ========================================================================= */ -/* text buffer drawing functions */ -/* ========================================================================= */ +// ============================================================================ +// text buffer drawing functions +// ============================================================================ #define MAX_LINES_FROM_FILE 1024 -#if 1 - char *GetTextBufferFromFile(char *filename, int max_lines) { File *file; @@ -420,13 +336,13 @@ char *GetTextBufferFromFile(char *filename, int max_lines) if (!(file = openFile(filename, MODE_READ))) return NULL; - buffer = checked_calloc(1); /* start with valid, but empty text buffer */ + buffer = checked_calloc(1); // start with valid, but empty text buffer while (!checkEndOfFile(file) && num_lines < max_lines) { char line[MAX_LINE_LEN]; - /* read next line of input file */ + // read next line of input file if (!getStringFromFile(file, line, MAX_LINE_LEN)) break; @@ -442,72 +358,6 @@ char *GetTextBufferFromFile(char *filename, int max_lines) return buffer; } -#else - -char *GetTextBufferFromFile(char *filename, int max_lines) -{ - FILE *file; - char *buffer; - int num_lines = 0; - - if (filename == NULL) - return NULL; - - if (!(file = fopen(filename, MODE_READ))) - return NULL; - - buffer = checked_calloc(1); /* start with valid, but empty text buffer */ - - while (!feof(file) && num_lines < max_lines) - { - char line[MAX_LINE_LEN]; - - /* read next line of input file */ - if (!fgets(line, MAX_LINE_LEN, file)) - break; - - buffer = checked_realloc(buffer, strlen(buffer) + strlen(line) + 1); - - strcat(buffer, line); - - num_lines++; - } - - fclose(file); - - return buffer; -} - -#endif - -void DrawTextToTextArea_OLD(int x, int y, char *text, int font_nr, int line_length, - int area_xsize, int area_ysize, int mask_mode) -{ - int area_line = 0; - int font_height = getFontHeight(font_nr); - - if (text == NULL) - return; - - while (*text && area_line < area_ysize) - { - char buffer[MAX_OUTPUT_LINESIZE + 1]; - int i; - - for (i = 0; i < line_length && *text; i++) - if ((buffer[i] = *text++) == '\n') - break; - buffer[MIN(i, area_xsize)] = '\0'; - - DrawTextExt(drawto, x, y + area_line * font_height, buffer, font_nr, - mask_mode); - - area_line++; - } - - redraw_mask |= REDRAW_FIELD; -} - static boolean RenderLineToBuffer(char **src_buffer_ptr, char *dst_buffer, int *dst_buffer_len, int line_length, boolean last_line_was_empty) @@ -522,14 +372,14 @@ static boolean RenderLineToBuffer(char **src_buffer_ptr, char *dst_buffer, char *word_ptr; int word_len; - /* skip leading whitespaces */ + // skip leading whitespaces while (*text_ptr == ' ' || *text_ptr == '\t') text_ptr++; word_ptr = text_ptr; word_len = 0; - /* look for end of next word */ + // look for end of next word while (*word_ptr != ' ' && *word_ptr != '\t' && *word_ptr != '\0') { word_ptr++; @@ -540,18 +390,18 @@ static boolean RenderLineToBuffer(char **src_buffer_ptr, char *dst_buffer, { continue; } - else if (*text_ptr == '\n') /* special case: force empty line */ + else if (*text_ptr == '\n') // special case: force empty line { if (buffer_len == 0) text_ptr++; - /* prevent printing of multiple empty lines */ + // prevent printing of multiple empty lines if (buffer_len > 0 || !last_line_was_empty) buffer_filled = TRUE; } else if (word_len < line_length - buffer_len) { - /* word fits into text buffer -- add word */ + // word fits into text buffer -- add word if (buffer_len > 0) buffer[buffer_len++] = ' '; @@ -563,13 +413,13 @@ static boolean RenderLineToBuffer(char **src_buffer_ptr, char *dst_buffer, } else if (buffer_len > 0) { - /* not enough space left for word in text buffer -- print buffer */ + // not enough space left for word in text buffer -- print buffer buffer_filled = TRUE; } else { - /* word does not fit at all into empty text buffer -- cut word */ + // word does not fit at all into empty text buffer -- cut word strncpy(buffer, text_ptr, line_length); buffer[line_length] = '\0'; @@ -587,138 +437,6 @@ static boolean RenderLineToBuffer(char **src_buffer_ptr, char *dst_buffer, return buffer_filled; } -#if 0 -void DrawTextWrapped_OLD(int x, int y, char *text, int font_nr, int line_length, - int max_lines) -{ - char *text_ptr = text; - int current_line = 0; - int font_height = getFontHeight(font_nr); - - while (*text_ptr && current_line < max_lines) - { - char buffer[line_length + 1]; - int buffer_len = 0; - - buffer[0] = '\0'; - - RenderLineToBuffer(&text_ptr, buffer, &buffer_len, line_length, TRUE); - - DrawText(x, y + current_line * font_height, buffer, font_nr); - current_line++; - } -} -#endif - -#if 0 -int DrawTextFromFile_OLD(int x, int y, char *filename, int font_nr, - int line_length, int max_lines, boolean wrap_text) -{ - int font_height = getFontHeight(font_nr); - char line[MAX_LINE_LEN]; - char buffer[line_length + 1]; - int buffer_len; - int current_line = 0; - FILE *file; - - if (current_line >= max_lines) - return 0; - - if (filename == NULL) - return 0; - - if (!(file = fopen(filename, MODE_READ))) - return 0; - - buffer[0] = '\0'; - buffer_len = 0; - - while (!feof(file) && current_line < max_lines) - { - char *line_ptr; - boolean last_line_was_empty = TRUE; - - /* read next line of input file */ - if (!fgets(line, MAX_LINE_LEN, file)) - break; - - /* skip comments (lines directly beginning with '#') */ - if (line[0] == '#') - continue; - - /* cut trailing newline from input line */ - for (line_ptr = line; *line_ptr; line_ptr++) - { - if (*line_ptr == '\n' || *line_ptr == '\r') - { - *line_ptr = '\0'; - break; - } - } - - if (strlen(line) == 0) /* special case: force empty line */ - strcpy(line, "\n"); - - line_ptr = line; - - while (*line_ptr && current_line < max_lines) - { -#if 1 - boolean buffer_filled; - - if (wrap_text) - { - buffer_filled = RenderLineToBuffer(&line_ptr, buffer, &buffer_len, - line_length, last_line_was_empty); - } - else - { - if (strlen(line_ptr) <= line_length) - { - buffer_len = strlen(line_ptr); - strcpy(buffer, line_ptr); - } - else - { - buffer_len = line_length; - strncpy(buffer, line_ptr, line_length); - } - - buffer[buffer_len] = '\0'; - line_ptr += buffer_len; - - buffer_filled = TRUE; - } -#else - boolean buffer_filled = RenderLineToBuffer(&line_ptr, buffer, &buffer_len, - line_length, last_line_was_empty); -#endif - - if (buffer_filled) - { - DrawText(x, y + current_line * font_height, buffer, font_nr); - current_line++; - - last_line_was_empty = (buffer_len == 0); - - buffer[0] = '\0'; - buffer_len = 0; - } - } - } - - fclose(file); - - if (buffer_len > 0 && current_line < max_lines) - { - DrawText(x, y + current_line * font_height, buffer, font_nr); - current_line++; - } - - return current_line; -} -#endif - static boolean getCheckedTokenValueFromString(char *string, char **token, char **value) { @@ -727,14 +445,14 @@ static boolean getCheckedTokenValueFromString(char *string, char **token, if (!getTokenValueFromString(string, token, value)) return FALSE; - if (**token != '.') /* token should begin with dot */ + if (**token != '.') // token should begin with dot return FALSE; - for (ptr = *token; *ptr; ptr++) /* token should contain no whitespace */ + for (ptr = *token; *ptr; ptr++) // token should contain no whitespace if (*ptr == ' ' || *ptr == '\t') return FALSE; - for (ptr = *value; *ptr; ptr++) /* value should contain no whitespace */ + for (ptr = *value; *ptr; ptr++) // value should contain no whitespace if (*ptr == ' ' || *ptr == '\t') return FALSE; @@ -743,18 +461,17 @@ static boolean getCheckedTokenValueFromString(char *string, char **token, static void DrawTextBuffer_Flush(int x, int y, char *buffer, int font_nr, int line_length, int cut_length, - int line_spacing, int mask_mode, - boolean centered, int current_line) + int mask_mode, boolean centered, + int current_ypos) { int buffer_len = strlen(buffer); int font_width = getFontWidth(font_nr); - int font_height = getFontHeight(font_nr); int offset_chars = (centered ? (line_length - buffer_len) / 2 : 0); int offset_xsize = (centered ? font_width * (line_length - buffer_len) / 2 : 0); int final_cut_length = MAX(0, cut_length - offset_chars); int xx = x + offset_xsize; - int yy = y + current_line * (font_height + line_spacing); + int yy = y + current_ypos; buffer[final_cut_length] = '\0'; @@ -769,13 +486,13 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr, int line_spacing, int mask_mode, boolean autowrap, boolean centered, boolean parse_comments) { -#if 0 - int font_width = getFontWidth(font_nr); - int font_height = getFontHeight(font_nr); -#endif char buffer[line_length + 1]; int buffer_len; + int font_height = getFontHeight(font_nr); + int line_height = font_height + line_spacing; int current_line = 0; + int current_ypos = 0; + int max_ysize = max_lines * line_height; if (text_buffer == NULL || *text_buffer == '\0') return 0; @@ -789,42 +506,38 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr, buffer[0] = '\0'; buffer_len = 0; - while (*text_buffer && current_line < max_lines) + while (*text_buffer && current_ypos < max_ysize) { char line[MAX_LINE_LEN + 1]; char *line_ptr; boolean last_line_was_empty = TRUE; -#if 1 int num_line_chars = MAX_LINE_LEN; -#else - int num_line_chars = (autowrap ? MAX_LINE_LEN : line_length); -#endif int i; - /* copy next line from text buffer to line buffer (nearly fgets() style) */ + // copy next line from text buffer to line buffer (nearly fgets() style) for (i = 0; i < num_line_chars && *text_buffer; i++) if ((line[i] = *text_buffer++) == '\n') break; line[i] = '\0'; - /* prevent 'num_line_chars' sized lines to cause additional empty line */ + // prevent 'num_line_chars' sized lines to cause additional empty line if (i == num_line_chars && *text_buffer == '\n') text_buffer++; - /* skip comments (lines directly beginning with '#') */ + // skip comments (lines directly beginning with '#') if (line[0] == '#' && parse_comments) { char *token, *value; - /* try to read generic token/value pair definition after comment sign */ + // try to read generic token/value pair definition after comment sign if (getCheckedTokenValueFromString(line + 1, &token, &value)) { - /* if found, flush the current buffer, if non-empty */ - if (buffer_len > 0 && current_line < max_lines) + // if found, flush the current buffer, if non-empty + if (buffer_len > 0 && current_ypos < max_ysize) { DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length, - line_spacing, mask_mode, centered, current_line); - + mask_mode, centered, current_ypos); + current_ypos += line_height; current_line++; buffer[0] = '\0'; @@ -839,12 +552,16 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr, centered = get_boolean_from_string(value); else if (strEqual(token, ".parse_comments")) parse_comments = get_boolean_from_string(value); + + // if font has changed, depending values need to be updated as well + font_height = getFontHeight(font_nr); + line_height = font_height + line_spacing; } continue; } - /* cut trailing newline and carriage return from input line */ + // cut trailing newline and carriage return from input line for (line_ptr = line; *line_ptr; line_ptr++) { if (*line_ptr == '\n' || *line_ptr == '\r') @@ -854,12 +571,12 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr, } } - if (strlen(line) == 0) /* special case: force empty line */ + if (strlen(line) == 0) // special case: force empty line strcpy(line, "\n"); line_ptr = line; - while (*line_ptr && current_line < max_lines) + while (*line_ptr && current_ypos < max_ysize) { boolean buffer_filled; @@ -889,25 +606,9 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr, if (buffer_filled) { -#if 1 DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length, - line_spacing, mask_mode, centered, current_line); -#else - int offset_chars = (centered ? (line_length - buffer_len) / 2 : 0); - int offset_xsize = - (centered ? font_width * (line_length - buffer_len) / 2 : 0); - int final_cut_length = MAX(0, cut_length - offset_chars); - int xx = x + offset_xsize; - - buffer[final_cut_length] = '\0'; - - if (mask_mode != -1) - DrawTextExt(drawto, xx, y + current_line * font_height, buffer, - font_nr, mask_mode); - else - DrawText(xx, y + current_line * font_height, buffer, font_nr); -#endif - + mask_mode, centered, current_ypos); + current_ypos += line_height; current_line++; last_line_was_empty = (buffer_len == 0); @@ -918,27 +619,11 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr, } } - if (buffer_len > 0 && current_line < max_lines) + if (buffer_len > 0 && current_ypos < max_ysize) { -#if 1 DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length, - line_spacing, mask_mode, centered, current_line); -#else - int offset_chars = (centered ? (line_length - buffer_len) / 2 : 0); - int offset_xsize = - (centered ? font_width * (line_length - buffer_len) / 2 : 0); - int final_cut_length = MAX(0, cut_length - offset_chars); - int xx = x + offset_xsize; - - buffer[final_cut_length] = '\0'; - - if (mask_mode != -1) - DrawTextExt(drawto, xx, y + current_line * font_height, buffer, - font_nr, mask_mode); - else - DrawText(xx, y + current_line * font_height, buffer, font_nr); -#endif - + mask_mode, centered, current_ypos); + current_ypos += line_height; current_line++; } @@ -977,19 +662,3 @@ int DrawTextFile(int x, int y, char *filename, int font_nr, return num_lines_printed; } - -#if 0 -void DrawTextWrapped(int x, int y, char *text, int font_nr, int line_length, - int max_lines) -{ - DrawTextBuffer(x, y, text, font_nr, line_length, -1, max_lines, -1, TRUE, - FALSE, FALSE); -} - -void DrawTextToTextArea(int x, int y, char *text, int font_nr, int line_length, - int cut_length, int max_lines, int mask_mode) -{ - DrawTextBuffer(x, y, text, font_nr, line_length, cut_length, max_lines, - mask_mode, FALSE, FALSE, FALSE); -} -#endif