changed order of BD style graphics and sounds (no functional change)

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 71d13cd00f4726c8e26146d083259eedc5c6666b..fa517c7e49adb71be1f951ed9e0a60ea4ea0fa99 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -103,93 +103,6 @@ struct ConfigInfo image_config[] =
 
   // images for Boulder Dash style elements and actions
 
-  { "[bdx_default].exploding",                         "RocksElements.png"             },
-  { "[bdx_default].exploding.xpos",                    "0"                             },
-  { "[bdx_default].exploding.ypos",                    "4"                             },
-  { "[bdx_default].exploding.frames",                  "8"                             },
-  { "[bdx_default].exploding.delay",                   "5"                             },
-  { "[bdx_default].exploding.anim_mode",               "linear"                        },
-
-  { "[bdx_default].growing",                           "RocksElements.png"             },
-  { "[bdx_default].growing.xpos",                      "0"                             },
-  { "[bdx_default].growing.ypos",                      "4"                             },
-  { "[bdx_default].growing.frames",                    "8"                             },
-  { "[bdx_default].growing.delay",                     "4"                             },
-  { "[bdx_default].growing.anim_mode",                 "linear"                        },
-
-  { "bdx_player",                                      UNDEFINED_FILENAME              },
-  { "bdx_player.clone_from",                           "player_1"                      },
-  { "bdx_player.down",                                 UNDEFINED_FILENAME              },
-  { "bdx_player.down.clone_from",                      "player_1.down"                 },
-  { "bdx_player.up",                                   UNDEFINED_FILENAME              },
-  { "bdx_player.up.clone_from",                                "player_1.up"                   },
-  { "bdx_player.left",                                 UNDEFINED_FILENAME              },
-  { "bdx_player.left.clone_from",                      "player_1.left"                 },
-  { "bdx_player.right",                                        UNDEFINED_FILENAME              },
-  { "bdx_player.right.clone_from",                     "player_1.right"                },
-  { "bdx_player.moving.down",                          UNDEFINED_FILENAME              },
-  { "bdx_player.moving.down.clone_from",               "player_1.moving.down"          },
-  { "bdx_player.moving.up",                            UNDEFINED_FILENAME              },
-  { "bdx_player.moving.up.clone_from",                 "player_1.moving.up"            },
-  { "bdx_player.moving.left",                          UNDEFINED_FILENAME              },
-  { "bdx_player.moving.left.clone_from",               "player_1.moving.left"          },
-  { "bdx_player.moving.right",                         UNDEFINED_FILENAME              },
-  { "bdx_player.moving.right.clone_from",              "player_1.moving.right"         },
-  { "bdx_player.digging.down",                         UNDEFINED_FILENAME              },
-  { "bdx_player.digging.down.clone_from",              "player_1.digging.down"         },
-  { "bdx_player.digging.up",                           UNDEFINED_FILENAME              },
-  { "bdx_player.digging.up.clone_from",                        "player_1.digging.up"           },
-  { "bdx_player.digging.left",                         UNDEFINED_FILENAME              },
-  { "bdx_player.digging.left.clone_from",              "player_1.digging.left"         },
-  { "bdx_player.digging.right",                                UNDEFINED_FILENAME              },
-  { "bdx_player.digging.right.clone_from",             "player_1.digging.right"        },
-  { "bdx_player.collecting.down",                      UNDEFINED_FILENAME              },
-  { "bdx_player.collecting.down.clone_from",           "player_1.collecting.down"      },
-  { "bdx_player.collecting.up",                                UNDEFINED_FILENAME              },
-  { "bdx_player.collecting.up.clone_from",             "player_1.collecting.up"        },
-  { "bdx_player.collecting.left",                      UNDEFINED_FILENAME              },
-  { "bdx_player.collecting.left.clone_from",           "player_1.collecting.left"      },
-  { "bdx_player.collecting.right",                     UNDEFINED_FILENAME              },
-  { "bdx_player.collecting.right.clone_from",          "player_1.collecting.right"     },
-  { "bdx_player.pushing.down",                         UNDEFINED_FILENAME              },
-  { "bdx_player.pushing.down.clone_from",              "player_1.pushing.down"         },
-  { "bdx_player.pushing.up",                           UNDEFINED_FILENAME              },
-  { "bdx_player.pushing.up.clone_from",                        "player_1.pushing.up"           },
-  { "bdx_player.pushing.left",                         UNDEFINED_FILENAME              },
-  { "bdx_player.pushing.left.clone_from",              "player_1.pushing.left"         },
-  { "bdx_player.pushing.right",                                UNDEFINED_FILENAME              },
-  { "bdx_player.pushing.right.clone_from",             "player_1.pushing.right"        },
-  { "bdx_player.snapping.down",                                UNDEFINED_FILENAME              },
-  { "bdx_player.snapping.down.clone_from",             "player_1.snapping.down"        },
-  { "bdx_player.snapping.up",                          UNDEFINED_FILENAME              },
-  { "bdx_player.snapping.up.clone_from",               "player_1.snapping.up"          },
-  { "bdx_player.snapping.left",                                UNDEFINED_FILENAME              },
-  { "bdx_player.snapping.left.clone_from",             "player_1.snapping.left"        },
-  { "bdx_player.snapping.right",                       UNDEFINED_FILENAME              },
-  { "bdx_player.snapping.right.clone_from",            "player_1.snapping.right"       },
-
-  { "bdx_player_glued",                                        UNDEFINED_FILENAME              },
-  { "bdx_player_glued.clone_from",                     "bdx_player"                    },
-  { "bdx_player_glued.EDITOR",                         "RocksBD2.png"                  },
-  { "bdx_player_glued.EDITOR.xpos",                    "1"                             },
-  { "bdx_player_glued.EDITOR.ypos",                    "0"                             },
-
-  { "bdx_player_with_bomb",                            "RocksBD.png"                   },
-  { "bdx_player_with_bomb.xpos",                       "8"                             },
-  { "bdx_player_with_bomb.ypos",                       "7"                             },
-  { "bdx_player_with_bomb.frames",                     "1"                             },
-
-  { "bdx_player_with_rocket_launcher",                 "RocksBD.png"                   },
-  { "bdx_player_with_rocket_launcher.xpos",            "10"                            },
-  { "bdx_player_with_rocket_launcher.ypos",            "7"                             },
-  { "bdx_player_with_rocket_launcher.frames",          "1"                             },
-
-  { "bdx_player_stirring",                             "RocksBD.png"                   },
-  { "bdx_player_stirring.xpos",                                "8"                             },
-  { "bdx_player_stirring.ypos",                                "8"                             },
-  { "bdx_player_stirring.frames",                      "4"                             },
-  { "bdx_player_stirring.delay",                       "4"                             },
-
   { "bd_wall",                                         "RocksDC.png"                   },
   { "bd_wall.xpos",                                    "12"                            },
   { "bd_wall.ypos",                                    "9"                             },
