changed logic and defaults for falling element sounds in BD engine

[rocksndiamonds.git] / src / conf_gfx.c

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index fa517c7e49adb71be1f951ed9e0a60ea4ea0fa99..95ac605c4a5b1c59037cf14767515558a6ca945d 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -442,11 +442,19 @@ struct ConfigInfo image_config[] =
   { "bdx_magic_wall.active",                           UNDEFINED_FILENAME              },
   { "bdx_magic_wall.active.clone_from",                        "bd_magic_wall.active"          },
 
-  { "bdx_amoeba_1",                                    UNDEFINED_FILENAME              },
-  { "bdx_amoeba_1.clone_from",                         "bd_amoeba"                     },
-
-  { "bdx_amoeba_2",                                    UNDEFINED_FILENAME              },
-  { "bdx_amoeba_2.clone_from",                         "bd_amoeba"                     },
+  { "bdx_amoeba_1",                                    "RocksBD.png"                   },
+  { "bdx_amoeba_1.xpos",                               "4"                             },
+  { "bdx_amoeba_1.ypos",                               "11"                            },
+  { "bdx_amoeba_1.frames",                             "4"                             },
+  { "bdx_amoeba_1.delay",                              "4"                             },
+  { "bdx_amoeba_1.anim_mode",                          "pingpong2"                     },
+
+  { "bdx_amoeba_2",                                    "RocksBD.png"                   },
+  { "bdx_amoeba_2.xpos",                               "8"                             },
+  { "bdx_amoeba_2.ypos",                               "11"                            },
+  { "bdx_amoeba_2.frames",                             "4"                             },
+  { "bdx_amoeba_2.delay",                              "4"                             },
+  { "bdx_amoeba_2.anim_mode",                          "pingpong2"                     },
 
   { "bdx_butterfly_1",                                 UNDEFINED_FILENAME              },
   { "bdx_butterfly_1.clone_from",                      "bd_butterfly"                  },
@@ -687,10 +695,10 @@ struct ConfigInfo image_config[] =
   { "bdx_steelwall_sloped_down_right.frames",          "1"                             },
 
   { "bdx_steelwall_explodable",                                UNDEFINED_FILENAME              },
-  { "bdx_steelwall_explodable.clone_from",             "bd_steelwall"                  },
+  { "bdx_steelwall_explodable.clone_from",             "bdx_steelwall"                 },
 
   { "bdx_steelwall_diggable",                          UNDEFINED_FILENAME              },
-  { "bdx_steelwall_diggable.clone_from",               "bd_steelwall"                  },
+  { "bdx_steelwall_diggable.clone_from",               "bdx_steelwall"                 },
   { "bdx_steelwall_diggable.EDITOR",                   "RocksBD2.png"                  },
   { "bdx_steelwall_diggable.EDITOR.xpos",              "6"                             },
   { "bdx_steelwall_diggable.EDITOR.ypos",              "0"                             },
@@ -714,19 +722,19 @@ struct ConfigInfo image_config[] =
   { "bdx_expandable_wall_any.EDITOR.ypos",             "1"                             },
 
   { "bdx_expandable_steelwall_horizontal",             UNDEFINED_FILENAME              },
-  { "bdx_expandable_steelwall_horizontal.clone_from",  "bd_steelwall"                  },
+  { "bdx_expandable_steelwall_horizontal.clone_from",  "bdx_steelwall"                 },
   { "bdx_expandable_steelwall_horizontal.EDITOR",      "RocksBD2.png"                  },
   { "bdx_expandable_steelwall_horizontal.EDITOR.xpos", "0"                             },
   { "bdx_expandable_steelwall_horizontal.EDITOR.ypos", "1"                             },
 
   { "bdx_expandable_steelwall_vertical",               UNDEFINED_FILENAME              },
-  { "bdx_expandable_steelwall_vertical.clone_from",    "bd_steelwall"                  },
+  { "bdx_expandable_steelwall_vertical.clone_from",    "bdx_steelwall"                 },
   { "bdx_expandable_steelwall_vertical.EDITOR",                "RocksBD2.png"                  },
   { "bdx_expandable_steelwall_vertical.EDITOR.xpos",   "1"                             },
   { "bdx_expandable_steelwall_vertical.EDITOR.ypos",   "1"                             },
 
   { "bdx_expandable_steelwall_any",                    UNDEFINED_FILENAME              },
-  { "bdx_expandable_steelwall_any.clone_from",         "bd_steelwall"                  },
+  { "bdx_expandable_steelwall_any.clone_from",         "bdx_steelwall"                 },
   { "bdx_expandable_steelwall_any.EDITOR",             "RocksBD2.png"                  },
   { "bdx_expandable_steelwall_any.EDITOR.xpos",                "2"                             },
   { "bdx_expandable_steelwall_any.EDITOR.ypos",                "1"                             },
@@ -774,13 +782,13 @@ struct ConfigInfo image_config[] =
   { "bdx_exit_open.EDITOR.ypos",                       "0"                             },
 
   { "bdx_invisible_exit_closed",                       UNDEFINED_FILENAME              },
-  { "bdx_invisible_exit_closed.clone_from",            "bd_steelwall"                  },
+  { "bdx_invisible_exit_closed.clone_from",            "bdx_steelwall"                 },
   { "bdx_invisible_exit_closed.EDITOR",                        "RocksBD2.png"                  },
   { "bdx_invisible_exit_closed.EDITOR.xpos",           "4"                             },
   { "bdx_invisible_exit_closed.EDITOR.ypos",           "0"                             },
 
   { "bdx_invisible_exit_open",                         UNDEFINED_FILENAME              },
-  { "bdx_invisible_exit_open.clone_from",              "bd_steelwall"                  },
+  { "bdx_invisible_exit_open.clone_from",              "bdx_steelwall"                 },
   { "bdx_invisible_exit_open.EDITOR",                  "RocksBD2.png"                  },
   { "bdx_invisible_exit_open.EDITOR.xpos",             "2"                             },
   { "bdx_invisible_exit_open.EDITOR.ypos",             "0"                             },
@@ -849,8 +857,8 @@ struct ConfigInfo image_config[] =
   { "bdx_nut.falling.EDITOR.ypos",                     "2"                             },
 
   { "bdx_bladder",                                     "RocksBD.png"                   },
-  { "bdx_bladder.xpos",                                        "4"                             },
-  { "bdx_bladder.ypos",                                        "11"                            },
+  { "bdx_bladder.xpos",                                        "8"                             },
+  { "bdx_bladder.ypos",                                        "12"                            },
   { "bdx_bladder.frames",                              "4"                             },
   { "bdx_bladder.delay",                               "4"                             },
   { "bdx_bladder.anim_mode",                           "pingpong2"                     },