rnd-20050129-1-src

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index ab07ad014eac393ebe18e443cb91c4ecc252e579..e382071e68e5cb3517a782cd7f3fe69d969bde10 100644 (file)
--- 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",
@@ -3464,31 +3464,6 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "balloon_switch",
     "stop moving balloon"
   },
-  {
-    "emc_level_border",
-    "wall",
-    "level border steelwall",
-  },
-  {
-    "emc_android",
-    "emc_android",
-    "android",
-  },
-  {
-    "emc_grass",
-    "emc_grass",
-    "grass",
-  },
-  {
-    "emc_magic_ball",
-    "emc_magic_ball",
-    "magic ball",
-  },
-  {
-    "emc_magic_ball_switch",
-    "emc_magic_ball_switch",
-    "magic ball switch",
-  },
   {
     "emc_gate_5",
     "gate",
@@ -3550,9 +3525,39 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "key 8 (EMC style)",
   },
   {
-    "emc_bumper",
-    "emc_bumper",
-    "bumper",
+    "emc_android",
+    "emc_android",
+    "android",
+  },
+  {
+    "emc_grass",
+    "emc_grass",
+    "grass",
+  },
+  {
+    "emc_magic_ball",
+    "emc_magic_ball",
+    "magic ball",
+  },
+  {
+    "emc_magic_ball.active",
+    "emc_magic_ball",
+    "magic ball (activated)",
+  },
+  {
+    "emc_magic_ball_switch",
+    "emc_magic_ball_switch",
+    "magic ball switch (off)",
+  },
+  {
+    "emc_magic_ball_switch.active",
+    "emc_magic_ball_switch",
+    "magic ball switch (on)",
+  },
+  {
+    "emc_spring_bumper",
+    "emc_spring_bumper",
+    "spring bumper",
   },
   {
     "emc_plant",
@@ -3629,6 +3634,21 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "wall",
     "slippery wall"
   },
+  {
+    "emc_fake_grass",
+    "fake grass",
+    "fake grass"
+  },
+  {
+    "emc_fake_acid",
+    "fake acid",
+    "fake acid"
+  },
+  {
+    "emc_dripper",
+    "dripper",
+    "dripper"
+  },
 
   /* ----------------------------------------------------------------------- */
   /* "real" (and therefore drawable) runtime elements                        */
@@ -4168,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() */