X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Ftext.c;h=36cb6dd5a90bf61e89fe9bcd2b907fb414120d25;hp=28f88c56019fe51dd4c6a1d711483a8493bf05c9;hb=3ff2e8a0b5c27b99a9920bdf5ed82bc41bf40181;hpb=da14f69fd95c7bd5a0d70cdf4935af06f1f20a04

diff --git a/src/libgame/text.c b/src/libgame/text.c
index 28f88c56..36cb6dd5 100644
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -1,156 +1,661 @@
-/***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
-*----------------------------------------------------------*
-*  (c) 1995-98 Artsoft Entertainment                       *
-*              Holger Schemel                              *
-*              Oststrasse 11a                              *
-*              33604 Bielefeld                             *
-*              phone: ++49 +521 290471                     *
-*              email: aeglos@valinor.owl.de                *
-*----------------------------------------------------------*
-*  text.c                                                  *
-***********************************************************/
+// ============================================================================
+// Artsoft Retro-Game Library
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//     		    Holger Schemel
+//		    info@artsoft.org
+//		    http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// text.c
+// ============================================================================
 
+#include <stdio.h>
 #include <stdarg.h>
 
-#include "libgame.h"
+#include "text.h"
+#include "misc.h"
 
-#include "main_TMP.h"
 
-int getFontWidth(int font_size, int font_type)
+/* ========================================================================= */
+/* font functions                                                            */
+/* ========================================================================= */
+
+void InitFontInfo(struct FontBitmapInfo *font_bitmap_info, int num_fonts,
+		  int (*select_font_function)(int),
+		  int (*get_font_from_token_function)(char *))
+{
+  gfx.num_fonts = num_fonts;
+  gfx.font_bitmap_info = font_bitmap_info;
+  gfx.select_font_function = select_font_function;
+  gfx.get_font_from_token_function = get_font_from_token_function;
+}
+
+void FreeFontInfo(struct FontBitmapInfo *font_bitmap_info)
+{
+  if (font_bitmap_info == NULL)
+    return;
+
+  free(font_bitmap_info);
+}
+
+struct FontBitmapInfo *getFontBitmapInfo(int font_nr)
+{
+  int font_bitmap_id = gfx.select_font_function(font_nr);
+
+  return &gfx.font_bitmap_info[font_bitmap_id];
+}
+
+int getFontWidth(int font_nr)
+{
+  int font_bitmap_id = gfx.select_font_function(font_nr);
+
+  return gfx.font_bitmap_info[font_bitmap_id].width;
+}
+
+int getFontHeight(int font_nr)
 {
-  return (font_size == FS_BIG ? FONT1_XSIZE :
-	  font_size == FS_MEDIUM ? FONT6_XSIZE :
-	  font_type == FC_SPECIAL1 ? FONT3_XSIZE :
-	  font_type == FC_SPECIAL2 ? FONT4_XSIZE :
-	  font_type == FC_SPECIAL3 ? FONT5_XSIZE :
-	  FONT2_XSIZE);
+  int font_bitmap_id = gfx.select_font_function(font_nr);
+
+  return gfx.font_bitmap_info[font_bitmap_id].height;
 }
 
-int getFontHeight(int font_size, int font_type)
+int getTextWidth(char *text, int font_nr)
 {
-  return (font_size == FS_BIG ? FONT1_YSIZE :
-	  font_size == FS_MEDIUM ? FONT6_YSIZE :
-	  font_type == FC_SPECIAL1 ? FONT3_YSIZE :
-	  font_type == FC_SPECIAL2 ? FONT4_YSIZE :
-	  font_type == FC_SPECIAL3 ? FONT5_YSIZE :
-	  FONT2_YSIZE);
+  return (text != NULL ? strlen(text) * getFontWidth(font_nr) : 0);
 }
 
