X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftext.c;h=a31c80f2881fe7bcfb2275fb81326b246e7be3bd;hb=8afc6199767a6fcb7451efd2b3d5b070f6c99efb;hp=2fbf1cb319cf3b48b6514d552e383ba70898bbce;hpb=1465ca1ffdf2104d25b9a46ca9bf8a3f175403fd;p=rocksndiamonds.git

diff --git a/src/libgame/text.c b/src/libgame/text.c
index 2fbf1cb3..a31c80f2 100644
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -1,19 +1,20 @@
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Artsoft Retro-Game Library                               *
 *----------------------------------------------------------*
-*  (c) 1995-98 Artsoft Entertainment                       *
-*              Holger Schemel                              *
-*              Oststrasse 11a                              *
-*              33604 Bielefeld                             *
-*              phone: ++49 +521 290471                     *
-*              email: aeglos@valinor.owl.de                *
+* (c) 1994-2002 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  text.c                                                  *
+* text.c                                                   *
 ***********************************************************/
 
+#include <stdio.h>
 #include <stdarg.h>
 
-#include "libgame.h"
+#include "text.h"
 
 
 /* ========================================================================= */
@@ -27,12 +28,13 @@ struct FontInfo		font;
 /* font functions                                                            */
 /* ========================================================================= */
 
-void InitFontInfo(Bitmap bitmap_big, Bitmap bitmap_medium,
-		  Bitmap bitmap_small)
+void InitFontInfo(Bitmap *bitmap_big, Bitmap *bitmap_medium,
+		  Bitmap *bitmap_small, Bitmap *bitmap_tile)
 {
   font.bitmap_big = bitmap_big;
   font.bitmap_medium = bitmap_medium;
   font.bitmap_small = bitmap_small;
+  font.bitmap_tile = bitmap_tile;
 }
 
 int getFontWidth(int font_size, int font_type)
@@ -76,8 +78,8 @@ void DrawTextFCentered(int y, int font_type, char *format, ...)
   vsprintf(buffer, format, ap);
   va_end(ap);
 
-  DrawText(playfield.sx + (playfield.sxsize - strlen(buffer) * font_width) / 2,
-	   playfield.sy + y, buffer, FS_SMALL, font_type);
+  DrawText(gfx.sx + (gfx.sxsize - strlen(buffer) * font_width) / 2,
+	   gfx.sy + y, buffer, FS_SMALL, font_type);
 }
 
 void DrawTextF(int x, int y, int font_type, char *format, ...)
@@ -89,23 +91,23 @@ void DrawTextF(int x, int y, int font_type, char *format, ...)
   vsprintf(buffer, format, ap);
   va_end(ap);
 
-  DrawText(playfield.sx + x, playfield.sy + y, buffer, FS_SMALL, font_type);
+  DrawText(gfx.sx + x, gfx.sy + y, buffer, FS_SMALL, font_type);
 }
 
 void DrawText(int x, int y, char *text, int font_size, int font_type)
 {
   DrawTextExt(drawto, x, y, text, font_size, font_type);
 
-  if (x < playfield.dx)
+  if (x < gfx.dx)
     redraw_mask |= REDRAW_FIELD;
-  else if (y < playfield.vy)
+  else if (y < gfx.vy || gfx.vy == 0)
     redraw_mask |= REDRAW_DOOR_1;
 }
 
-void DrawTextExt(DrawBuffer bitmap, int x, int y,
+void DrawTextExt(DrawBuffer *bitmap, int x, int y,
 		 char *text, int font_size, int font_type)
 {
-  Bitmap font_bitmap;
+  Bitmap *font_bitmap;
   int font_width, font_height, font_start;
   boolean print_inverse = FALSE;
 
@@ -117,16 +119,22 @@ void DrawTextExt(DrawBuffer bitmap, int x, int y,
   font_width = getFontWidth(font_size, font_type);
   font_height = getFontHeight(font_size, font_type);
 
-  font_bitmap = (font_size == FS_BIG ? font.bitmap_big :
-		 font_size == FS_MEDIUM ? font.bitmap_medium :
+  font_bitmap = (font_type == FC_SPECIAL2	? font.bitmap_tile	:
+		 font_size == FS_BIG		? font.bitmap_big	:
+		 font_size == FS_MEDIUM		? font.bitmap_medium	:
+		 font_size == FS_SMALL		? font.bitmap_small	:
 		 font.bitmap_small);
-  font_start = (font_type * (font_size == FS_BIG ? FONT1_YSIZE :
-			     font_size == FS_MEDIUM ? FONT6_YSIZE :
-			     FONT2_YSIZE) *
-		FONT_LINES_PER_FONT);
+
+  if (font_type == FC_SPECIAL2)
+    font_start = (font_size == FS_BIG ? 0 : FONT1_YSIZE) * FONT_LINES_PER_FONT;
+  else
+    font_start = (font_type * (font_size == FS_BIG ? FONT1_YSIZE :
+			       font_size == FS_MEDIUM ? FONT6_YSIZE :
+			       FONT2_YSIZE) *
+		  FONT_LINES_PER_FONT);
 
   if (font_type == FC_SPECIAL3)
-    font_start += (FONT4_YSIZE - FONT2_YSIZE) * FONT_LINES_PER_FONT;
+    font_start -= FONT2_YSIZE * FONT_LINES_PER_FONT;
 
   while (*text)
   {
@@ -146,13 +154,23 @@ void DrawTextExt(DrawBuffer bitmap, int x, int y,
       c = 92;
     else if (c == 'ü' || c == 'Ü')
       c = 93;
+    else if (c == '[' || c == ']')	/* map to normal braces */
+      c = (c == '[' ? '(' : ')');
+    else if (c == '\\')			/* bad luck ... */
+      c = '/';
 
-    if (c >= 32 && c <= 95)
+    if ((c >= 32 && c <= 95) || c == '°' || c == '´')
     {
       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;
 
+      if (c == '°' || c == '´')		/* map '°' and 'TM' signs */
+      {
+	src_x = FONT_CHARS_PER_LINE * font_width;
+	src_y = (c == '°' ? 1 : 2) * font_height + font_start;
+      }
+
       if (print_inverse)
       {
 	BlitBitmap(font_bitmap, bitmap,