X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=1289c0b6faca1dd467202d00267ee509aa96824c;hb=a6f92ff31331edb70bdd380518fe217a78788f7e;hp=e9817ae3b7e59b8a8dc1cf13b13ad10c8b57f503;hpb=ac4c028b525860750de315d626730ac493f56944;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index e9817ae3..1289c0b6 100644
--- 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                  */
@@ -3101,15 +3018,18 @@ struct FontInfo font_info[NUM_FONTS + 1] =
   { "font.text_2"		},
   { "font.text_3"		},
   { "font.text_4"		},
-  { "font.input"		},
-  { "font.input.active"		},
+  { "font.input_1.active"	},
+  { "font.input_1"		},
+  { "font.input_2.active"	},
+  { "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"		},
 };