X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=44104721b7fc8edfe2aaab93ec8073d56fe8fc52;hb=86e1890b2d87dd7710b320e2b306c7291d41e2a5;hp=ab07ad014eac393ebe18e443cb91c4ecc252e579;hpb=73dd81c85be90e466493bcc6f45c402d29bc7f20;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index ab07ad01..44104721 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3465,94 +3465,99 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "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",
+    "em_gate_5",
     "gate",
     "door 5 (EMC style)",
   },
   {
-    "emc_gate_6",
+    "em_gate_6",
     "gate",
     "door 6 (EMC style)",
   },
   {
-    "emc_gate_7",
+    "em_gate_7",
     "gate",
     "door 7 (EMC style)",
   },
   {
-    "emc_gate_8",
+    "em_gate_8",
     "gate",
     "door 8 (EMC style)",
   },
   {
-    "emc_gate_5_gray",
+    "em_gate_5_gray",
     "gate",
     "gray door (EMC style, key 5)",
   },
   {
-    "emc_gate_6_gray",
+    "em_gate_6_gray",
     "gate",
     "gray door (EMC style, key 6)",
   },
   {
-    "emc_gate_7_gray",
+    "em_gate_7_gray",
     "gate",
     "gray door (EMC style, key 7)",
   },
   {
-    "emc_gate_8_gray",
+    "em_gate_8_gray",
     "gate",
     "gray door (EMC style, key 8)",
   },
   {
-    "emc_key_5",
+    "em_key_5",
     "key",
     "key 5 (EMC style)",
   },
   {
-    "emc_key_6",
+    "em_key_6",
     "key",
     "key 6 (EMC style)",
   },
   {
-    "emc_key_7",
+    "em_key_7",
     "key",
     "key 7 (EMC style)",
   },
   {
-    "emc_key_8",
+    "em_key_8",
     "key",
     "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,16 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "wall",
     "slippery wall"
   },
+  {
+    "emc_fake_grass",
+    "fake_grass",
+    "fake_grass"
+  },
+  {
+    "emc_dripper",
+    "dripper",
+    "dripper"
+  },
 
   /* ----------------------------------------------------------------------- */
   /* "real" (and therefore drawable) runtime elements                        */
@@ -4168,6 +4183,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() */