-void DrawInitText(char *text, int ypos, int color)
+static int getFontCharPosition(int font_nr, char c)
 {
-  if (window && pix[PIX_SMALLFONT])
+  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)
+    font_pos = MAP_FONT_ASCII(c) - 32;
+
+  /* this allows dynamic special characters together with special font */
+  if (font_pos < 0 || font_pos >= font->num_chars)
+    font_pos = 0;
+
+  return font_pos;
+}
+
+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);
+
+  *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;
+}
+
+
+/* ========================================================================= */
+/* text string helper functions                                              */
+/* ========================================================================= */
+
+int maxWordLengthInString(char *text)
+{
+  char *text_ptr;
+  int word_len = 0, max_word_len = 0;
+
+  for (text_ptr = text; *text_ptr; text_ptr++)
   {
-    ClearRectangle(window, 0, ypos, WIN_XSIZE, FONT2_YSIZE);
-    DrawTextExt(window, gc, (WIN_XSIZE - strlen(text) * FONT2_XSIZE)/2,
-		ypos, text, FS_SMALL, color);
-    FlushDisplay();
+    word_len = (*text_ptr != ' ' ? word_len + 1 : 0);
+
+    max_word_len = MAX(word_len, max_word_len);
   }
+
+  return max_word_len;
+}
+
+
+/* ========================================================================= */
+/* simple text drawing functions                                             */
+/* ========================================================================= */
+
+void DrawInitTextExt(char *text, int ypos, int font_nr, boolean force)
+{
+  LimitScreenUpdates(TRUE);
+
+  UPDATE_BUSY_STATE();
+
+  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);
+
+    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, 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 DrawTextFCentered(int y, int font_type, char *format, ...)
+void DrawTextF(int x, int y, int font_nr, char *format, ...)
 {
-  char buffer[FULL_SXSIZE / FONT5_XSIZE + 10];
-  int font_width = getFontWidth(FS_SMALL, font_type);
+  char buffer[MAX_OUTPUT_LINESIZE + 1];
   va_list ap;
 
   va_start(ap, format);
   vsprintf(buffer, format, ap);
   va_end(ap);
 
-  DrawText(SX + (SXSIZE - strlen(buffer) * font_width) / 2, SY + y,
-	   buffer, FS_SMALL, font_type);
+  if (strlen(buffer) > MAX_OUTPUT_LINESIZE)
+    Error(ERR_EXIT, "string too long in DrawTextF() -- aborting");
+
+  DrawText(gfx.sx + x, gfx.sy + y, buffer, font_nr);
 }
 
-void DrawTextF(int x, int y, int font_type, char *format, ...)
+void DrawTextFCentered(int y, int font_nr, char *format, ...)
 {
-  char buffer[FULL_SXSIZE / FONT5_XSIZE + 10];
+  char buffer[MAX_OUTPUT_LINESIZE + 1];
   va_list ap;
 
   va_start(ap, format);
   vsprintf(buffer, format, ap);
   va_end(ap);
 
-  DrawText(SX + x, SY + y, buffer, FS_SMALL, font_type);
+  if (strlen(buffer) > MAX_OUTPUT_LINESIZE)
+    Error(ERR_EXIT, "string too long in DrawTextFCentered() -- aborting");
+
+  DrawText(gfx.sx + (gfx.sxsize - getTextWidth(buffer, font_nr)) / 2,
+	   gfx.sy + y, buffer, font_nr);
+}
+
+void DrawTextS(int x, int y, int font_nr, char *text)
+{
+  DrawText(gfx.sx + x, gfx.sy + y, text, font_nr);
+}
+
+void DrawTextSCentered(int y, int font_nr, char *text)
+{
+  DrawText(gfx.sx + (gfx.sxsize - getTextWidth(text, font_nr)) / 2,
+	   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);
 }
 
