rnd-20061230-1-src

[rocksndiamonds.git] / src / libgame / text.c

diff --git a/src/libgame/text.c b/src/libgame/text.c
index 01689a73a5e85f9cef2a424f00157076185a0c18..83be1dfc0213e972569fa708731c121dd8458bbb 100644 (file)
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -156,12 +156,12 @@ int getTextWidth(char *text, int font_nr)
   return (text != NULL ? strlen(text) * getFontWidth(font_nr) : 0);
 }
 
-static char getFontCharPosition(int font_nr, char c)
+static int getFontCharPosition(int font_nr, char c)
 {
   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 = c - 32;
+  int font_pos = (unsigned char)c - 32;
 
   /* map some special characters to their ascii values in default font */
   if (default_font)
@@ -309,7 +309,7 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
     char c = *text_ptr++;
 
     if (c == '\n')
-      c = ' ';         /* print space instaed of newline */
+      c = ' ';         /* print space instead of newline */
 
     getFontCharSource(font_nr, c, &src_bitmap, &src_x, &src_y);
 
@@ -523,7 +523,7 @@ void DrawTextWrapped(int x, int y, char *text, int font_nr, int line_length,
 }
 
 int DrawTextFromFile(int x, int y, char *filename, int font_nr,
-                    int line_length, int max_lines)
+                    int line_length, int max_lines, boolean rewrap)
 {
   int font_height = getFontHeight(font_nr);
   char line[MAX_LINE_LEN];
@@ -574,10 +574,41 @@ int DrawTextFromFile(int x, int y, char *filename, int font_nr,
 
     while (*line_ptr && current_line < max_lines)
     {
+#if 1
+      boolean buffer_filled;
+
+      if (rewrap)
+      {
+       buffer_filled = RenderLineToBuffer(&line_ptr,
+                                          buffer, &buffer_len,
+                                          last_line_was_empty,
+                                          line_length);
+      }
+      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,
                                                 last_line_was_empty,
                                                 line_length);
+#endif
+
       if (buffer_filled)
       {
        DrawText(x, y + current_line * font_height, buffer, font_nr);