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

diff --git a/src/libgame/text.c b/src/libgame/text.c
index 2fbf1cb3..b0483501 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-2000 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,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;
@@ -76,8 +77,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 +90,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)
     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;