@@ -198,11 +111,6 @@ struct ConfigInfo image_config[] =
   { "bd_wall.EDITOR.xpos",                             "14"                            },
   { "bd_wall.EDITOR.ypos",                             "13"                            },
 
-  { "bdx_wall",                                                UNDEFINED_FILENAME              },
-  { "bdx_wall.clone_from",                             "bd_wall"                       },
-  { "bdx_wall.EDITOR",                                 UNDEFINED_FILENAME              },
-  { "bdx_wall.EDITOR.clone_from",                      "bd_wall.EDITOR"                },
-
   { "bd_rock",                                         "RocksDC.png"                   },
   { "bd_rock.xpos",                                    "12"                            },
   { "bd_rock.ypos",                                    "10"                            },
@@ -235,22 +143,6 @@ struct ConfigInfo image_config[] =
   { "bd_rock.pushing.right.start_frame",               "1"                             },
   { "bd_rock.pushing.right.delay",                     "2"                             },
 
-  { "bdx_rock",                                                UNDEFINED_FILENAME              },
-  { "bdx_rock.clone_from",                             "bd_rock"                       },
-  { "bdx_rock.EDITOR",                                 UNDEFINED_FILENAME              },
-  { "bdx_rock.EDITOR.clone_from",                      "bd_rock.EDITOR"                },
-  { "bdx_rock.moving.left",                            UNDEFINED_FILENAME              },
-  { "bdx_rock.moving.left.clone_from",                 "bd_rock.moving.left"           },
-  { "bdx_rock.moving.right",                           UNDEFINED_FILENAME              },
-  { "bdx_rock.moving.right.clone_from",                        "bd_rock.moving.right"          },
-  { "bdx_rock.pushing.left",                           UNDEFINED_FILENAME              },
-  { "bdx_rock.pushing.left.clone_from",                        "bd_rock.pushing.left"          },
-  { "bdx_rock.pushing.right",                          UNDEFINED_FILENAME              },
-  { "bdx_rock.pushing.right.clone_from",               "bd_rock.pushing.right"         },
-  { "bdx_rock.falling.EDITOR",                         "RocksBD2.png"                  },
-  { "bdx_rock.falling.EDITOR.xpos",                    "1"                             },
-  { "bdx_rock.falling.EDITOR.ypos",                    "3"                             },
-
   { "bd_diamond",                                      "RocksElements.png"             },
   { "bd_diamond.xpos",                                 "0"                             },
   { "bd_diamond.ypos",                                 "10"                            },
