X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Ftext.h;h=10c91d242c21837ee49487f50e520c0a2dc37d32;hb=c2a639c0b2c1a9a2bd14de86932a47429ae918a4;hp=f506b940dad13860eac4d8dcbe61e388278c284f;hpb=27a283729bf1e7b956c5ceba87215a6d177b4bc7;p=rocksndiamonds.git

diff --git a/src/libgame/text.h b/src/libgame/text.h
index f506b940..10c91d24 100644
--- a/src/libgame/text.h
+++ b/src/libgame/text.h
@@ -29,25 +29,47 @@
 #define FC_GREEN		FONT_INITIAL_3
 #define FC_YELLOW		FONT_INITIAL_4
 
-#define FONT_CHARS_PER_LINE	16
-#define FONT_LINES_PER_FONT	4
-
 /* text output definitions */
 #define MAX_OUTPUT_LINESIZE	1024
 
+/* special character mapping for default fonts */
+#define FONT_ASCII_CURSOR	((char)160)
+#define MAP_FONT_ASCII(c)	((c) >= 'a' && (c) <= 'z' ? 'A' + (c) - 'a' : \
+				 (c) == '©'		  ? 96  :	      \
+				 (c) == 'ä' || (c) == 'Ä' ? 97  :	      \
+				 (c) == 'ö' || (c) == 'Ö' ? 98  :	      \
+				 (c) == 'ü' || (c) == 'Ü' ? 99  :	      \
+				 (c) == '°'		  ? 100 :	      \
+				 (c) == '®'		  ? 101 :	      \
+				 (c) == FONT_ASCII_CURSOR ? 102 :	      \
+				 (c))
+
+/* 64 regular ordered ASCII characters, 6 special characters, 1 cursor char. */
+#define MIN_NUM_CHARS_PER_FONT			64
+#define DEFAULT_NUM_CHARS_PER_FONT		(MIN_NUM_CHARS_PER_FONT + 6 +1)
+#define DEFAULT_NUM_CHARS_PER_LINE		16
+
+
 /* font structure definitions */
 
 void InitFontInfo(struct FontBitmapInfo *, int, int (*function)(int));
-void SetInverseTextColor(Pixel);
+void FreeFontInfo(struct FontBitmapInfo *);
 
 int getFontWidth(int);
 int getFontHeight(int);
-boolean getFontChar(int, char, int *, int *);
+int getTextWidth(char *, int);
+
+void getFontCharSource(int, char, Bitmap **, int *, int *);
 
 void DrawInitText(char *, int, int);
 void DrawTextF(int, int, int, char *, ...);
 void DrawTextFCentered(int, int, char *, ...);
+void DrawTextS(int, int, int, char *);
+void DrawTextSCentered(int, int, char *);
 void DrawText(int, int, char *, int);
 void DrawTextExt(DrawBuffer *, int, int, char *, int, int);
+void DrawTextToTextArea(int, int, char *, int, int, int, int, int);
+boolean RenderLineToBuffer(char **, char *, int *, boolean, int);
+void DrawTextWrapped(int, int, char *, int, int, int);
 
 #endif	/* TEXT_H */