changed logic and defaults for falling element sounds in BD engine

[rocksndiamonds.git] / src / conf_snd.c

diff --git a/src/conf_snd.c b/src/conf_snd.c
index 1ce3e643447fa26661bdb4c21df89dd21a1a5ef4..103058e4f7b4c51b257fcdb02a3d331574aeeacb 100644 (file)
--- a/src/conf_snd.c
+++ b/src/conf_snd.c
@@ -43,58 +43,60 @@ struct ConfigInfo sound_config[] =
   { "[mm_default].exploding",                  "kabumm.wav"                    },
 
   // sounds for Boulder Dash style elements and actions
-  { "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"                     },
+  { "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",                   "schlurf.wav"                   },
+  { "bdx_sand_ball.impact",                    "schlurf.wav"                   },
+  { "bdx_sand_loose.falling",                  "schlurf.wav"                   },
+  { "bdx_sand_loose.impact",                   "schlurf.wav"                   },
   { "bdx_diamond.collecting",                  "pong.wav"                      },
-  { "bdx_diamond.falling",                     UNDEFINED_FILENAME              },
+  { "bdx_diamond.falling",                     "pling.wav"                     },
   { "bdx_diamond.impact",                      "pling.wav"                     },
   { "bdx_flying_diamond.collecting",           "pong.wav"                      },
-  { "bdx_flying_diamond.falling",              UNDEFINED_FILENAME              },
+  { "bdx_flying_diamond.falling",              "pling.wav"                     },
   { "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.falling",                                "klopf.wav"                     },
   { "bdx_rock.impact",                         "klopf.wav"                     },
   { "bdx_flying_rock.pushing",                 "pusch.wav"                     },
-  { "bdx_flying_rock.falling",                 UNDEFINED_FILENAME              },
+  { "bdx_flying_rock.falling",                 "klopf.wav"                     },
   { "bdx_flying_rock.impact",                  "klopf.wav"                     },
   { "bdx_mega_rock.pushing",                   "pusch.wav"                     },
-  { "bdx_mega_rock.falling",                   UNDEFINED_FILENAME              },
+  { "bdx_mega_rock.falling",                   "klopf.wav"                     },
   { "bdx_mega_rock.impact",                    "klopf.wav"                     },
   { "bdx_waiting_rock.pushing",                        "pusch.wav"                     },
   { "bdx_chasing_rock.pushing",                        "pusch.wav"                     },
   { "bdx_nut.pushing",                         "knurk.wav"                     },
   { "bdx_nut.breaking",                                "knack.wav"                     },
-  { "bdx_nut.falling",                         UNDEFINED_FILENAME              },
+  { "bdx_nut.falling",                         "klumpf.wav"                    },
   { "bdx_nut.impact",                          "klumpf.wav"                    },
   { "bdx_nitro_pack.pushing",                  "pusch.wav"                     },
   { "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"                     },