@@ -273,18 +165,6 @@ struct ConfigInfo image_config[] =
   { "bd_diamond.collecting.frames",                    "7"                             },
   { "bd_diamond.collecting.anim_mode",                 "linear"                        },
 
-  { "bdx_diamond",                                     UNDEFINED_FILENAME              },
-  { "bdx_diamond.clone_from",                          "bd_diamond"                    },
-  { "bdx_diamond.moving",                              UNDEFINED_FILENAME              },
-  { "bdx_diamond.moving.clone_from",                   "bd_diamond.moving"             },
-  { "bdx_diamond.falling",                             UNDEFINED_FILENAME              },
-  { "bdx_diamond.falling.clone_from",                  "bd_diamond.falling"            },
-  { "bdx_diamond.collecting",                          UNDEFINED_FILENAME              },
-  { "bdx_diamond.collecting.clone_from",               "bd_diamond.collecting"         },
-  { "bdx_diamond.falling.EDITOR",                      "RocksBD2.png"                  },
-  { "bdx_diamond.falling.EDITOR.xpos",                 "0"                             },
-  { "bdx_diamond.falling.EDITOR.ypos",                 "3"                             },
-
   { "bd_magic_wall",                                   "RocksElements.png"             },
   { "bd_magic_wall.xpos",                              "12"                            },
   { "bd_magic_wall.ypos",                              "10"                            },
@@ -322,11 +202,6 @@ struct ConfigInfo image_config[] =
   { "bd_magic_wall_dead.ypos",                         "10"                            },
   { "bd_magic_wall_dead.frames",                       "1"                             },
 
-  { "bdx_magic_wall",                                  UNDEFINED_FILENAME              },
-  { "bdx_magic_wall.clone_from",                       "bd_magic_wall"                 },
-  { "bdx_magic_wall.active",                           UNDEFINED_FILENAME              },
-  { "bdx_magic_wall.active.clone_from",                        "bd_magic_wall.active"          },
-
   { "bd_amoeba",                                       "RocksElements.png"             },
   { "bd_amoeba.xpos",                                  "8"                             },
   { "bd_amoeba.ypos",                                  "6"                             },
@@ -336,12 +211,6 @@ struct ConfigInfo image_config[] =
   { "bd_amoeba.EDITOR.xpos",                           "8"                             },
   { "bd_amoeba.EDITOR.ypos",                           "7"                             },
 
-  { "bdx_amoeba_1",                                    UNDEFINED_FILENAME              },
-  { "bdx_amoeba_1.clone_from",                         "bd_amoeba"                     },
-
-  { "bdx_amoeba_2",                                    UNDEFINED_FILENAME              },
-  { "bdx_amoeba_2.clone_from",                         "bd_amoeba"                     },
-
   { "bd_butterfly",                                    "RocksElements.png"             },
   { "bd_butterfly.xpos",                               "4"                             },
   { "bd_butterfly.ypos",                               "12"                            },
@@ -390,6 +259,195 @@ struct ConfigInfo image_config[] =
   { "bd_butterfly.down.EDITOR.xpos",                   "11"                            },
   { "bd_butterfly.down.EDITOR.ypos",                   "12"                            },
 
