replaced preprocessor constants with enum values

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

diff --git a/src/libgame/text.h b/src/libgame/text.h
index cfc9e3f19f8c4feb78c50866b0d568a7f8278157..701213f66ae58b04b389e729026afcd2b7668b40 100644 (file)
--- a/src/libgame/text.h
+++ b/src/libgame/text.h
@@ -15,22 +15,22 @@
 #include "system.h"
 
 
-/* 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                 FONT_INITIAL_1
-#define FC_BLUE                        FONT_INITIAL_2
-#define FC_GREEN               FONT_INITIAL_3
-#define FC_YELLOW              FONT_INITIAL_4
-
-/* text output definitions */
+// default fonts
+#define MAIN_FONT_INITIAL_1    0
+#define MAIN_FONT_INITIAL_2    1
+#define MAIN_FONT_INITIAL_3    2
+#define MAIN_FONT_INITIAL_4    3
+
+// font colors
+#define FC_RED                 MAIN_FONT_INITIAL_1
+#define FC_BLUE                        MAIN_FONT_INITIAL_2
+#define FC_GREEN               MAIN_FONT_INITIAL_3
+#define FC_YELLOW              MAIN_FONT_INITIAL_4
+
+// text output definitions
 #define MAX_OUTPUT_LINESIZE    1024
 
-/* special constants for old ISO-8859-1 character byte values */
+// special constants for old ISO-8859-1 character byte values
 #define CHAR_BYTE_UMLAUT_A     ((char)0xc4)
 #define CHAR_BYTE_UMLAUT_O     ((char)0xd6)
 #define CHAR_BYTE_UMLAUT_U     ((char)0xdc)
@@ -43,7 +43,7 @@
 #define CHAR_BYTE_DEGREE       ((char)0xb0)
 #define CHAR_BYTE_CURSOR       ((char)0xa0)
 
-/* special character mapping for default fonts */
+// special character mapping for default fonts
 #define FONT_ASCII_CURSOR      ((char)160)
 #define FONT_ASCII_BUTTON      ((char)128)
 #define FONT_ASCII_UP          ((char)129)
@@ -67,13 +67,13 @@
                                 (c) == FONT_ASCII_DOWN      ? 111 :    \
                                 (c))
 
-/* 64 regular ordered ASCII characters, 6 special characters, 1 cursor char. */
+// 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 */
+// font structure definitions
 
 void InitFontInfo(struct FontBitmapInfo *, int,
                  int (*function1)(int), int (*function2)(char *));
@@ -110,4 +110,4 @@ int DrawTextBufferVA(int, int, char *, va_list, int, int, int, int, int, int,
 int DrawTextFile(int, int, char *, int, int, int, int, int, int,
                 boolean, boolean, boolean);
 
-#endif /* TEXT_H */
+#endif // TEXT_H