X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_snd.c;h=8f8d58dcabe779aa6ffee9efc629e624f2c512fb;hb=cb8b58732432cc7f3163446dedd54c63126b23c3;hp=cd9869b081fa9fc32e6dca45cdcdfea7d0897d94;hpb=b645a25fff77d62a36c744fa4047a3c0e5929341;p=rocksndiamonds.git

diff --git a/src/conf_snd.c b/src/conf_snd.c
index cd9869b0..8f8d58dc 100644
--- a/src/conf_snd.c
+++ b/src/conf_snd.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
+* (c) 1995-2006 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -19,9 +19,11 @@
    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[] =
+struct ConfigTypeInfo sound_config_suffix[] =
 {
   { ".mode_loop",			ARG_UNDEFINED,	TYPE_BOOLEAN	},
+  { ".volume",				"100",		TYPE_INTEGER	},
+  { ".priority",			"0",		TYPE_INTEGER	},
 
   { NULL,				NULL,		0		}
 };
@@ -110,7 +112,7 @@ struct ConfigInfo sound_config[] =
   { "spaceship.waiting",		"roehr.wav"			},
   { "yamyam.moving",			UNDEFINED_FILENAME		},
   { "yamyam.waiting",			"njam.wav"			},
-  { "yamyam.digging",			UNDEFINED_FILENAME		},
+  { "yamyam.digging",			"njam.wav"			},
   { "robot.moving",			"schlurf.wav"			},
   { "robot.moving.mode_loop",		"false"				},
   { "robot.waiting",			UNDEFINED_FILENAME		},
@@ -119,6 +121,9 @@ struct ConfigInfo sound_config[] =
   { "magic_wall.activating",		"quirk.wav"			},
   { "magic_wall.active",		"miep.wav"			},
   { "magic_wall.filling",		"quirk.wav"			},
+  { "dc_magic_wall.activating",		"quirk.wav"			},
+  { "dc_magic_wall.active",		"miep.wav"			},
+  { "dc_magic_wall.filling",		"quirk.wav"			},
   { "[amoeba].waiting",			UNDEFINED_FILENAME		},
   { "[amoeba].growing",			"amoebe.wav"			},
   { "[amoeba].dropping",		UNDEFINED_FILENAME		},
@@ -128,6 +133,15 @@ struct ConfigInfo sound_config[] =
   { "[exit].opening",			"oeffnen.wav"			},
   { "[exit].closing",			"oeffnen.wav"			},
   { "[exit].passing",			"buing.wav"			},
+  { "[steel_exit].opening",		"oeffnen.wav"			},
+  { "[steel_exit].closing",		"oeffnen.wav"			},
+  { "[steel_exit].passing",		"buing.wav"			},
+  { "[em_exit].opening",		"gong.wav"			},
+  { "[em_exit].closing",		UNDEFINED_FILENAME		},
+  { "[em_exit].passing",		"buing.wav"			},
+  { "[em_steel_exit].opening",		"gong.wav"			},
+  { "[em_steel_exit].closing",		UNDEFINED_FILENAME		},
+  { "[em_steel_exit].passing",		"buing.wav"			},
   { "penguin.passing",			"buing.wav"			},
 
   /* sounds for Emerald Mine Club style elements and actions */
@@ -139,6 +153,11 @@ struct ConfigInfo sound_config[] =
   { "spring.pushing",			"pusch.wav"			},
   { "spring.impact",			"klopf.wav"			},
   { "[wall].growing",			UNDEFINED_FILENAME		},
+  { "emc_android.pushing",		"pusch.wav"			},
+  { "emc_android.moving",		"roehr.wav"			},
+  { "emc_android.moving.mode_loop",	"false"				},
+  { "emc_android.dropping",		"deng.wav"			},
+  { "emc_magic_ball.dropping",		"deng.wav"			},
 
   /* sounds for Diamond Caves style elements and actions */
   { "pearl.collecting",			"pong.wav"			},
@@ -150,6 +169,7 @@ struct ConfigInfo sound_config[] =
   { "[envelope].opening",		UNDEFINED_FILENAME		},
   { "[envelope].closing",		UNDEFINED_FILENAME		},
   { "invisible_sand.digging",		"schlurf.wav"			},
+  { "invisible_sand.active.digging",	"schlurf.wav"			},
   { "shield_normal.collecting",		"pong.wav"			},
   { "shield_normal.active",		UNDEFINED_FILENAME		},
   { "shield_deadly.collecting",		"pong.wav"			},
@@ -162,10 +182,10 @@ struct ConfigInfo sound_config[] =
   { "[switchgate].opening",		"oeffnen.wav"			},
   { "[switchgate].closing",		"oeffnen.wav"			},
   { "[switchgate].passing",		"gate.wav"			},
-  { "timegate_switch.activating",	"deng.wav"			},
-  { "timegate_switch.active",		"miep.wav"			},
-  { "timegate_switch.deactivating",	UNDEFINED_FILENAME		},
-  { "timegate.opening",			"oeffnen.wav"			},
+  { "[timegate_switch].activating",	"deng.wav"			},
+  { "[timegate_switch].active",		"miep.wav"			},
+  { "[timegate_switch].deactivating",	UNDEFINED_FILENAME		},
+  { "[timegate].opening",		"oeffnen.wav"			},
   { "[timegate].closing",		"oeffnen.wav"			},
   { "[timegate].passing",		"gate.wav"			},
   { "[conveyor_belt_switch].activating",UNDEFINED_FILENAME		},
@@ -232,6 +252,12 @@ struct ConfigInfo sound_config[] =
   { "door.opening",			"oeffnen.wav"			},
   { "door.closing",			"oeffnen.wav"			},
 
+  /* sounds for menu actions */
+  { "menu.item.activating",		"empty.wav"			},
+  { "menu.item.selecting",		"base.wav"			},
+
+  { "background.TITLE",			UNDEFINED_FILENAME		},
+  { "background.MESSAGE",		UNDEFINED_FILENAME		},
   { "background.MAIN",			UNDEFINED_FILENAME		},
   { "background.LEVELS",		UNDEFINED_FILENAME		},
   { "background.SCORES",		"halloffame.wav"		},