X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftext.h;h=c1915d47859a77fb4f0685981f4919db359918b3;hb=6ed4958820f8f97174ca47594dcc6f00ee31b2cb;hp=f459e3fd9f392366c2fd37f176b51deb22568693;hpb=c9433eab5c4317ed4f89164b386a7d33562e29be;p=rocksndiamonds.git

diff --git a/src/libgame/text.h b/src/libgame/text.h
index f459e3fd..c1915d47 100644
--- a/src/libgame/text.h
+++ b/src/libgame/text.h
@@ -17,57 +17,39 @@
 #include "system.h"
 
 
-/* font types */
-#define FS_SMALL		0
-#define FS_BIG			1
-#define FS_MEDIUM		2
+/* default fonts */
+#define FONT_INITIAL_1		0
+#define FONT_INITIAL_2		1
+#define FONT_INITIAL_3		2
+#define FONT_INITIAL_4		3
 
 /* font colors */
-#define FC_RED			0
-#define FC_BLUE			1
-#define FC_GREEN		2
-#define FC_YELLOW		3
-#define FC_SPECIAL1		4
-#define FC_SPECIAL2		5
-#define FC_SPECIAL3		6
-
-/* font graphics definitions */
-#define FONT1_XSIZE		32
-#define FONT1_YSIZE		32
-#define FONT2_XSIZE		14
-#define FONT2_YSIZE		14
-#define FONT3_XSIZE		11
-#define FONT3_YSIZE		14
-#define FONT4_XSIZE		16
-#define FONT4_YSIZE		16
-#define FONT5_XSIZE		10
-#define FONT5_YSIZE		14
-#define FONT6_XSIZE		16
-#define FONT6_YSIZE		32
+#define FC_RED			FONT_INITIAL_1
+#define FC_BLUE			FONT_INITIAL_2
+#define FC_GREEN		FONT_INITIAL_3
+#define FC_YELLOW		FONT_INITIAL_4
 
 #define FONT_CHARS_PER_LINE	16
 #define FONT_LINES_PER_FONT	4
 
+#define FONT_OPAQUE		0
+#define FONT_MASKED		1
+
 /* text output definitions */
-#define MAX_OUTPUT_LINESIZE	256
+#define MAX_OUTPUT_LINESIZE	1024
 
 /* font structure definitions */
 
-struct FontInfo
-{
-  Bitmap *bitmap_big;
-  Bitmap *bitmap_medium;
-  Bitmap *bitmap_small;
-};
-
+void InitFontInfo(struct FontBitmapInfo *, int,
+		  int (*select_font_function)(int));
+int getFontWidth(int);
+int getFontHeight(int);
+boolean getFontChar(int, char, int *, int *);
 
-void InitFontInfo(Bitmap *, Bitmap *, Bitmap *);
-int getFontWidth(int, int);
-int getFontHeight(int, int);
 void DrawInitText(char *, int, int);
 void DrawTextF(int, int, int, char *, ...);
 void DrawTextFCentered(int, int, char *, ...);
-void DrawText(int, int, char *, int, int);
+void DrawText(int, int, char *, int);
 void DrawTextExt(DrawBuffer *, int, int, char *, int, int);
 
 #endif	/* TEXT_H */