From c967ac4c854235ebc51d164a305bfdc46dccf476 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Sun, 7 May 2023 00:15:31 +0200 Subject: [PATCH] fixed centering text from files (like credits) using different font width --- src/libgame/text.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/libgame/text.c b/src/libgame/text.c index 84996db2..9b9ad87f 100644 --- a/src/libgame/text.c +++ b/src/libgame/text.c @@ -524,16 +524,18 @@ static boolean getCheckedTokenValueFromString(char *string, char **token, return TRUE; } -static void DrawTextBuffer_Flush(int x, int y, char *buffer, int font_nr, - int line_length, int cut_length, +static void DrawTextBuffer_Flush(int x, int y, char *buffer, int base_font_nr, + int font_nr, int line_length, int cut_length, int mask_mode, boolean centered, int current_ypos) { int buffer_len = strlen(buffer); + int base_font_width = getFontWidth(base_font_nr); int font_width = getFontWidth(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 line_width = base_font_width * line_length; + int buffer_width = font_width * buffer_len; + int offset_xsize = (centered ? (line_width - buffer_width) / 2 : 0); int final_cut_length = MAX(0, cut_length - offset_chars); int xx = x + offset_xsize; int yy = y + current_ypos; @@ -546,7 +548,7 @@ static void DrawTextBuffer_Flush(int x, int y, char *buffer, int font_nr, DrawText(xx, yy, buffer, font_nr); } -static int DrawTextBufferExt(int x, int y, char *text_buffer, int font_nr, +static int DrawTextBufferExt(int x, int y, char *text_buffer, int base_font_nr, int line_length, int cut_length, int max_lines, int line_spacing, int mask_mode, boolean autowrap, boolean centered, boolean parse_comments, @@ -554,6 +556,7 @@ static int DrawTextBufferExt(int x, int y, char *text_buffer, int font_nr, { char buffer[line_length + 1]; int buffer_len; + int font_nr = base_font_nr; int font_height = getFontHeight(font_nr); int line_height = font_height + line_spacing; int current_line = 0; @@ -609,8 +612,8 @@ static int DrawTextBufferExt(int x, int y, char *text_buffer, int font_nr, // 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, - mask_mode, centered, current_ypos); + DrawTextBuffer_Flush(x, y, buffer, base_font_nr, font_nr, line_length, + cut_length, mask_mode, centered, current_ypos); current_ypos += line_height; current_line++; @@ -680,8 +683,8 @@ static int DrawTextBufferExt(int x, int y, char *text_buffer, int font_nr, if (buffer_filled) { - DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length, - mask_mode, centered, current_ypos); + DrawTextBuffer_Flush(x, y, buffer, base_font_nr, font_nr, line_length, + cut_length, mask_mode, centered, current_ypos); current_ypos += line_height; current_line++; @@ -695,8 +698,8 @@ static int DrawTextBufferExt(int x, int y, char *text_buffer, int font_nr, if (buffer_len > 0 && current_ypos < max_ysize) { - DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length, - mask_mode, centered, current_ypos); + DrawTextBuffer_Flush(x, y, buffer, base_font_nr, font_nr, line_length, + cut_length, mask_mode, centered, current_ypos); current_ypos += line_height; current_line++; } -- 2.34.1