rnd-20010115-1-src

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

diff --git a/src/libgame/text.c b/src/libgame/text.c
index 4e365c60e993a02471c88ef984dd8571618fe252..924381178be53926c7bd25bb112706ef304e310c 100644 (file)
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Artsoft Retro-Game Library                               *
 *----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment                      *
+* (c) 1994-2001 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -28,8 +28,8 @@ 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)
 {
   font.bitmap_big = bitmap_big;
   font.bitmap_medium = bitmap_medium;
@@ -99,14 +99,14 @@ void DrawText(int x, int y, char *text, int font_size, int font_type)
 
   if (x < gfx.dx)
     redraw_mask |= REDRAW_FIELD;
-  else if (y < gfx.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;
 
@@ -148,12 +148,18 @@ void DrawTextExt(DrawBuffer bitmap, int x, int y,
     else if (c == 'ü' || c == 'Ü')
       c = 93;
 
-    if (c >= 32 && c <= 95)
+    if ((c >= 32 && c <= 95) || 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 == '°')
+      {
+       src_x = (FONT_CHARS_PER_LINE + 1) * font_width;
+       src_y = 3 * font_height + font_start;
+      }
+
       if (print_inverse)
       {
        BlitBitmap(font_bitmap, bitmap,