-void DrawText(int x, int y, char *text, int font_size, int font_type)
+void DrawTextAligned(int x, int y, char *text, int font_nr, int align)
 {
-  DrawTextExt(drawto, gc, x, y, text, font_size, font_type);
+  DrawText(ALIGNED_XPOS(x, getTextWidth(text, font_nr), align),
+	   y, text, font_nr);
+}
+
+void DrawText(int x, int y, char *text, int font_nr)
+{
+  int mask_mode = BLIT_OPAQUE;
+
+  if (DrawingOnBackground(x, y))
+    mask_mode = BLIT_ON_BACKGROUND;
+
+  DrawTextExt(drawto, x, y, text, font_nr, mask_mode);
 
-  if (x < DX)
+  if (IN_GFX_FIELD_FULL(x, y))
     redraw_mask |= REDRAW_FIELD;
-  else if (y < VY)
+  else if (IN_GFX_DOOR_1(x, y))
     redraw_mask |= REDRAW_DOOR_1;
+  else if (IN_GFX_DOOR_2(x, y))
+    redraw_mask |= REDRAW_DOOR_2;
+  else if (IN_GFX_DOOR_3(x, y))
+    redraw_mask |= REDRAW_DOOR_3;
+  else
+    redraw_mask |= REDRAW_ALL;
 }
 
-void DrawTextExt(DrawBuffer d, GC gc, int x, int y,
-		 char *text, int font_size, int font_type)
+void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
+		 int font_nr, int mask_mode)
 {
-  int font_width, font_height, font_start;
-  int font_bitmap;
-  boolean print_inverse = FALSE;
+  struct FontBitmapInfo *font = getFontBitmapInfo(font_nr);
+  int font_width = getFontWidth(font_nr);
+  int font_height = getFontHeight(font_nr);
+  Bitmap *src_bitmap;
+  int src_x, src_y;
+  char *text_ptr = text;
+
+  if (font->bitmap == NULL)
+    return;
+
+  /* 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 */
+  dst_x += font->draw_xoffset;
+  dst_y += font->draw_yoffset;
+
+  while (*text_ptr)
+  {
+    char c = *text_ptr++;
+
+    if (c == '\n')
+      c = ' ';		/* print space instead of newline */
 
-  if (font_size != FS_SMALL && font_size != FS_BIG && font_size != FS_MEDIUM)
-    font_size = FS_SMALL;
-  if (font_type < FC_RED || font_type > FC_SPECIAL3)
-    font_type = FC_RED;
+    getFontCharSource(font_nr, c, &src_bitmap, &src_x, &src_y);
+
+    /* clip text at the left side of the window */
+    if (dst_x < 0)
+    {
+      dst_x += font_width;
+
+      continue;
+    }
+
+    /* clip text at the right side of the window */
+    if (dst_x + font_width > video.width)
+      break;
+
+    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 */
+      {
+	Bitmap *cursor_bitmap;
+	int cursor_x, cursor_y;
+
+	getFontCharSource(font_nr, FONT_ASCII_CURSOR, &cursor_bitmap,
+			  &cursor_x, &cursor_y);
+
+	BlitBitmap(cursor_bitmap, dst_bitmap, cursor_x, cursor_y,
+		   font_width, font_height, dst_x, dst_y);
+      }
+
+      /* second step: draw masked inverted character */
+      SDLCopyInverseMasked(src_bitmap, dst_bitmap, src_x, src_y,
+			   font_width, font_height, dst_x, dst_y);
+    }
+    else if (mask_mode == BLIT_MASKED || mask_mode == BLIT_ON_BACKGROUND)
+    {
+      if (mask_mode == BLIT_ON_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 */
+    {
+      BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y,
+		 font_width, font_height, dst_x, dst_y);
+    }
+
+    dst_x += font_width;
+  }
+}
 
-  font_width = getFontWidth(font_size, font_type);
-  font_height = getFontHeight(font_size, font_type);
 
-  font_bitmap = (font_size == FS_BIG ? PIX_BIGFONT :
-		 font_size == FS_MEDIUM ? PIX_MEDIUMFONT :
-		 PIX_SMALLFONT);
-  font_start = (font_type * (font_size == FS_BIG ? FONT1_YSIZE :
-			     font_size == FS_MEDIUM ? FONT6_YSIZE :
-			     FONT2_YSIZE) *
-		FONT_LINES_PER_FONT);
+/* ========================================================================= */
+/* text buffer drawing functions                                             */
+/* ========================================================================= */
 
-  if (font_type == FC_SPECIAL3)
-    font_start += (FONT4_YSIZE - FONT2_YSIZE) * FONT_LINES_PER_FONT;
+#define MAX_LINES_FROM_FILE		1024
 
