X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fconf_snd.c;h=1ce3e643447fa26661bdb4c21df89dd21a1a5ef4;hb=016e6a754b47cf2d4f67ee754d66213d9e5115ee;hp=06b3446827246b5d797cb7cdc83f156040436251;hpb=c74431d906f186706e3176cb0dd76d40e3414c2f;p=rocksndiamonds.git

diff --git a/src/conf_snd.c b/src/conf_snd.c
index 06b34468..1ce3e643 100644
--- a/src/conf_snd.c
+++ b/src/conf_snd.c
@@ -43,52 +43,61 @@ struct ConfigInfo sound_config[] =
   { "[mm_default].exploding",			"kabumm.wav"			},
 
   // sounds for Boulder Dash style elements and actions
-  { "bd_sand_ball.falling",			UNDEFINED_FILENAME		},
-  { "bd_sand_ball.impact",			"schlurf.wav"			},
-  { "bd_sand_loose.falling",			UNDEFINED_FILENAME		},
-  { "bd_sand_loose.impact",			"schlurf.wav"			},
+  { "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_flying_diamond.collecting",		"pong.wav"			},
-  { "bd_flying_diamond.falling",		UNDEFINED_FILENAME		},
-  { "bd_flying_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"			},
-  { "bd_flying_rock.pushing",			"pusch.wav"			},
-  { "bd_flying_rock.falling",			UNDEFINED_FILENAME		},
-  { "bd_flying_rock.impact",			"klopf.wav"			},
-  { "bd_mega_rock.pushing",			"pusch.wav"			},
-  { "bd_mega_rock.falling",			UNDEFINED_FILENAME		},
-  { "bd_mega_rock.impact",			"klopf.wav"			},
-  { "bd_waiting_rock.pushing",			"pusch.wav"			},
-  { "bd_chasing_rock.pushing",			"pusch.wav"			},
-  { "bd_nut.pushing",				"knurk.wav"			},
-  { "bd_nut.breaking",				"knack.wav"			},
-  { "bd_nut.falling",				UNDEFINED_FILENAME		},
-  { "bd_nut.impact",				"klumpf.wav"			},
-  { "bd_nitro_pack.pushing",			"pusch.wav"			},
-  { "bd_nitro_pack.impact",			"klopf.wav"			},
-  { "bd_bomb.collecting",			"pong.wav"			},
-  { "bd_bomb.dropping",				"zisch.wav"			},
+  { "bdx_rock.pushing",				"pusch.wav"			},
+  { "bdx_rock.falling",				UNDEFINED_FILENAME		},
+  { "bdx_rock.impact",				"klopf.wav"			},
+  { "bdx_flying_rock.pushing",			"pusch.wav"			},
+  { "bdx_flying_rock.falling",			UNDEFINED_FILENAME		},
+  { "bdx_flying_rock.impact",			"klopf.wav"			},
+  { "bdx_mega_rock.pushing",			"pusch.wav"			},
+  { "bdx_mega_rock.falling",			UNDEFINED_FILENAME		},
+  { "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.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"				},
-  { "bd_amoeba.other",				UNDEFINED_FILENAME		},
+  { "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"			},
-  { "bd_pneumatic_hammer.active",		"hammer.wav"			},
-  { "bd_covered.active",			"jingle.wav"			},
-  { "bd_inbox.opening",				"crash.wav"			},
+  { "bdx_pneumatic_hammer.active",		"hammer.wav"			},
+  { "bdx_covered.active",			"jingle.wav"			},
+  { "bdx_inbox.opening",			"crash.wav"			},
 
   // sounds for Supaplex style elements and actions
   { "sp_base.digging",				"base.wav"			},
@@ -321,38 +330,38 @@ struct ConfigInfo sound_config[] =
   // keyword to stop parser: "NO_MORE_ELEMENT_SOUNDS" <-- do not change!
 
   // sounds for Boulder Dash style elements and actions
