rnd-20030411-1-src

[rocksndiamonds.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index a3ce361adbe422a512545977d6e7bad967a7e627..545c161a0ae2853d156d505e533f6da414ebb93f 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -442,21 +442,6 @@
 
 #define EL_CHAR(c)                     (EL_CHAR_ASCII0 + MAP_FONT_ASCII(c))
 
-#if 0
-#define EL_CHAR(x)                     ((x) == 'Ä' ? EL_CHAR_AE         : \
-                                        (x) == 'Ö' ? EL_CHAR_OE         : \
-                                        (x) == 'Ü' ? EL_CHAR_UE         : \
-                                        (x) == 'ä' ? EL_CHAR_AE         : \
-                                        (x) == 'ö' ? EL_CHAR_OE         : \
-                                        (x) == 'ü' ? EL_CHAR_UE         : \
-                                        (x) == '©' ? EL_CHAR_COPYRIGHT  : \
-                                        (x) == '_' ? EL_CHAR_UNDERSCORE : \
-                                        (x) == '°' ? EL_CHAR_DEGREE     : \
-                                        (x) == '´' ? EL_CHAR_TM         : \
-                                        (x) == '|' ? EL_CHAR_CURSOR     : \
-                                        EL_CHAR_A + (x) - 'A')
-#endif
-
 #define EL_EXPANDABLE_WALL_HORIZONTAL  200
 #define EL_EXPANDABLE_WALL_VERTICAL    201
 #define EL_EXPANDABLE_WALL_ANY         202
@@ -826,17 +811,20 @@
 #define FONT_TEXT_2                            9
 #define FONT_TEXT_3                            10
 #define FONT_TEXT_4                            11
-#define FONT_INPUT                             12
-#define FONT_INPUT_ACTIVE                      13
-#define FONT_OPTION_OFF                                14
-#define FONT_OPTION_ON                         15
-#define FONT_VALUE_1                           16
-#define FONT_VALUE_2                           17
-#define FONT_VALUE_OLD                         18
-#define FONT_TAPE_RECORDER                     19
-#define FONT_LEVEL_NUMBER                      20
-
-#define NUM_FONTS                              21
+#define FONT_INPUT_1                           12
+#define FONT_INPUT_1_ACTIVE                    13
+#define FONT_INPUT_2                           14
+#define FONT_INPUT_2_ACTIVE                    15
+#define FONT_OPTION_OFF                                16
+#define FONT_OPTION_ON                         17
+#define FONT_VALUE_1                           18
+#define FONT_VALUE_2                           19
+#define FONT_VALUE_OLD                         20
+#define FONT_LEVEL_NUMBER                      21
+#define FONT_TAPE_RECORDER                     22
+#define FONT_GAME_INFO                         23
+
+#define NUM_FONTS                              24
 #define NUM_INITIAL_FONTS                      4
 
 /* values for game_status */
@@ -1001,6 +989,8 @@ struct LevelInfo
   boolean gravity;
   boolean em_slippery_gems;    /* EM style "gems slip from wall" behaviour */
 
+  short custom_element_successor[NUM_CUSTOM_ELEMENTS];
+
   boolean no_level_file;
 };