X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=7ab466ab1ff11efed36c537fc952aebcda0de077;hb=0078fa1620abed262370083c0c6aa475a25e1b04;hp=d954b1accdcaea3855c1fab25e63f1d3646e954a;hpb=f47cd4b09952aaf95d16542f6b53f2d8bf9e1d7d;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index d954b1ac..7ab466ab 100644
--- a/src/main.c
+++ b/src/main.c
@@ -750,7 +750,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "letter '$'"
   },
   {
-    "char_procent",
+    "char_percent",
     "char",
     "letter '%'"
   },
@@ -1782,7 +1782,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "balloon_switch_any",
     "balloon_switch",
-    "send balloon in any direction"
+    "send balloon in pressed direction"
   },
   {
     "emc_steelwall_1",
@@ -3465,204 +3465,189 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "stop moving balloon"
   },
   {
-    "emc_level_border",
-    "wall",
-    "level border steelwall",
-  },
-  {
-    "emc_android",
-    "emc_android",
-    "android",
+    "em_gate_5",
+    "gate",
+    "door 5 (EMC style)",
   },
   {
-    "emc_android_right",
-    "emc_android",
-    "android",
+    "em_gate_6",
+    "gate",
+    "door 6 (EMC style)",
   },
   {
-    "emc_android_up",
-    "emc_android",
-    "android",
+    "em_gate_7",
+    "gate",
+    "door 7 (EMC style)",
   },
   {
-    "emc_android_left",
-    "emc_android",
-    "android",
+    "em_gate_8",
+    "gate",
+    "door 8 (EMC style)",
   },
   {
-    "emc_android_down",
-    "emc_android",
-    "android",
+    "em_gate_5_gray",
+    "gate",
+    "gray door (EMC style, key 5)",
   },
   {
-    "emc_android_left_up",
-    "emc_android",
-    "android",
+    "em_gate_6_gray",
+    "gate",
+    "gray door (EMC style, key 6)",
   },
   {
-    "emc_android_left_down",
-    "emc_android",
-    "android",
+    "em_gate_7_gray",
+    "gate",
+    "gray door (EMC style, key 7)",
   },
   {
-    "emc_android_right_up",
-    "emc_android",
-    "android",
+    "em_gate_8_gray",
+    "gate",
+    "gray door (EMC style, key 8)",
   },
   {
-    "emc_android_right_down",
-    "emc_android",
-    "android",
+    "em_key_5",
+    "key",
+    "key 5 (EMC style)",
   },
   {
-    "emc_grass",
-    "emc_grass",
-    "grass",
+    "em_key_6",
+    "key",
+    "key 6 (EMC style)",
   },
   {
-    "emc_generator_ball",
-    "emc_generator_ball",
-    "generator ball",
+    "em_key_7",
+    "key",
+    "key 7 (EMC style)",
   },
   {
-    "emc_gate_1",
-    "gate",
-    "door 1 (EMC style)",
+    "em_key_8",
+    "key",
+    "key 8 (EMC style)",
   },
   {
-    "emc_gate_2",
-    "gate",
-    "door 2 (EMC style)",
+    "emc_android",
+    "emc_android",
+    "android",
   },
   {
-    "emc_gate_3",
-    "gate",
-    "door 3 (EMC style)",
+    "emc_grass",
+    "emc_grass",
+    "grass",
   },
   {
-    "emc_gate_4",
-    "gate",
-    "door 4 (EMC style)",
+    "emc_magic_ball",
+    "emc_magic_ball",
+    "magic ball",
   },
   {
-    "emc_gate_5",
-    "gate",
-    "door 5 (EMC style)",
+    "emc_magic_ball.active",
+    "emc_magic_ball",
+    "magic ball (activated)",
   },
   {
-    "emc_gate_6",
-    "gate",
-    "door 6 (EMC style)",
+    "emc_magic_ball_switch",
+    "emc_magic_ball_switch",
+    "magic ball switch (off)",
   },
   {
-    "emc_gate_7",
-    "gate",
-    "door 7 (EMC style)",
+    "emc_magic_ball_switch.active",
+    "emc_magic_ball_switch",
+    "magic ball switch (on)",
   },
   {
-    "emc_gate_8",
-    "gate",
-    "door 8 (EMC style)",
+    "emc_spring_bumper",
+    "emc_spring_bumper",
+    "spring bumper",
   },
   {
-    "emc_gate_1_gray",
-    "gate",
-    "gray door (EMC style, key 1)",
-  },
-  {
-    "emc_gate_2_gray",
-    "gate",
-    "gray door (EMC style, key 2)",
-  },
-  {
-    "emc_gate_3_gray",
-    "gate",
-    "gray door (EMC style, key 3)",
+    "emc_plant",
+    "emc_plant",
+    "plant",
   },
   {
-    "emc_gate_4_gray",
-    "gate",
-    "gray door (EMC style, key 4)",
+    "emc_lenses",
+    "emc_lenses",
+    "lenses",
   },
   {
-    "emc_gate_5_gray",
-    "gate",
-    "gray door (EMC style, key 5)",
+    "emc_magnifier",
+    "emc_magnifier",
+    "magnifier",
   },
   {
-    "emc_gate_6_gray",
-    "gate",
-    "gray door (EMC style, key 6)",
+    "emc_wall_9",
+    "wall",
+    "normal wall"
   },
   {
-    "emc_gate_7_gray",
-    "gate",
-    "gray door (EMC style, key 7)",
+    "emc_wall_10",
+    "wall",
+    "normal wall"
   },
   {
-    "emc_gate_8_gray",
-    "gate",
-    "gray door (EMC style, key 8)",
+    "emc_wall_11",
+    "wall",
+    "normal wall"
   },
   {
-    "emc_key_1",
-    "key",
-    "key 1 (EMC style)",
+    "emc_wall_12",
+    "wall",
+    "normal wall"
   },
   {
-    "emc_key_2",
-    "key",
-    "key 2 (EMC style)",
+    "emc_wall_13",
+    "wall",
+    "normal wall"
   },
   {
-    "emc_key_3",
-    "key",
-    "key 3 (EMC style)",
+    "emc_wall_14",
+    "wall",
+    "normal wall"
   },
   {
-    "emc_key_4",
-    "key",
-    "key 4 (EMC style)",
+    "emc_wall_15",
+    "wall",
+    "normal wall"
   },
   {
-    "emc_key_5",
-    "key",
-    "key 5 (EMC style)",
+    "emc_wall_16",
+    "wall",
+    "normal wall"
   },
   {
-    "emc_key_6",
-    "key",
-    "key 6 (EMC style)",
+    "emc_wall_slippery_1",
+    "wall",
+    "slippery wall"
   },
   {
-    "emc_key_7",
-    "key",
-    "key 7 (EMC style)",
+    "emc_wall_slippery_2",
+    "wall",
+    "slippery wall"
   },
   {
-    "emc_key_8",
-    "key",
-    "key 8 (EMC style)",
+    "emc_wall_slippery_3",
+    "wall",
+    "slippery wall"
   },
   {
-    "emc_bumper",
-    "emc_bumper",
-    "bumper",
+    "emc_wall_slippery_4",
+    "wall",
+    "slippery wall"
   },
   {
-    "emc_plant",
-    "emc_plant",
-    "plant",
+    "emc_fake_grass",
+    "fake grass",
+    "fake grass"
   },
   {
-    "emc_lenses",
-    "emc_lenses",
-    "lenses",
+    "emc_fake_acid",
+    "fake acid",
+    "fake acid"
   },
   {
-    "emc_magnifier",
-    "emc_magnifier",
-    "magnifier",
+    "emc_dripper",
+    "dripper",
+    "dripper"
   },
 
   /* ----------------------------------------------------------------------- */
@@ -4203,6 +4188,10 @@ struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
   { ".turning_from_right",	ACTION_TURNING_FROM_RIGHT,	FALSE	},
   { ".turning_from_up",		ACTION_TURNING_FROM_UP,		FALSE	},
   { ".turning_from_down",	ACTION_TURNING_FROM_DOWN,	FALSE	},
+  { ".smashed_by_rock",		ACTION_SMASHED_BY_ROCK,		FALSE	},
+  { ".smashed_by_spring",	ACTION_SMASHED_BY_SPRING,	FALSE	},
+  { ".slurped_by_spring",	ACTION_SLURPED_BY_SPRING,	FALSE	},
+  { ".twinkling",		ACTION_TWINKLING,		FALSE	},
   { ".other",			ACTION_OTHER,			FALSE	},
 
   /* empty suffix always matches -- check as last entry in InitSoundInfo() */