+  { "bd_firefly",                                      "RocksElements.png"             },
+  { "bd_firefly.xpos",                                 "6"                             },
+  { "bd_firefly.ypos",                                 "12"                            },
+  { "bd_firefly.frames",                               "2"                             },
+  { "bd_firefly.anim_mode",                            "pingpong"                      },
+  { "bd_firefly.delay",                                        "4"                             },
+  { "bd_firefly.global_sync",                          "true"                          },
+  { "bd_firefly.right",                                        "RocksElements.png"             },
+  { "bd_firefly.right.xpos",                           "6"                             },
+  { "bd_firefly.right.ypos",                           "12"                            },
+  { "bd_firefly.right.frames",                         "2"                             },
+  { "bd_firefly.right.anim_mode",                      "pingpong"                      },
+  { "bd_firefly.right.delay",                          "4"                             },
+  { "bd_firefly.right.global_sync",                    "true"                          },
+  { "bd_firefly.right.EDITOR",                         "RocksElements.png"             },
+  { "bd_firefly.right.EDITOR.xpos",                    "12"                            },
+  { "bd_firefly.right.EDITOR.ypos",                    "12"                            },
+  { "bd_firefly.up",                                   "RocksElements.png"             },
+  { "bd_firefly.up.xpos",                              "6"                             },
+  { "bd_firefly.up.ypos",                              "12"                            },
+  { "bd_firefly.up.frames",                            "2"                             },
+  { "bd_firefly.up.anim_mode",                         "pingpong"                      },
+  { "bd_firefly.up.delay",                             "4"                             },
+  { "bd_firefly.up.global_sync",                       "true"                          },
+  { "bd_firefly.up.EDITOR",                            "RocksElements.png"             },
+  { "bd_firefly.up.EDITOR.xpos",                       "13"                            },
+  { "bd_firefly.up.EDITOR.ypos",                       "12"                            },
+  { "bd_firefly.left",                                 "RocksElements.png"             },
+  { "bd_firefly.left.xpos",                            "6"                             },
+  { "bd_firefly.left.ypos",                            "12"                            },
+  { "bd_firefly.left.frames",                          "2"                             },
+  { "bd_firefly.left.anim_mode",                       "pingpong"                      },
+  { "bd_firefly.left.delay",                           "4"                             },
+  { "bd_firefly.left.global_sync",                     "true"                          },
+  { "bd_firefly.left.EDITOR",                          "RocksElements.png"             },
+  { "bd_firefly.left.EDITOR.xpos",                     "14"                            },
+  { "bd_firefly.left.EDITOR.ypos",                     "12"                            },
+  { "bd_firefly.down",                                 "RocksElements.png"             },
+  { "bd_firefly.down.xpos",                            "6"                             },
+  { "bd_firefly.down.ypos",                            "12"                            },
+  { "bd_firefly.down.frames",                          "2"                             },
+  { "bd_firefly.down.anim_mode",                       "pingpong"                      },
+  { "bd_firefly.down.delay",                           "4"                             },
+  { "bd_firefly.down.global_sync",                     "true"                          },
+  { "bd_firefly.down.EDITOR",                          "RocksElements.png"             },
+  { "bd_firefly.down.EDITOR.xpos",                     "15"                            },
+  { "bd_firefly.down.EDITOR.ypos",                     "12"                            },
+
+  { "bd_expandable_wall",                              "RocksElements.png"             },
+  { "bd_expandable_wall.xpos",                         "5"                             },
+  { "bd_expandable_wall.ypos",                         "9"                             },
+  { "bd_expandable_wall.frames",                       "1"                             },
+  { "bd_expandable_wall.EDITOR",                       "RocksDC.png"                   },
+  { "bd_expandable_wall.EDITOR.xpos",                  "15"                            },
+  { "bd_expandable_wall.EDITOR.ypos",                  "15"                            },
+
+  // images for Boulder Dash style elements and actions (native game engine)
+
+  { "[bdx_default].exploding",                         "RocksElements.png"             },
+  { "[bdx_default].exploding.xpos",                    "0"                             },
+  { "[bdx_default].exploding.ypos",                    "4"                             },
+  { "[bdx_default].exploding.frames",                  "8"                             },
+  { "[bdx_default].exploding.delay",                   "5"                             },
+  { "[bdx_default].exploding.anim_mode",               "linear"                        },
+
+  { "[bdx_default].growing",                           "RocksElements.png"             },
+  { "[bdx_default].growing.xpos",                      "0"                             },
+  { "[bdx_default].growing.ypos",                      "4"                             },
+  { "[bdx_default].growing.frames",                    "8"                             },
+  { "[bdx_default].growing.delay",                     "4"                             },
+  { "[bdx_default].growing.anim_mode",                 "linear"                        },
+
+  { "bdx_player",                                      UNDEFINED_FILENAME              },
+  { "bdx_player.clone_from",                           "player_1"                      },
+  { "bdx_player.down",                                 UNDEFINED_FILENAME              },
+  { "bdx_player.down.clone_from",                      "player_1.down"                 },
+  { "bdx_player.up",                                   UNDEFINED_FILENAME              },
+  { "bdx_player.up.clone_from",                                "player_1.up"                   },
+  { "bdx_player.left",                                 UNDEFINED_FILENAME              },
+  { "bdx_player.left.clone_from",                      "player_1.left"                 },
+  { "bdx_player.right",                                        UNDEFINED_FILENAME              },
+  { "bdx_player.right.clone_from",                     "player_1.right"                },
+  { "bdx_player.moving.down",                          UNDEFINED_FILENAME              },
+  { "bdx_player.moving.down.clone_from",               "player_1.moving.down"          },
+  { "bdx_player.moving.up",                            UNDEFINED_FILENAME              },
+  { "bdx_player.moving.up.clone_from",                 "player_1.moving.up"            },
+  { "bdx_player.moving.left",                          UNDEFINED_FILENAME              },
+  { "bdx_player.moving.left.clone_from",               "player_1.moving.left"          },
+  { "bdx_player.moving.right",                         UNDEFINED_FILENAME              },
+  { "bdx_player.moving.right.clone_from",              "player_1.moving.right"         },
+  { "bdx_player.digging.down",                         UNDEFINED_FILENAME              },
+  { "bdx_player.digging.down.clone_from",              "player_1.digging.down"         },
+  { "bdx_player.digging.up",                           UNDEFINED_FILENAME              },
+  { "bdx_player.digging.up.clone_from",                        "player_1.digging.up"           },
+  { "bdx_player.digging.left",                         UNDEFINED_FILENAME              },
+  { "bdx_player.digging.left.clone_from",              "player_1.digging.left"         },
+  { "bdx_player.digging.right",                                UNDEFINED_FILENAME              },
+  { "bdx_player.digging.right.clone_from",             "player_1.digging.right"        },
+  { "bdx_player.collecting.down",                      UNDEFINED_FILENAME              },
+  { "bdx_player.collecting.down.clone_from",           "player_1.collecting.down"      },
+  { "bdx_player.collecting.up",                                UNDEFINED_FILENAME              },
+  { "bdx_player.collecting.up.clone_from",             "player_1.collecting.up"        },
+  { "bdx_player.collecting.left",                      UNDEFINED_FILENAME              },
+  { "bdx_player.collecting.left.clone_from",           "player_1.collecting.left"      },
+  { "bdx_player.collecting.right",                     UNDEFINED_FILENAME              },
+  { "bdx_player.collecting.right.clone_from",          "player_1.collecting.right"     },
+  { "bdx_player.pushing.down",                         UNDEFINED_FILENAME              },
+  { "bdx_player.pushing.down.clone_from",              "player_1.pushing.down"         },
+  { "bdx_player.pushing.up",                           UNDEFINED_FILENAME              },
+  { "bdx_player.pushing.up.clone_from",                        "player_1.pushing.up"           },
+  { "bdx_player.pushing.left",                         UNDEFINED_FILENAME              },
+  { "bdx_player.pushing.left.clone_from",              "player_1.pushing.left"         },
+  { "bdx_player.pushing.right",                                UNDEFINED_FILENAME              },
+  { "bdx_player.pushing.right.clone_from",             "player_1.pushing.right"        },
+  { "bdx_player.snapping.down",                                UNDEFINED_FILENAME              },
+  { "bdx_player.snapping.down.clone_from",             "player_1.snapping.down"        },
+  { "bdx_player.snapping.up",                          UNDEFINED_FILENAME              },
+  { "bdx_player.snapping.up.clone_from",               "player_1.snapping.up"          },
+  { "bdx_player.snapping.left",                                UNDEFINED_FILENAME              },
+  { "bdx_player.snapping.left.clone_from",             "player_1.snapping.left"        },
+  { "bdx_player.snapping.right",                       UNDEFINED_FILENAME              },
+  { "bdx_player.snapping.right.clone_from",            "player_1.snapping.right"       },
+
+  { "bdx_player_glued",                                        UNDEFINED_FILENAME              },
+  { "bdx_player_glued.clone_from",                     "bdx_player"                    },
+  { "bdx_player_glued.EDITOR",                         "RocksBD2.png"                  },
+  { "bdx_player_glued.EDITOR.xpos",                    "1"                             },
+  { "bdx_player_glued.EDITOR.ypos",                    "0"                             },
+
+  { "bdx_player_with_bomb",                            "RocksBD.png"                   },
+  { "bdx_player_with_bomb.xpos",                       "8"                             },
+  { "bdx_player_with_bomb.ypos",                       "7"                             },
+  { "bdx_player_with_bomb.frames",                     "1"                             },
+
+  { "bdx_player_with_rocket_launcher",                 "RocksBD.png"                   },
+  { "bdx_player_with_rocket_launcher.xpos",            "10"                            },
+  { "bdx_player_with_rocket_launcher.ypos",            "7"                             },
+  { "bdx_player_with_rocket_launcher.frames",          "1"                             },
+
+  { "bdx_player_stirring",                             "RocksBD.png"                   },
+  { "bdx_player_stirring.xpos",                                "8"                             },
+  { "bdx_player_stirring.ypos",                                "8"                             },
+  { "bdx_player_stirring.frames",                      "4"                             },
+  { "bdx_player_stirring.delay",                       "4"                             },
+
+  { "bdx_wall",                                                UNDEFINED_FILENAME              },
+  { "bdx_wall.clone_from",                             "bd_wall"                       },
+  { "bdx_wall.EDITOR",                                 UNDEFINED_FILENAME              },
+  { "bdx_wall.EDITOR.clone_from",                      "bd_wall.EDITOR"                },
+
+  { "bdx_rock",                                                UNDEFINED_FILENAME              },
+  { "bdx_rock.clone_from",                             "bd_rock"                       },
+  { "bdx_rock.EDITOR",                                 UNDEFINED_FILENAME              },
+  { "bdx_rock.EDITOR.clone_from",                      "bd_rock.EDITOR"                },
+  { "bdx_rock.moving.left",                            UNDEFINED_FILENAME              },
+  { "bdx_rock.moving.left.clone_from",                 "bd_rock.moving.left"           },
+  { "bdx_rock.moving.right",                           UNDEFINED_FILENAME              },
+  { "bdx_rock.moving.right.clone_from",                        "bd_rock.moving.right"          },
+  { "bdx_rock.pushing.left",                           UNDEFINED_FILENAME              },
+  { "bdx_rock.pushing.left.clone_from",                        "bd_rock.pushing.left"          },
+  { "bdx_rock.pushing.right",                          UNDEFINED_FILENAME              },
+  { "bdx_rock.pushing.right.clone_from",               "bd_rock.pushing.right"         },
+  { "bdx_rock.falling.EDITOR",                         "RocksBD2.png"                  },
+  { "bdx_rock.falling.EDITOR.xpos",                    "1"                             },
+  { "bdx_rock.falling.EDITOR.ypos",                    "3"                             },
+
+  { "bdx_diamond",                                     UNDEFINED_FILENAME              },
+  { "bdx_diamond.clone_from",                          "bd_diamond"                    },
+  { "bdx_diamond.moving",                              UNDEFINED_FILENAME              },
+  { "bdx_diamond.moving.clone_from",                   "bd_diamond.moving"             },
+  { "bdx_diamond.falling",                             UNDEFINED_FILENAME              },
+  { "bdx_diamond.falling.clone_from",                  "bd_diamond.falling"            },
+  { "bdx_diamond.collecting",                          UNDEFINED_FILENAME              },
+  { "bdx_diamond.collecting.clone_from",               "bd_diamond.collecting"         },
+  { "bdx_diamond.falling.EDITOR",                      "RocksBD2.png"                  },
+  { "bdx_diamond.falling.EDITOR.xpos",                 "0"                             },
+  { "bdx_diamond.falling.EDITOR.ypos",                 "3"                             },
+
+  { "bdx_magic_wall",                                  UNDEFINED_FILENAME              },
+  { "bdx_magic_wall.clone_from",                       "bd_magic_wall"                 },
+  { "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_butterfly_1",                                 UNDEFINED_FILENAME              },
   { "bdx_butterfly_1.clone_from",                      "bd_butterfly"                  },
   { "bdx_butterfly_1.right",                           UNDEFINED_FILENAME              },
