X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=b278a0df17172e77dd264d7da67bfcd6bb3b4259;hb=edaa850fd2d2cae7ec31961fae3d56487e710c71;hp=b9967e3046ba3e2772059b9f95a28dd14684ac7b;hpb=dc9fe7359bd0b8dea49f46b9fb2e59f006200a63;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index b9967e30..b278a0df 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6633,14 +6633,14 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "Expandable steelwall (any direction)"
   },
   {
-    "bd_expandable_wall_switch_horizontal",
     "bd_expandable_wall_switch",
-    "Switch for expandable wall (horizontal)"
+    "bd_expandable_wall_switch",
+    "Expandable wall switch"
   },
   {
-    "bd_expandable_wall_switch_vertical",
+    "bd_expandable_wall_switch.active",
     "bd_expandable_wall_switch",
-    "Switch for expandable wall (vertical)"
+    "Expandable wall switch (active)"
   },
   {
     "bd_inbox",
@@ -6705,7 +6705,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "bd_nut",
     "bd_nut",
-    "Nut with diamond"
+    "Nut (BD style)"
   },
   {
     "bd_amoeba_2",
@@ -6725,32 +6725,32 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "bd_creature_switch",
     "bd_creature_switch",
-    "Switch for creature (off)"
+    "Creature direction switch"
   },
   {
     "bd_creature_switch.active",
     "bd_creature_switch",
-    "Switch for creature (on)"
+    "Creature direction switch (active)"
   },
   {
     "bd_biter_switch_1",
     "bd_biter_switch",
-    "Switch for biter"
+    "Biter switch"
   },
   {
     "bd_biter_switch_2",
     "bd_biter_switch",
-    "Switch for biter"
+    "Biter switch"
   },
   {
     "bd_biter_switch_3",
     "bd_biter_switch",
-    "Switch for biter"
+    "Biter switch"
   },
   {
     "bd_biter_switch_4",
     "bd_biter_switch",
-    "Switch for biter"
+    "Biter switch"
   },
   {
     "bd_replicator",
@@ -6765,52 +6765,52 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "bd_replicator_switch",
     "bd_replicator_switch",
-    "Switch for replicator (off)"
+    "Replicator switch"
   },
   {
     "bd_replicator_switch.active",
     "bd_replicator_switch",
-    "Switch for replicator (on)"
+    "Replicator switch (active)"
   },
   {
     "bd_conveyor_left",
     "bd_conveyor",
-    "Conveyor belt (left)"
+    "Conveyor belt (moving left)"
   },
   {
     "bd_conveyor_left.active",
     "bd_conveyor",
-    "Conveyor belt (left) (active)"
+    "Conveyor belt (moving left) (active)"
   },
   {
     "bd_conveyor_right",
     "bd_conveyor",
-    "Conveyor belt (right)"
+    "Conveyor belt (moving right)"
   },
   {
     "bd_conveyor_right.active",
     "bd_conveyor",
-    "Conveyor belt (right) (active)"
+    "Conveyor belt (moving right) (active)"
   },
   {
     "bd_conveyor_switch",
     "bd_conveyor_switch",
-    "Switch for conveyor belt (off)"
+    "Conveyor belt power switch"
   },
   {
     "bd_conveyor_switch.active",
     "bd_conveyor_switch",
-    "Switch for conveyor belt (on)"
+    "Conveyor belt power switch (active)"
   },
   {
-    "bd_conveyor_dir_switch_normal",
     "bd_conveyor_dir_switch",
-    "Switch for conveyor belt direction (normal)"
+    "bd_conveyor_dir_switch",
+    "Conveyor belt direction switch"
   },
   {
-    "bd_conveyor_dir_switch_changed",
+    "bd_conveyor_dir_switch.active",
     "bd_conveyor_dir_switch",
-    "Switch for conveyor belt direction (changed)"
+    "Conveyor belt direction switch (active)"
   },
   {
     "bd_gravity_switch",
@@ -7107,6 +7107,11 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "bd_player",
     "Player with bomb",
   },
+  {
+    "bd_player_with_rocket_launcher",
+    "bd_player",
+    "Player with rocket launcher",
+  },
   {
     "bd_player_glued",
     "bd_player",
@@ -7117,6 +7122,36 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "bd_player",
     "Stirring player"
   },
+  {
+    "bd_rocket_launcher",
+    "bd_rocket_launcher",
+    "Rocket launcher",
+  },
+  {
+    "bd_rocket",
+    "bd_rocket",
+    "Rocket",
+  },
+  {
+    "bd_rocket.right",
+    "bd_rocket",
+    "Rocket (starts moving right)"
+  },
+  {
+    "bd_rocket.up",
+    "bd_rocket",
+    "Rocket (starts moving up)"
+  },
+  {
+    "bd_rocket.left",
+    "bd_rocket",
+    "Rocket (starts moving left)"
+  },
+  {
+    "bd_rocket.down",
+    "bd_rocket",
+    "Rocket (starts moving down)"
+  },
   {
     "bd_fake_bonus",
     "bd_fake_bonus",
@@ -7165,7 +7200,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "bd_nut.falling",
     "bd_nut",
-    "Nut with diamond (falling)"
+    "Nut (falling)"
   },
   {
     "bd_falling_wall.falling",
@@ -8376,22 +8411,22 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "internal_cascade_bd_native",
     "internal",
-    "Show native Boulder Dash elements"
+    "Show Boulder Dash native elements"
   },
   {
     "internal_cascade_bd_native.active",
     "internal",
-    "Hide native Boulder Dash elements"
+    "Hide Boulder Dash native elements"
   },
   {
     "internal_cascade_bd_effects",
     "internal",
-    "Show Boulder Dash effect elements"
+    "Show Boulder Dash effects elements"
   },
   {
     "internal_cascade_bd_effects.active",
     "internal",
-    "Hide Boulder Dash effect elements"
+    "Hide Boulder Dash effects elements"
   },
   {
     "internal_cascade_em",
@@ -8633,6 +8668,7 @@ struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
   { ".twinkling",		ACTION_TWINKLING,		FALSE	},
   { ".splashing",		ACTION_SPLASHING,		FALSE	},
   { ".hitting",			ACTION_HITTING,			FALSE	},
+  { ".flying",			ACTION_FLYING,			FALSE	},
   { ".page[1]",			ACTION_PAGE_1,			FALSE	},
   { ".page[2]",			ACTION_PAGE_2,			FALSE	},
   { ".page[3]",			ACTION_PAGE_3,			FALSE	},