-  { "bd_diamond.falling.RANDOM_1",		UNDEFINED_FILENAME		},
-  { "bd_diamond.falling.RANDOM_2",		UNDEFINED_FILENAME		},
-  { "bd_diamond.falling.RANDOM_3",		UNDEFINED_FILENAME		},
-  { "bd_diamond.falling.RANDOM_4",		UNDEFINED_FILENAME		},
-  { "bd_diamond.falling.RANDOM_5",		UNDEFINED_FILENAME		},
-  { "bd_diamond.falling.RANDOM_6",		UNDEFINED_FILENAME		},
-  { "bd_diamond.falling.RANDOM_7",		UNDEFINED_FILENAME		},
-  { "bd_diamond.falling.RANDOM_8",		UNDEFINED_FILENAME		},
-  { "bd_diamond.impact.RANDOM_1",		UNDEFINED_FILENAME		},
-  { "bd_diamond.impact.RANDOM_2",		UNDEFINED_FILENAME		},
-  { "bd_diamond.impact.RANDOM_3",		UNDEFINED_FILENAME		},
-  { "bd_diamond.impact.RANDOM_4",		UNDEFINED_FILENAME		},
-  { "bd_diamond.impact.RANDOM_5",		UNDEFINED_FILENAME		},
-  { "bd_diamond.impact.RANDOM_6",		UNDEFINED_FILENAME		},
-  { "bd_diamond.impact.RANDOM_7",		UNDEFINED_FILENAME		},
-  { "bd_diamond.impact.RANDOM_8",		UNDEFINED_FILENAME		},
-  { "bd_flying_diamond.falling.RANDOM_1",	UNDEFINED_FILENAME		},
-  { "bd_flying_diamond.falling.RANDOM_2",	UNDEFINED_FILENAME		},
-  { "bd_flying_diamond.falling.RANDOM_3",	UNDEFINED_FILENAME		},
-  { "bd_flying_diamond.falling.RANDOM_4",	UNDEFINED_FILENAME		},
-  { "bd_flying_diamond.falling.RANDOM_5",	UNDEFINED_FILENAME		},
-  { "bd_flying_diamond.falling.RANDOM_6",	UNDEFINED_FILENAME		},
-  { "bd_flying_diamond.falling.RANDOM_7",	UNDEFINED_FILENAME		},
-  { "bd_flying_diamond.falling.RANDOM_8",	UNDEFINED_FILENAME		},
-  { "bd_flying_diamond.impact.RANDOM_1",	UNDEFINED_FILENAME		},
-  { "bd_flying_diamond.impact.RANDOM_2",	UNDEFINED_FILENAME		},
-  { "bd_flying_diamond.impact.RANDOM_3",	UNDEFINED_FILENAME		},
-  { "bd_flying_diamond.impact.RANDOM_4",	UNDEFINED_FILENAME		},
-  { "bd_flying_diamond.impact.RANDOM_5",	UNDEFINED_FILENAME		},
-  { "bd_flying_diamond.impact.RANDOM_6",	UNDEFINED_FILENAME		},
-  { "bd_flying_diamond.impact.RANDOM_7",	UNDEFINED_FILENAME		},
-  { "bd_flying_diamond.impact.RANDOM_8",	UNDEFINED_FILENAME		},
+  { "bdx_diamond.falling.RANDOM_1",		UNDEFINED_FILENAME		},
+  { "bdx_diamond.falling.RANDOM_2",		UNDEFINED_FILENAME		},
+  { "bdx_diamond.falling.RANDOM_3",		UNDEFINED_FILENAME		},
+  { "bdx_diamond.falling.RANDOM_4",		UNDEFINED_FILENAME		},
+  { "bdx_diamond.falling.RANDOM_5",		UNDEFINED_FILENAME		},
+  { "bdx_diamond.falling.RANDOM_6",		UNDEFINED_FILENAME		},
+  { "bdx_diamond.falling.RANDOM_7",		UNDEFINED_FILENAME		},
+  { "bdx_diamond.falling.RANDOM_8",		UNDEFINED_FILENAME		},
+  { "bdx_diamond.impact.RANDOM_1",		UNDEFINED_FILENAME		},
+  { "bdx_diamond.impact.RANDOM_2",		UNDEFINED_FILENAME		},
+  { "bdx_diamond.impact.RANDOM_3",		UNDEFINED_FILENAME		},
+  { "bdx_diamond.impact.RANDOM_4",		UNDEFINED_FILENAME		},
+  { "bdx_diamond.impact.RANDOM_5",		UNDEFINED_FILENAME		},
+  { "bdx_diamond.impact.RANDOM_6",		UNDEFINED_FILENAME		},
+  { "bdx_diamond.impact.RANDOM_7",		UNDEFINED_FILENAME		},
+  { "bdx_diamond.impact.RANDOM_8",		UNDEFINED_FILENAME		},
+  { "bdx_flying_diamond.falling.RANDOM_1",	UNDEFINED_FILENAME		},
+  { "bdx_flying_diamond.falling.RANDOM_2",	UNDEFINED_FILENAME		},
+  { "bdx_flying_diamond.falling.RANDOM_3",	UNDEFINED_FILENAME		},
+  { "bdx_flying_diamond.falling.RANDOM_4",	UNDEFINED_FILENAME		},
+  { "bdx_flying_diamond.falling.RANDOM_5",	UNDEFINED_FILENAME		},
+  { "bdx_flying_diamond.falling.RANDOM_6",	UNDEFINED_FILENAME		},
+  { "bdx_flying_diamond.falling.RANDOM_7",	UNDEFINED_FILENAME		},
+  { "bdx_flying_diamond.falling.RANDOM_8",	UNDEFINED_FILENAME		},
+  { "bdx_flying_diamond.impact.RANDOM_1",	UNDEFINED_FILENAME		},
+  { "bdx_flying_diamond.impact.RANDOM_2",	UNDEFINED_FILENAME		},
+  { "bdx_flying_diamond.impact.RANDOM_3",	UNDEFINED_FILENAME		},
+  { "bdx_flying_diamond.impact.RANDOM_4",	UNDEFINED_FILENAME		},
+  { "bdx_flying_diamond.impact.RANDOM_5",	UNDEFINED_FILENAME		},
+  { "bdx_flying_diamond.impact.RANDOM_6",	UNDEFINED_FILENAME		},
+  { "bdx_flying_diamond.impact.RANDOM_7",	UNDEFINED_FILENAME		},
+  { "bdx_flying_diamond.impact.RANDOM_8",	UNDEFINED_FILENAME		},
 
   // sounds for other game actions
   { "game.starting",				UNDEFINED_FILENAME		},