-  while (*text)
+char *GetTextBufferFromFile(char *filename, int max_lines)
+{
+  File *file;
+  char *buffer;
+  int num_lines = 0;
+
+  if (filename == NULL)
+    return NULL;
+
+  if (!(file = openFile(filename, MODE_READ)))
+    return NULL;
+
+  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 */
+    if (!getStringFromFile(file, line, MAX_LINE_LEN))
+      break;
+
+    buffer = checked_realloc(buffer, strlen(buffer) + strlen(line) + 1);
+
+    strcat(buffer, line);
+
+    num_lines++;
+  }
+
+  closeFile(file);
+
+  return buffer;
+}
+
+static boolean RenderLineToBuffer(char **src_buffer_ptr, char *dst_buffer,
+				  int *dst_buffer_len, int line_length,
+				  boolean last_line_was_empty)
+{
+  char *text_ptr = *src_buffer_ptr;
+  char *buffer = dst_buffer;
+  int buffer_len = *dst_buffer_len;
+  boolean buffer_filled = FALSE;
+
+  while (*text_ptr)
   {
-    char c = *text++;
+    char *word_ptr;
+    int word_len;
 
-    if (c == '~' && font_size == FS_SMALL)
+    /* skip leading whitespaces */
+    while (*text_ptr == ' ' || *text_ptr == '\t')
+      text_ptr++;
+
+    word_ptr = text_ptr;
+    word_len = 0;
+
+    /* look for end of next word */
+    while (*word_ptr != ' ' && *word_ptr != '\t' && *word_ptr != '\0')
+    {
+      word_ptr++;
+      word_len++;
+    }
+
+    if (word_len == 0)
     {
-      print_inverse = TRUE;
       continue;
     }
+    else if (*text_ptr == '\n')		/* special case: force empty line */
+    {
+      if (buffer_len == 0)
+	text_ptr++;
+
+      /* 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 */
 
-    if (c >= 'a' && c <= 'z')
-      c = 'A' + (c - 'a');
-    else if (c == 'ä' || c == 'Ä')
-      c = 91;
-    else if (c == 'ö' || c == 'Ö')
-      c = 92;
-    else if (c == 'ü' || c == 'Ü')
-      c = 93;
+      if (buffer_len > 0)
+	buffer[buffer_len++] = ' ';
 
-    if (c >= 32 && c <= 95)
+      strncpy(&buffer[buffer_len], text_ptr, word_len);
+      buffer_len += word_len;
+      buffer[buffer_len] = '\0';
+      text_ptr += word_len;
+    }
+    else if (buffer_len > 0)
+    {
+      /* not enough space left for word in text buffer -- print buffer */
+
+      buffer_filled = TRUE;
+    }
+    else
     {
-      int src_x = ((c - 32) % FONT_CHARS_PER_LINE) * font_width;
-      int src_y = ((c - 32) / FONT_CHARS_PER_LINE) * font_height + font_start;
-      int dest_x = x, dest_y = y;
+      /* word does not fit at all into empty text buffer -- cut word */
+
+      strncpy(buffer, text_ptr, line_length);
+      buffer[line_length] = '\0';
+      text_ptr += line_length;
+      buffer_filled = TRUE;
+    }
+
+    if (buffer_filled)
+      break;
+  }
+
+  *src_buffer_ptr = text_ptr;
+  *dst_buffer_len = buffer_len;
+
+  return buffer_filled;
+}
+
+static boolean getCheckedTokenValueFromString(char *string, char **token,
+					      char **value)
+{
+  char *ptr;
 
-      if (print_inverse)
+  if (!getTokenValueFromString(string, token, value))
+    return FALSE;
+
+  if (**token != '.')			/* token should begin with dot */
+    return FALSE;
+
+  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 */
+    if (*ptr == ' ' || *ptr == '\t')
+      return FALSE;
+
+  return TRUE;
+}
+
+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 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);
+
+  buffer[final_cut_length] = '\0';
+
+  if (mask_mode != -1)
+    DrawTextExt(drawto, xx, yy, buffer, font_nr, mask_mode);
+  else
+    DrawText(xx, yy, buffer, font_nr);
+}
+
+int DrawTextBuffer(int x, int y, char *text_buffer, int 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 current_line = 0;
+
+  if (text_buffer == NULL || *text_buffer == '\0')
+    return 0;
+
+  if (current_line >= max_lines)
+    return 0;
+
+  if (cut_length == -1)
+    cut_length = line_length;
+
+  buffer[0] = '\0';
+  buffer_len = 0;
+
+  while (*text_buffer && current_line < max_lines)
+  {
+    char line[MAX_LINE_LEN + 1];
+    char *line_ptr;
+    boolean last_line_was_empty = TRUE;
+    int num_line_chars = MAX_LINE_LEN;
+    int i;
+
+    /* 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 */
+    if (i == num_line_chars && *text_buffer == '\n')
+      text_buffer++;
+
+    /* 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 */
+      if (getCheckedTokenValueFromString(line + 1, &token, &value))
+      {
+	/* if found, flush the current buffer, if non-empty */
+	if (buffer_len > 0 && current_line < max_lines)
+	{
+	  DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length,
+			       line_spacing, mask_mode, centered, current_line);
+
+	  current_line++;
+
+	  buffer[0] = '\0';
+	  buffer_len = 0;
+	}
+
+	if (strEqual(token, ".font"))
+	  font_nr = gfx.get_font_from_token_function(value);
+	else if (strEqual(token, ".autowrap"))
+	  autowrap = get_boolean_from_string(value);
+	else if (strEqual(token, ".centered"))
+	  centered = get_boolean_from_string(value);
+	else if (strEqual(token, ".parse_comments"))
+	  parse_comments = get_boolean_from_string(value);
+      }
+
+      continue;
+    }
+
+    /* cut trailing newline and carriage return 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)
+    {
+      boolean buffer_filled;
+
+      if (autowrap)
       {
-	BlitBitmap(pix[font_bitmap], d,
-		   FONT_CHARS_PER_LINE * font_width,
-		   3 * font_height + font_start,
-		   font_width, font_height, x, y);
-
-	SetClipOrigin(clip_gc[font_bitmap], dest_x - src_x, dest_y - src_y);
-	BlitBitmapMasked(pix_masked[font_bitmap], d,
-			 0, 0, font_width, font_height, dest_x, dest_y);
+	buffer_filled = RenderLineToBuffer(&line_ptr, buffer, &buffer_len,
+					   line_length, last_line_was_empty);
       }
       else
-	BlitBitmap(pix[font_bitmap], d,
-		   src_x, src_y, font_width, font_height, dest_x, dest_y);
+      {
+	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;
+      }
+
+      if (buffer_filled)
+      {
+	DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length,
+			     line_spacing, mask_mode, centered, current_line);
+	current_line++;
+
+	last_line_was_empty = (buffer_len == 0);
+
+	buffer[0] = '\0';
+	buffer_len = 0;
+      }
     }
+  }
 
-    x += font_width;
+  if (buffer_len > 0 && current_line < max_lines)
+  {
+    DrawTextBuffer_Flush(x, y, buffer, font_nr, line_length, cut_length,
+			 line_spacing, mask_mode, centered, current_line);
+    current_line++;
   }
+
+  return current_line;
+}
+
+int DrawTextBufferVA(int x, int y, char *format, va_list ap, int 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 text_buffer[MAX_OUTPUT_LINESIZE];
+  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");
+
+  int num_lines_printed = DrawTextBuffer(x, y, text_buffer, font_nr,
+					 line_length, cut_length, max_lines,
+					 line_spacing, mask_mode, autowrap,
+					 centered, parse_comments);
+  return num_lines_printed;
+}
+
+int DrawTextFile(int x, int y, char *filename, int 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 *text_buffer = GetTextBufferFromFile(filename, MAX_LINES_FROM_FILE);
+  int num_lines_printed = DrawTextBuffer(x, y, text_buffer, font_nr,
+					 line_length, cut_length, max_lines,
+					 line_spacing, mask_mode, autowrap,
+					 centered, parse_comments);
+  checked_free(text_buffer);
+
+  return num_lines_printed;
 }