rnd-20030426-1-src

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index e9817ae3b7e59b8a8dc1cf13b13ad10c8b57f503..7fd87aee20f7584fc075a25ed81f6b7cf7471b8a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -289,45 +289,42 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "blue key"
   },
   {
-    "gate_1_closed",
+    "gate_1",
     "gate",
     "red door"
   },
   {
-    "gate_2_closed",
+    "gate_2",
     "gate",
     "yellow door"
   },
   {
-    "gate_3_closed",
+    "gate_3",
     "gate",
     "green door"
   },
   {
-    "gate_4_closed",
+    "gate_4",
     "gate",
     "blue door"
   },
   {
-    "gate_1_gray_closed",
+    "gate_1_gray",
     "gate",
     "gray door (opened by red key)"
   },
   {
-    "gate_2_gray_closed",
+    "gate_2_gray",
     "gate",
-    "gray door (opened by yellow key)"
-  },
+    "gray door (opened by yellow key)"},
   {
-    "gate_3_gray_closed",
+    "gate_3_gray",
     "gate",
-    "gray door (opened by green key)"
-  },
+    "gray door (opened by green key)"},
   {
-    "gate_4_gray_closed",
+    "gate_4_gray",
     "gate",
-    "gray door (opened by blue key)"
-  },
+    "gray door (opened by blue key)"},
   {
     "dynamite",
     "dynamite",
@@ -1118,22 +1115,22 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "growing wall (any direction)"
   },
   {
-    "em_gate_1_closed",
+    "em_gate_1",
     "gate",
     "red door (EM style)"
   },
   {
-    "em_gate_2_closed",
+    "em_gate_2",
     "gate",
     "yellow door (EM style)"
   },
   {
-    "em_gate_3_closed",
+    "em_gate_3",
     "gate",
     "green door (EM style)"
   },
   {
-    "em_gate_4_closed",
+    "em_gate_4",
     "gate",
     "blue door (EM style)"
   },
@@ -1353,22 +1350,22 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "chip (lower half)"
   },
   {
-    "em_gate_1_gray_closed",
+    "em_gate_1_gray",
     "gate",
     "gray door (EM style, red key)"
   },
   {
-    "em_gate_2_gray_closed",
+    "em_gate_2_gray",
     "gate",
     "gray door (EM style, yellow key)"
   },
   {
-    "em_gate_3_gray_closed",
+    "em_gate_3_gray",
     "gate",
     "gray door (EM style, green key)"
   },
   {
-    "em_gate_4_gray_closed",
+    "em_gate_4_gray",
     "gate",
     "gray door (EM style, blue key)"
   },
@@ -2777,86 +2774,6 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "magic_wall",
     "-"
   },
-  {
-    "gate_1_open",
-    "gate",
-    "red door"
-  },
-  {
-    "gate_2_open",
-    "gate",
-    "yellow door"
-  },
-  {
-    "gate_3_open",
-    "gate",
-    "green door"
-  },
-  {
-    "gate_4_open",
-    "gate",
-    "blue door"
-  },
-  {
-    "gate_1_gray_open",
-    "gate",
-    "gray door (opened by red key)"
-  },
-  {
-    "gate_2_gray_open",
-    "gate",
-    "gray door (opened by yellow key)"
-  },
-  {
-    "gate_3_gray_open",
-    "gate",
-    "gray door (opened by green key)"
-  },
-  {
-    "gate_4_gray_open",
-    "gate",
-    "gray door (opened by blue key)"
-  },
-  {
-    "em_gate_1_open",
-    "gate",
-    "red door (EM style)"
-  },
-  {
-    "em_gate_2_open",
-    "gate",
-    "yellow door (EM style)"
-  },
-  {
-    "em_gate_3_open",
-    "gate",
-    "green door (EM style)"
-  },
-  {
-    "em_gate_4_open",
-    "gate",
-    "blue door (EM style)"
-  },
-  {
-    "em_gate_1_gray_open",
-    "gate",
-    "gray door (EM style, red key)"
-  },
-  {
-    "em_gate_2_gray_open",
-    "gate",
-    "gray door (EM style, yellow key)"
-  },
-  {
-    "em_gate_3_gray_open",
-    "gate",
-    "gray door (EM style, green key)"
-  },
-  {
-    "em_gate_4_gray_open",
-    "gate",
-    "gray door (EM style, blue key)"
-  },
 
   /* ----------------------------------------------------------------------- */
   /* "unreal" (and therefore not drawable) runtime elements                  */
@@ -3087,6 +3004,9 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1] =
 /* font definitions                                                          */
 /* ------------------------------------------------------------------------- */
 
+/* Important: When one entry is a prefix of another entry, the longer entry
+   must come first, because the dynamic configuration does prefix matching! */
+
 struct FontInfo font_info[NUM_FONTS + 1] =
 {
   { "font.initial_1"           },
@@ -3097,19 +3017,26 @@ struct FontInfo font_info[NUM_FONTS + 1] =
   { "font.title_2"             },
   { "font.menu_1"              },
   { "font.menu_2"              },
+  { "font.text_1.active"       },
+  { "font.text_2.active"       },
+  { "font.text_3.active"       },
+  { "font.text_4.active"       },
   { "font.text_1"              },
   { "font.text_2"              },
   { "font.text_3"              },
   { "font.text_4"              },
-  { "font.input"               },
-  { "font.input.active"                },
+  { "font.input_1.active"      },
+  { "font.input_2.active"      },
+  { "font.input_1"             },
+  { "font.input_2"             },
   { "font.option_off"          },
   { "font.option_on"           },
   { "font.value_1"             },
   { "font.value_2"             },
   { "font.value_old"           },
-  { "font.tape_recorder"       },
   { "font.level_number"                },
+  { "font.tape_recorder"       },
+  { "font.game_info"           },
 };