X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_snd.c;h=854fe05cad9d875887e2a591899c85ff28b89316;hp=c57e7ea11242b48df139375dc96288e0ffdd4f48;hb=55961e9ba1fe67292a41fdcca0056b43bf960a93;hpb=84c72edcfa6093ca6c82687ace4b23b1959dba39

diff --git a/src/conf_snd.c b/src/conf_snd.c
index c57e7ea1..854fe05c 100644
--- a/src/conf_snd.c
+++ b/src/conf_snd.c
@@ -38,7 +38,9 @@ struct ConfigInfo sound_config[] =
   { "[default].passing",		"gate.wav"			},
   { "[default].dying",			"autsch.wav"			},
   { "[default].exploding",		"roaaar.wav"			},
+  { "[default].hitting",		"kink.wav"			},
   { "[sp_default].exploding",		"booom.wav"			},
+  { "[mm_default].exploding",		"kabumm.wav"			},
 
   /* sounds for Boulder Dash style elements and actions */
   { "bd_diamond.collecting",		"pong.wav"			},
@@ -235,20 +237,66 @@ struct ConfigInfo sound_config[] =
   { "dragon.waiting",			UNDEFINED_FILENAME		},
   { "dragon.attacking",			UNDEFINED_FILENAME		},
 
+  /* sounds for Mirror Magic style elements and actions */
+  { "[mm_mcduffin].hitting",		"autsch.wav"			},
+  { "[mm_mirror].hitting",		"laser.wav"			},
+  { "[mm_mirror_fixed].hitting",	"laser.wav"			},
+  { "[mm_prism].hitting",		"laser.wav"			},
+  { "[mm_exit].hitting",		"holz.wav"			},
+  { "[mm_exit].opening",		"kling.wav"			},
+  { "mm_exit_open.hitting",		UNDEFINED_FILENAME		},
+  { "[df_mirror].hitting",		"laser.wav"			},
+  { "[df_mirror_rotating].hitting",	"laser.wav"			},
+  { "[df_refractor].hitting",		"laser.wav"			},
+  { "[df_receiver].hitting",		"holz.wav"			},
+  { "[df_receiver].opening",		"kling.wav"			},
+  { "[mm_wooden_wall].hitting",		"holz.wav"			},
+  { "[mm_wooden_block].hitting",	"holz.wav"			},
+  { "[mm_wooden_block].pushing",	"bong.wav"			},
+  { "[mm_wooden_lock].hitting",		"holz.wav"			},
+  { "[mm_wooden_grid_fixed].hitting",	"holz.wav"			},
+  { "[mm_fuse].hitting",		"holz.wav"			},
+  { "[mm_ice_wall].hitting",		"holz.wav"			},
+  { "[mm_ice_wall].shrinking",		"slurp.wav"			},
+  { "[mm_amoeba_wall].hitting",		"holz.wav"			},
+  { "[mm_amoeba_wall].growing",		"amoebe.wav"			},
+  { "[mm_amoeba_wall].growing.mode_loop","false"			},
+  { "[df_wooden_wall].hitting",		"holz.wav"			},
+  { "[df_wooden_grid_fixed].hitting",	"holz.wav"			},
+  { "[df_wooden_grid_rotating].hitting","holz.wav"			},
+  { "[mm_steel_wall].hitting",		"hui.wav"			},
+  { "[mm_steel_grid_fixed].hitting",	"hui.wav"			},
+  { "[mm_steel_block].hitting",		"hui.wav"			},
+  { "[mm_steel_block].pushing",		"bong.wav"			},
+  { "[mm_steel_lock].hitting",		"hui.wav"			},
+  { "[df_steel_wall].hitting",		"hui.wav"			},
+  { "[df_steel_grid_fixed].hitting",	"hui.wav"			},
+  { "[df_steel_grid_rotating].hitting",	"hui.wav"			},
+
+  { "[mm_pacman].exploding",		"quiek.wav"			},
+  { "[mm_mcduffin].exploding",		"roaaar.wav"			},
+  { "[mm_bomb].exploding",		"roaaar.wav"			},
+  { "[mm_key].exploding",		"kling.wav"			},
+  { "[mm_steel_lock].exploding",	"whoosh.wav"			},
+  { "[mm_wooden_lock].exploding",	"whoosh.wav"			},
+
   /* sounds not associated to game elements (used for menu screens etc.) */
   /* keyword to stop parser: "NO_MORE_ELEMENT_SOUNDS" <-- do not change! */
 
   /* sounds for other game actions */
   { "game.starting",			UNDEFINED_FILENAME		},
+  { "game.leveltime_charging",		"fuel.wav"			},
+  { "game.health_charging",		"warnton.wav"			},
   { "game.running_out_of_time",		"gong.wav"			},
   { "game.leveltime_bonus",		"sirr.wav"			},
+  { "game.health_bonus",		"sirr.wav"			},
   { "game.losing",			"lachen.wav"			},
   { "game.winning",			UNDEFINED_FILENAME		},
   { "game.sokoban_solving",		"buing.wav"			},
 
   /* sounds for other non-game actions */
-  { "door.opening",			"oeffnen.wav"			},
-  { "door.closing",			"oeffnen.wav"			},
+  { "door.opening",			"door.wav"			},
+  { "door.closing",			"door.wav"			},
 
   { "request.opening",			UNDEFINED_FILENAME		},
   { "request.closing",			UNDEFINED_FILENAME		},
@@ -264,6 +312,7 @@ struct ConfigInfo sound_config[] =
   { "background.TITLE",			UNDEFINED_FILENAME		},
   { "background.MAIN",			UNDEFINED_FILENAME		},
   { "background.LEVELS",		UNDEFINED_FILENAME		},
+  { "background.LEVELNR",		UNDEFINED_FILENAME		},
   { "background.SCORES",		"halloffame.wav"		},
   { "background.SCORES.mode_loop",	"false"				},
   { "background.EDITOR",		UNDEFINED_FILENAME		},