@@ -449,54 +507,6 @@ struct ConfigInfo image_config[] =
   { "bdx_butterfly_2.down.EDITOR.xpos",                        "7"                             },
   { "bdx_butterfly_2.down.EDITOR.ypos",                        "0"                             },
 
-  { "bd_firefly",                                      "RocksElements.png"             },
-  { "bd_firefly.xpos",                                 "6"                             },
-  { "bd_firefly.ypos",                                 "12"                            },
-  { "bd_firefly.frames",                               "2"                             },
-  { "bd_firefly.anim_mode",                            "pingpong"                      },
-  { "bd_firefly.delay",                                        "4"                             },
-  { "bd_firefly.global_sync",                          "true"                          },
-  { "bd_firefly.right",                                        "RocksElements.png"             },
-  { "bd_firefly.right.xpos",                           "6"                             },
-  { "bd_firefly.right.ypos",                           "12"                            },
-  { "bd_firefly.right.frames",                         "2"                             },
-  { "bd_firefly.right.anim_mode",                      "pingpong"                      },
-  { "bd_firefly.right.delay",                          "4"                             },
-  { "bd_firefly.right.global_sync",                    "true"                          },
-  { "bd_firefly.right.EDITOR",                         "RocksElements.png"             },
-  { "bd_firefly.right.EDITOR.xpos",                    "12"                            },
-  { "bd_firefly.right.EDITOR.ypos",                    "12"                            },
-  { "bd_firefly.up",                                   "RocksElements.png"             },
-  { "bd_firefly.up.xpos",                              "6"                             },
-  { "bd_firefly.up.ypos",                              "12"                            },
-  { "bd_firefly.up.frames",                            "2"                             },
-  { "bd_firefly.up.anim_mode",                         "pingpong"                      },
-  { "bd_firefly.up.delay",                             "4"                             },
-  { "bd_firefly.up.global_sync",                       "true"                          },
-  { "bd_firefly.up.EDITOR",                            "RocksElements.png"             },
-  { "bd_firefly.up.EDITOR.xpos",                       "13"                            },
-  { "bd_firefly.up.EDITOR.ypos",                       "12"                            },
-  { "bd_firefly.left",                                 "RocksElements.png"             },
-  { "bd_firefly.left.xpos",                            "6"                             },
-  { "bd_firefly.left.ypos",                            "12"                            },
-  { "bd_firefly.left.frames",                          "2"                             },
-  { "bd_firefly.left.anim_mode",                       "pingpong"                      },
-  { "bd_firefly.left.delay",                           "4"                             },
-  { "bd_firefly.left.global_sync",                     "true"                          },
-  { "bd_firefly.left.EDITOR",                          "RocksElements.png"             },
-  { "bd_firefly.left.EDITOR.xpos",                     "14"                            },
-  { "bd_firefly.left.EDITOR.ypos",                     "12"                            },
-  { "bd_firefly.down",                                 "RocksElements.png"             },
-  { "bd_firefly.down.xpos",                            "6"                             },
-  { "bd_firefly.down.ypos",                            "12"                            },
-  { "bd_firefly.down.frames",                          "2"                             },
-  { "bd_firefly.down.anim_mode",                       "pingpong"                      },
-  { "bd_firefly.down.delay",                           "4"                             },
-  { "bd_firefly.down.global_sync",                     "true"                          },
-  { "bd_firefly.down.EDITOR",                          "RocksElements.png"             },
-  { "bd_firefly.down.EDITOR.xpos",                     "15"                            },
-  { "bd_firefly.down.EDITOR.ypos",                     "12"                            },
-
   { "bdx_firefly_1",                                   UNDEFINED_FILENAME              },
   { "bdx_firefly_1.clone_from",                                "bd_firefly"                    },
   { "bdx_firefly_1.right",                             UNDEFINED_FILENAME              },
