X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_snd.c;h=9d028a5adbfb0afa24e56d134582690e61fd5a24;hb=92989af5d5884cbc8a1a9a62c9d05e109eaf78d0;hp=23f2e50662897c76dec68bb630f8ba75468ab7ca;hpb=07bd1f7e496e8914d56ec4422b33492b8f66b1d0;p=rocksndiamonds.git

diff --git a/src/conf_snd.c b/src/conf_snd.c
index 23f2e506..9d028a5a 100644
--- a/src/conf_snd.c
+++ b/src/conf_snd.c
@@ -16,7 +16,7 @@
 
 
 /* List values that are not defined in the configuration file are set to
-   reliable default values. If that value is GFX_ARG_UNDEFINED, it will
+   reliable default values. If that value is SND_ARG_UNDEFINED, it will
    be dynamically determined, using some of the other list values. */
 
 struct ConfigInfo sound_config_suffix[] =
@@ -28,6 +28,18 @@ struct ConfigInfo sound_config_suffix[] =
 
 struct ConfigInfo sound_config[] =
 {
+  /* some default sounds */
+  { "[default].digging",		"schlurf.wav"		},
+  { "[default].collecting",		"pong.wav"		},
+  { "[default].snapping",		"pong.wav"		},
+  { "[default].pushing",		"pusch.wav"		},
+  { "[default].impact",			"klopf.wav"		},
+  { "[default].walking",		"empty.wav"		},
+  { "[default].passing",		"gate.wav"		},
+  { "[default].dying",			"autsch.wav"		},
+  { "[default].exploding",		"roaaar.wav"		},
+  { "[sp_default].exploding",		"booom.wav"		},
+
   /* sounds for Boulder Dash style elements and actions */
   { "bd_diamond.collecting",		"pong.wav"		},
   { "bd_diamond.impact",		"pling.wav"		},
@@ -59,6 +71,7 @@ struct ConfigInfo sound_config[] =
   { "[sp_port].passing",		"gate.wav"		},
   { "[sp_exit].passing",		"exit.wav"		},
   { "[sp_exit].opening",		UNDEFINED_FILENAME	},
+  { "[sp_exit].closing",		UNDEFINED_FILENAME	},
   { "sp_sniksnak.moving",		UNDEFINED_FILENAME	},
   { "sp_sniksnak.waiting",		UNDEFINED_FILENAME	},
   { "sp_electron.moving",		UNDEFINED_FILENAME	},
@@ -72,7 +85,8 @@ struct ConfigInfo sound_config[] =
   { "[sokoban].emptying",		UNDEFINED_FILENAME	},
 
   /* sounds for Emerald Mine style elements and actions */
-  { "empty_space.digging",		"empty.wav"		},
+  { "[player].moving",			"empty.wav"		},
+  { "[player].moving.mode_loop",	"false"			},
   { "sand.digging",			"schlurf.wav"		},
   { "emerald.collecting",		"pong.wav"		},
   { "emerald.impact",			"pling.wav"		},
@@ -112,7 +126,9 @@ struct ConfigInfo sound_config[] =
   { "[quicksand].filling",		UNDEFINED_FILENAME	},
   { "[quicksand].emptying",		UNDEFINED_FILENAME	},
   { "[exit].opening",			"oeffnen.wav"		},
+  { "[exit].closing",			"oeffnen.wav"		},
   { "[exit].passing",			"buing.wav"		},
+  { "penguin.passing",			"buing.wav"		},
 
   /* sounds for Emerald Mine Club style elements and actions */
   { "balloon.moving",			UNDEFINED_FILENAME	},
@@ -130,7 +146,9 @@ struct ConfigInfo sound_config[] =
   { "pearl.impact",			"pling.wav"		},
   { "crystal.collecting",		"pong.wav"		},
   { "crystal.impact",			"pling.wav"		},
-  { "envelope.collecting",		"pong.wav"		},
+  { "[envelope].collecting",		"pong.wav"		},
+  { "[envelope].opening",		UNDEFINED_FILENAME	},
+  { "[envelope].closing",		UNDEFINED_FILENAME	},
   { "invisible_sand.digging",		"schlurf.wav"		},
   { "shield_normal.collecting",		"pong.wav"		},
   { "shield_normal.active",		UNDEFINED_FILENAME	},
@@ -160,7 +178,7 @@ struct ConfigInfo sound_config[] =
   { "dx_supabomb.pushing",		"pusch.wav"		},
   { "trap.digging",			"schlurf.wav"		},
   { "trap.activating",			UNDEFINED_FILENAME	},
-  { "[tube].passing",			UNDEFINED_FILENAME	},
+  { "[tube].walking",			UNDEFINED_FILENAME	},
 
   /* sounds for Rocks'n'Diamonds style elements and actions */
   { "amoeba.turning_to_gem",		"pling.wav"		},
@@ -199,11 +217,6 @@ struct ConfigInfo sound_config[] =
   { "dragon.waiting",			UNDEFINED_FILENAME	},
   { "dragon.attacking",			UNDEFINED_FILENAME	},
 
-  /* sounds for generic elements and actions */
-  { "[player].dying",			"autsch.wav"		},
-  { "element.exploding",		"roaaar.wav"		},
-  { "sp_element.exploding",		"booom.wav"		},
-
   /* sounds not associated to game elements (used for menu screens etc.) */
   /* keyword to stop parser: "NO_MORE_ELEMENT_SOUNDS" <-- do not change! */
 
@@ -216,14 +229,16 @@ struct ConfigInfo sound_config[] =
   { "game.sokoban_solving",		"buing.wav"		},
 
   /* sounds for other non-game actions */
-  { "menu.door_opening",		"oeffnen.wav"		},
-  { "menu.door_closing",		"oeffnen.wav"		},
-
-  { "menu.hall_of_fame",		"halloffame.wav"	},
-  { "menu.hall_of_fame.mode_loop",	"false"			},
+  { "door.opening",			"oeffnen.wav"		},
+  { "door.closing",			"oeffnen.wav"		},
 
-  { "menu.info_screen",			"rhythmloop.wav"	},
-  { "menu.info_screen.mode_loop",	"true"			},
+  { "background.MAIN",			UNDEFINED_FILENAME	},
+  { "background.LEVELS",		UNDEFINED_FILENAME	},
+  { "background.SCORES",		"halloffame.wav"	},
+  { "background.SCORES.mode_loop",	"false"			},
+  { "background.EDITOR",		UNDEFINED_FILENAME	},
+  { "background.INFO",			UNDEFINED_FILENAME	},
+  { "background.SETUP",			UNDEFINED_FILENAME	},
 
 #if 0
   { "[not used]",			"antigrav.wav"		},