X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftext.c;h=4de7319a7e131a6bf4a996cac727f5caaa506e40;hb=28d0092120f3b0038bf15b4c19f494219851599f;hp=e198c81033421dfd6dadf55b95083a8b7ce7c42f;hpb=e567cb7fd1d4e5b41778326253f736f6f30f14c5;p=rocksndiamonds.git

diff --git a/src/libgame/text.c b/src/libgame/text.c
index e198c810..4de7319a 100644
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -223,12 +223,6 @@ void DrawTextSAligned(int x, int y, char *text, int font_nr, int align)
 	   gfx.sy + y, text, font_nr);
 }
 
-void DrawTextAligned(int x, int y, char *text, int font_nr, int align)
-{
-  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;
@@ -357,11 +351,24 @@ char *GetTextBufferFromFile(char *filename, int max_lines)
   while (!checkEndOfFile(file) && num_lines < max_lines)
   {
     char line[MAX_LINE_LEN];
+    char *line_ptr;
+    int line_len;
 
     // read next line of input file
     if (!getStringFromFile(file, line, MAX_LINE_LEN))
       break;
 
+    line_len = strlen(line);
+
+    // cut trailing line break (this can be newline and/or carriage return)
+    for (line_ptr = &line[line_len]; line_ptr >= line; line_ptr--)
+      if ((*line_ptr == '\n' || *line_ptr == '\r') && *(line_ptr + 1) == '\0')
+	*line_ptr = '\0';
+
+    // re-add newline (so the result is terminated by newline, but not CR/LF)
+    if (strlen(line) != line_len)
+      strcat(line, "\n");
+
     buffer = checked_realloc(buffer, strlen(buffer) + strlen(line) + 1);
 
     strcat(buffer, line);
@@ -397,6 +404,9 @@ static boolean RenderLineToBuffer(char **src_buffer_ptr, char *dst_buffer,
     char *word_ptr;
     int word_len;
 
+    if (strEqual(text_ptr, "  "))	// special case: force line break
+      buffer_filled = TRUE;
+
     // skip leading whitespaces
     while (*text_ptr == ' ' || *text_ptr == '\t')
       text_ptr++;