@@ -3918,14 +3928,6 @@ struct ConfigInfo image_config[] =
   { "expandable_steelwall_any.EDITOR.xpos",            "8"                             },
   { "expandable_steelwall_any.EDITOR.ypos",            "2"                             },
 
-  { "bd_expandable_wall",                              "RocksElements.png"             },
-  { "bd_expandable_wall.xpos",                         "5"                             },
-  { "bd_expandable_wall.ypos",                         "9"                             },
-  { "bd_expandable_wall.frames",                       "1"                             },
-  { "bd_expandable_wall.EDITOR",                       "RocksDC.png"                   },
-  { "bd_expandable_wall.EDITOR.xpos",                  "15"                            },
-  { "bd_expandable_wall.EDITOR.ypos",                  "15"                            },
-
   { "expandable_wall.growing.left",                    "RocksElements.png"             },
   { "expandable_wall.growing.left.xpos",               "8"                             },
   { "expandable_wall.growing.left.ypos",               "10"                            },

diff --git a/src/conf_snd.c b/src/conf_snd.c
index 1ce3e643447fa26661bdb4c21df89dd21a1a5ef4..3b38b50d499c1f5c90cab10b98ce52fa415bc061 100644 (file)
--- a/src/conf_snd.c
+++ b/src/conf_snd.c
@@ -43,22 +43,37 @@ struct ConfigInfo sound_config[] =
   { "[mm_default].exploding",                  "kabumm.wav"                    },
 
   // sounds for Boulder Dash style elements and actions
