X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftext.c;h=9b9ad87f36f0d7a0b9f4b672d41301268240b000;hb=c967ac4c854235ebc51d164a305bfdc46dccf476;hp=ce855daf9604496ddc89287ae8cade95676f37b7;hpb=797ebac91e028bed534bf424cb04eb8aec401fba;p=rocksndiamonds.git

diff --git a/src/libgame/text.c b/src/libgame/text.c
index ce855daf..9b9ad87f 100644
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -16,18 +16,37 @@
 #include "misc.h"
 
 
+// ============================================================================
+// static font variables
+// ============================================================================
+
+boolean text_drawing_enabled = TRUE;
+
+
 // ============================================================================
 // font functions
 // ============================================================================
 
+void EnableDrawingText(void)
+{
+  text_drawing_enabled = TRUE;
+}
+
+void DisableDrawingText(void)
+{
+  text_drawing_enabled = FALSE;
+}
+
 void InitFontInfo(struct FontBitmapInfo *font_bitmap_info, int num_fonts,
 		  int (*select_font_function)(int),
-		  int (*get_font_from_token_function)(char *))
+		  int (*get_font_from_token_function)(char *),
+		  char * (*get_token_from_font_function)(int))
 {
   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;
+  gfx.get_token_from_font_function = get_token_from_font_function;
 }
 
 void FreeFontInfo(struct FontBitmapInfo *font_bitmap_info)
@@ -142,6 +161,9 @@ static void DrawInitTextExt(char *text, int ypos, int font_nr, boolean update)
 
   UPDATE_BUSY_STATE();
 
+  if (!text_drawing_enabled)
+    return;
+
   if (window != NULL &&
       gfx.draw_init_text &&
       gfx.num_fonts > 0 &&
@@ -254,6 +276,14 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
   int src_x, src_y;
   char *text_ptr = text;
 
+  if (!text_drawing_enabled)
+    return;
+
+#if DEBUG
+  Debug("font:token", "'%s' / '%s'",
+        gfx.get_token_from_font_function(font_nr), text);
+#endif
+
   if (font->bitmap == NULL)
     return;
 
@@ -404,6 +434,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++;
@@ -491,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;
@@ -513,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,
@@ -521,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;
@@ -576,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++;
 
@@ -647,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++;
 
@@ -662,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++;
   }