X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Ftext.c;h=02a23c3d43b02a053ffabf7fced633d441531de4;hp=e7765fc68282ee2582894df215a379548ececc2c;hb=6229b51a03a4113fa799587e0f58fcea0f634d41;hpb=3f5f1e9af1b0c10a0b0486c579c55c5e6947807d

diff --git a/src/libgame/text.c b/src/libgame/text.c
index e7765fc6..02a23c3d 100644
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -16,9 +16,9 @@
 #include "misc.h"
 
 
-/* ========================================================================= */
-/* font functions                                                            */
-/* ========================================================================= */
+// ============================================================================
+// font functions
+// ============================================================================
 
 void InitFontInfo(struct FontBitmapInfo *font_bitmap_info, int num_fonts,
 		  int (*select_font_function)(int),
@@ -85,11 +85,11 @@ static int getFontCharPosition(int font_nr, char c)
   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 */
+  // 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 */
+  // this allows dynamic special characters together with special font
   if (font_pos < 0 || font_pos >= font->num_chars)
     font_pos = 0;
 
@@ -101,25 +101,29 @@ 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);
+  int offset_x = (font->offset_x != 0 ? font->offset_x : font->width);
+  int offset_y = (font->offset_y != 0 ? font->offset_y : font->height);
 
   *bitmap = font->bitmap;
-  *x = font->src_x + (font_pos % font->num_chars_per_line) * font->offset_x;
-  *y = font->src_y + (font_pos / font->num_chars_per_line) * font->offset_y;
+  *x = font->src_x + (font_pos % font->num_chars_per_line) * offset_x;
+  *y = font->src_y + (font_pos / font->num_chars_per_line) * offset_y;
 }
 
 
-/* ========================================================================= */
-/* text string helper functions                                              */
-/* ========================================================================= */
+// ============================================================================
+// text string helper functions
+// ============================================================================
 
-int maxWordLengthInString(char *text)
+int maxWordLengthInRequestString(char *text)
 {
   char *text_ptr;
   int word_len = 0, max_word_len = 0;
 
   for (text_ptr = text; *text_ptr; text_ptr++)
   {
-    word_len = (*text_ptr != ' ' ? word_len + 1 : 0);
+    word_len = (*text_ptr != ' ' &&
+		*text_ptr != '?' &&
+		*text_ptr != '!' ? word_len + 1 : 0);
 
     max_word_len = MAX(word_len, max_word_len);
   }
@@ -128,9 +132,9 @@ int maxWordLengthInString(char *text)
 }
 
 
-/* ========================================================================= */
-/* simple text drawing functions                                             */
-/* ========================================================================= */
+// ============================================================================
+// simple text drawing functions
+// ============================================================================
 
 void DrawInitText(char *text, int ypos, int font_nr)
 {
@@ -200,7 +204,7 @@ void DrawTextSCentered(int y, int font_nr, char *text)
 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);
+	   gfx.sy + y, text, font_nr);
 }
 
 void DrawTextAligned(int x, int y, char *text, int font_nr, int align)
@@ -243,11 +247,11 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
   if (font->bitmap == NULL)
     return;
 
-  /* skip text to be printed outside the window (left/right will be clipped) */
+  // 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 */
+  // add offset for drawing font characters
   dst_x += font->draw_xoffset;
   dst_y += font->draw_yoffset;
 
@@ -256,11 +260,11 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
     char c = *text_ptr++;
 
     if (c == '\n')
-      c = ' ';		/* print space instead of newline */
+      c = ' ';		// print space instead of newline
 
     getFontCharSource(font_nr, c, &src_bitmap, &src_x, &src_y);
 
-    /* clip text at the left side of the window */
+    // clip text at the left side of the window
     if (dst_x < 0)
     {
       dst_x += font_width;
@@ -268,14 +272,14 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
       continue;
     }
 
-    /* clip text at the right side of the window */
+    // 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 */
+    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 */
+      // 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;
@@ -287,7 +291,7 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
 		   font_width, font_height, dst_x, dst_y);
       }
 
-      /* second step: draw masked inverted character */
+      // second step: draw masked inverted character
       SDLCopyInverseMasked(src_bitmap, dst_bitmap, src_x, src_y,
 			   font_width, font_height, dst_x, dst_y);
     }