+  { "bd_diamond.collecting",                   "pong.wav"                      },
+  { "bd_diamond.falling",                      UNDEFINED_FILENAME              },
+  { "bd_diamond.impact",                       "pling.wav"                     },
+  { "bd_rock.pushing",                         "pusch.wav"                     },
+  { "bd_rock.falling",                         UNDEFINED_FILENAME              },
+  { "bd_rock.impact",                          "klopf.wav"                     },
+  { "bd_magic_wall.activating",                        "quirk.wav"                     },
+  { "bd_magic_wall.active",                    "miep.wav"                      },
+  { "bd_magic_wall.filling",                   "quirk.wav"                     },
+  { "bd_amoeba.waiting",                       UNDEFINED_FILENAME              },
+  { "bd_amoeba.growing",                       "amoebe.wav"                    },
+  { "bd_amoeba.turning_to_gem",                        "pling.wav"                     },
+  { "bd_amoeba.turning_to_gem.mode_loop",      "false"                         },
+  { "bd_amoeba.turning_to_rock",               "klopf.wav"                     },
+  { "bd_amoeba.turning_to_rock.mode_loop",     "false"                         },
+  { "bd_butterfly.moving",                     "klapper.wav"                   },
+  { "bd_butterfly.waiting",                    "klapper.wav"                   },
+  { "bd_firefly.moving",                       "roehr.wav"                     },
+  { "bd_firefly.waiting",                      "roehr.wav"                     },
+
+  // sounds for Boulder Dash style elements and actions (native game engine)
   { "bdx_sand_ball.falling",                   UNDEFINED_FILENAME              },
   { "bdx_sand_ball.impact",                    "schlurf.wav"                   },
   { "bdx_sand_loose.falling",                  UNDEFINED_FILENAME              },
   { "bdx_sand_loose.impact",                   "schlurf.wav"                   },
