projects / rocksndiamonds.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added all BD engine elements shared with R'n'D engine as native elements
[rocksndiamonds.git] / src / main.c
diff --git a/src/main.c b/src/main.c
index 44d3e11eda341599450383fdbb6c861710928f86..dde0382e2c4bee2562a92824f17b8406ae053170 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -6468,7 +6468,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "Empty space"
   },
   {
-    "bd_sand",
+    "bd_sand_1",
     "bd_sand",
     "Sand"
   },
@@ -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,12 +6705,17 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "bd_nut",
     "bd_nut",
-    "Nut with diamond"
+    "Nut"
+  },
+  {
+    "bd_amoeba_1",
+    "bd_amoeba",
+    "Amoeba 1"
   },
   {
     "bd_amoeba_2",
     "bd_amoeba",
-    "Amoeba 2 (BD style)"
+    "Amoeba 2"
   },
   {
     "bd_bladder",
@@ -6725,32 +6730,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 +6770,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",
@@ -6962,6 +6967,31 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "bd_cow",
     "Cow (starts moving down)"
   },
+  {
+    "bd_butterfly_1",
+    "bd_butterfly",
+    "Butterfly 1 (random start direction)"
+  },
+  {
+    "bd_butterfly_1.right",
+    "bd_butterfly",
+    "Butterfly 1 (starts moving right)"
+  },
+  {
+    "bd_butterfly_1.up",
+    "bd_butterfly",
+    "Butterfly 1 (starts moving up)"
+  },
+  {
+    "bd_butterfly_1.left",
+    "bd_butterfly",
+    "Butterfly 1 (starts moving left)"
+  },
+  {
+    "bd_butterfly_1.down",
+    "bd_butterfly",
+    "Butterfly 1 (starts moving down)"
+  },
   {
     "bd_butterfly_2",
     "bd_butterfly",
@@ -6987,6 +7017,31 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "bd_butterfly",
     "Butterfly 2 (starts moving down)"
   },
+  {
+    "bd_firefly_1",
+    "bd_firefly",
+    "Firefly 1 (random start direction)"
+  },
+  {
+    "bd_firefly_1.right",
+    "bd_firefly",
+    "Firefly 1 (starts moving right)"
+  },
+  {
+    "bd_firefly_1.up",
+    "bd_firefly",
+    "Firefly 1 (starts moving up)"
+  },
+  {
+    "bd_firefly_1.left",
+    "bd_firefly",
+    "Firefly 1 (starts moving left)"
+  },
+  {
+    "bd_firefly_1.down",
+    "bd_firefly",
+    "Firefly 1 (starts moving down)"
+  },
   {
     "bd_firefly_2",
     "bd_firefly",
@@ -7107,6 +7162,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 +7177,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",
@@ -7127,6 +7217,26 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "bd_covered",
     "Covered"
   },
+  {
+    "bd_wall_native",
+    "wall",
+    "Normal wall"
+  },
+  {
+    "bd_rock_native",
+    "bd_rock",
+    "Rock"
+  },
+  {
+    "bd_diamond_native",
+    "bd_diamond",
+    "Diamond"
+  },
+  {
+    "bd_magic_wall_native",
+    "bd_magic_wall",
+    "Magic wall"
+  },
   {
     "bd_sand_ball.falling",
     "bd_sand_ball",
@@ -7138,7 +7248,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "Loose sand (falling)"
   },
   {
-    "bd_rock.falling",
+    "bd_rock_native.falling",
     "bd_rock",
     "Rock (falling)"
   },
@@ -7153,7 +7263,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "Mega rock (falling)"
   },
   {
-    "bd_diamond.falling",
+    "bd_diamond_native.falling",
     "bd_diamond",
     "Diamond (falling)"
   },
@@ -7165,7 +7275,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",
@@ -7403,27 +7513,27 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "Clock birth (4)"
   },
   {
-    "bd_diamond.growing_1",
+    "bd_diamond_native.growing_1",
     "bd_diamond",
     "Diamond birth (1)"
   },
   {
-    "bd_diamond.growing_2",
+    "bd_diamond_native.growing_2",
     "bd_diamond",
     "Diamond birth (2)"
   },
   {
-    "bd_diamond.growing_3",
+    "bd_diamond_native.growing_3",
     "bd_diamond",
     "Diamond birth (3)"
   },
   {
-    "bd_diamond.growing_4",
+    "bd_diamond_native.growing_4",
     "bd_diamond",
     "Diamond birth (4)"
   },
   {
-    "bd_diamond.growing_5",
+    "bd_diamond_native.growing_5",
     "bd_diamond",
     "Diamond birth (5)"
   },
@@ -7453,22 +7563,22 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "Explosion (5)"
   },
   {
-    "bd_rock.growing_1",
+    "bd_rock_native.growing_1",
     "bd_rock",
     "Rock birth (1)"
   },
   {
-    "bd_rock.growing_2",
+    "bd_rock_native.growing_2",
     "bd_rock",
     "Rock birth (2)"
   },
   {
-    "bd_rock.growing_3",
+    "bd_rock_native.growing_3",
     "bd_rock",
     "Rock birth (3)"
   },
   {
-    "bd_rock.growing_4",
+    "bd_rock_native.growing_4",
     "bd_rock",
     "Rock birth (4)"
   },
@@ -8023,6 +8133,11 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "df_mine",
     "Active mine"
   },
+  {
+    "bd_magic_wall_native.active",
+    "magic_wall",
+    "-"
+  },
 
   // --------------------------------------------------------------------------
   // "unreal" (and therefore not drawable) runtime elements
@@ -8283,6 +8398,11 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "bd_default",
     "-"
   },
+  {
+    "[bd_native_default]",
+    "bd_native_default",
+    "-"
+  },
   {
     "[sp_default]",
     "sp_default",
Rocks'n'Diamonds