@@ -295,7 +299,7 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
     {
       if (mask_mode == BLIT_ON_BACKGROUND)
       {
-	/* clear font character background */
+	// clear font character background
 	ClearRectangleOnBackground(dst_bitmap, dst_x, dst_y,
 				   font_width, font_height);
       }
@@ -303,7 +307,7 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
       BlitBitmapMasked(src_bitmap, dst_bitmap, src_x, src_y,
 		       font_width, font_height, dst_x, dst_y);
     }
-    else	/* normal, non-masked font blitting */
+    else	// normal, non-masked font blitting
     {
       BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y,
 		 font_width, font_height, dst_x, dst_y);
@@ -314,9 +318,9 @@ void DrawTextExt(DrawBuffer *dst_bitmap, int dst_x, int dst_y, char *text,
 }
 
 
-/* ========================================================================= */
-/* text buffer drawing functions                                             */
-/* ========================================================================= */
+// ============================================================================
+// text buffer drawing functions
+// ============================================================================
 
 #define MAX_LINES_FROM_FILE		1024
 
@@ -332,13 +336,13 @@ char *GetTextBufferFromFile(char *filename, int max_lines)
   if (!(file = openFile(filename, MODE_READ)))
     return NULL;
 
-  buffer = checked_calloc(1);	/* start with valid, but empty text buffer */
+  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 */
+    // read next line of input file
     if (!getStringFromFile(file, line, MAX_LINE_LEN))
       break;
 
@@ -368,14 +372,14 @@ static boolean RenderLineToBuffer(char **src_buffer_ptr, char *dst_buffer,
     char *word_ptr;
     int word_len;
 
-    /* skip leading whitespaces */
+    // skip leading whitespaces
     while (*text_ptr == ' ' || *text_ptr == '\t')
       text_ptr++;
 
     word_ptr = text_ptr;
     word_len = 0;
 
-    /* look for end of next word */
+    // look for end of next word
     while (*word_ptr != ' ' && *word_ptr != '\t' && *word_ptr != '\0')
     {
       word_ptr++;
@@ -386,18 +390,18 @@ static boolean RenderLineToBuffer(char **src_buffer_ptr, char *dst_buffer,
     {
       continue;
     }
-    else if (*text_ptr == '\n')		/* special case: force empty line */
+    else if (*text_ptr == '\n')		// special case: force empty line
     {
       if (buffer_len == 0)
 	text_ptr++;
 
-      /* prevent printing of multiple empty lines */
+      // 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 */
+      // word fits into text buffer -- add word
 
       if (buffer_len > 0)
 	buffer[buffer_len++] = ' ';
@@ -409,13 +413,13 @@ static boolean RenderLineToBuffer(char **src_buffer_ptr, char *dst_buffer,
     }
     else if (buffer_len > 0)
     {
-      /* not enough space left for word in text buffer -- print buffer */
+      // not enough space left for word in text buffer -- print buffer
 
       buffer_filled = TRUE;
     }
     else
     {
-      /* word does not fit at all into empty text buffer -- cut word */
+      // word does not fit at all into empty text buffer -- cut word
 
       strncpy(buffer, text_ptr, line_length);
       buffer[line_length] = '\0';
@@ -441,14 +445,14 @@ static boolean getCheckedTokenValueFromString(char *string, char **token,
   if (!getTokenValueFromString(string, token, value))
     return FALSE;
 
-  if (**token != '.')			/* token should begin with dot */
+  if (**token != '.')			// token should begin with dot
     return FALSE;
 
-  for (ptr = *token; *ptr; ptr++)	/* token should contain no whitespace */
+  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 */
+  for (ptr = *value; *ptr; ptr++)	// value should contain no whitespace
     if (*ptr == ' ' || *ptr == '\t')
       return FALSE;
 
@@ -510,25 +514,25 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
     int num_line_chars = MAX_LINE_LEN;
     int i;
 
-    /* copy next line from text buffer to line buffer (nearly fgets() style) */
+    // 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 */
+    // 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 '#') */
+    // 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 */
+      // 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 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,
@@ -557,7 +561,7 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
       continue;
     }
 
-    /* cut trailing newline and carriage return from input line */
+    // cut trailing newline and carriage return from input line
     for (line_ptr = line; *line_ptr; line_ptr++)
     {
       if (*line_ptr == '\n' || *line_ptr == '\r')
@@ -567,7 +571,7 @@ int DrawTextBuffer(int x, int y, char *text_buffer, int font_nr,
       }
     }
 
-    if (strlen(line) == 0)		/* special case: force empty line */
+    if (strlen(line) == 0)		// special case: force empty line
       strcpy(line, "\n");
 
     line_ptr = line;