-  { "bd_diamond.collecting",                   "pong.wav"                      },
-  { "bd_diamond.falling",                      UNDEFINED_FILENAME              },
-  { "bd_diamond.impact",                       "pling.wav"                     },
   { "bdx_diamond.collecting",                  "pong.wav"                      },
   { "bdx_diamond.falling",                     UNDEFINED_FILENAME              },
   { "bdx_diamond.impact",                      "pling.wav"                     },
   { "bdx_flying_diamond.collecting",           "pong.wav"                      },
   { "bdx_flying_diamond.falling",              UNDEFINED_FILENAME              },
   { "bdx_flying_diamond.impact",               "pling.wav"                     },
-  { "bd_rock.pushing",                         "pusch.wav"                     },
-  { "bd_rock.falling",                         UNDEFINED_FILENAME              },
-  { "bd_rock.impact",                          "klopf.wav"                     },
   { "bdx_rock.pushing",                                "pusch.wav"                     },
   { "bdx_rock.falling",                                UNDEFINED_FILENAME              },
   { "bdx_rock.impact",                         "klopf.wav"                     },
@@ -78,23 +93,10 @@ struct ConfigInfo sound_config[] =
   { "bdx_nitro_pack.impact",                   "klopf.wav"                     },
   { "bdx_bomb.collecting",                     "pong.wav"                      },
   { "bdx_bomb.dropping",                       "zisch.wav"                     },
-  { "bd_magic_wall.activating",                        "quirk.wav"                     },
-  { "bd_magic_wall.active",                    "miep.wav"                      },
-  { "bd_magic_wall.filling",                   "quirk.wav"                     },
   { "bdx_magic_wall.active",                   "miep.wav"                      },
-  { "bd_amoeba.waiting",                       UNDEFINED_FILENAME              },
-  { "bd_amoeba.growing",                       "amoebe.wav"                    },
-  { "bd_amoeba.turning_to_gem",                        "pling.wav"                     },
-  { "bd_amoeba.turning_to_gem.mode_loop",      "false"                         },
-  { "bd_amoeba.turning_to_rock",               "klopf.wav"                     },
-  { "bd_amoeba.turning_to_rock.mode_loop",     "false"                         },
   { "bdx_amoeba_1.active",                     UNDEFINED_FILENAME              },
   { "bdx_amoeba_1.other",                      UNDEFINED_FILENAME              },
   { "bdx_amoeba_2.active",                     UNDEFINED_FILENAME              },
-  { "bd_butterfly.moving",                     "klapper.wav"                   },
-  { "bd_butterfly.waiting",                    "klapper.wav"                   },
-  { "bd_firefly.moving",                       "roehr.wav"                     },
-  { "bd_firefly.waiting",                      "roehr.wav"                     },
   { "bdx_pneumatic_hammer.active",             "hammer.wav"                    },
   { "bdx_covered.active",                      "jingle.wav"                    },
   { "bdx_inbox.opening",                       "crash.wav"                     },