{
int font_bitmap_id = gfx.select_font_function(font_nr);
struct FontBitmapInfo *font = &gfx.font_bitmap_info[font_bitmap_id];
- 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
- if (default_font)
+ if (font->num_chars == DEFAULT_NUM_CHARS_PER_FONT)
font_pos = MAP_FONT_ASCII(c) - 32;
+ else if (font->num_chars == NUM_CHARS_PER_FONT_EXT)
+ font_pos = MAP_FONT_ASCII_EXT(c) - 32;
// this allows dynamic special characters together with special font
if (font_pos < 0 || font_pos >= font->num_chars)
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;
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,
{
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;
// 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++;
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++;
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++;
}