X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_snd.c;h=c15e0dec81385f29360c24201a7755b51bb1bc4c;hb=24101bdeee0ac963cfd48b5220f6d9b0188a6f69;hp=deb105e2955c0416d43616b76822722412d067a9;hpb=891c39ca37c4fea5f6cc4ca40f913a56c68ef495;p=rocksndiamonds.git

diff --git a/src/conf_snd.c b/src/conf_snd.c
index deb105e2..c15e0dec 100644
--- a/src/conf_snd.c
+++ b/src/conf_snd.c
@@ -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		}
 };
@@ -88,8 +90,8 @@ struct ConfigInfo sound_config[] =
   { "[player].moving",			"empty.wav"			},
   { "[player].moving.mode_loop",	"false"				},
   { "sand.digging",			"schlurf.wav"			},
-  { "emerald.collecting",		"pong.wav"			},
-  { "emerald.impact",			"pling.wav"			},
+  { "[emerald].collecting",		"pong.wav"			},
+  { "[emerald].impact",			"pling.wav"			},
   { "diamond.collecting",		"pong.wav"			},
   { "diamond.impact",			"pling.wav"			},
   { "diamond.breaking",			"quirk.wav"			},
@@ -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		},
@@ -139,6 +141,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 +157,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"			},
@@ -232,6 +240,7 @@ struct ConfigInfo sound_config[] =
   { "door.opening",			"oeffnen.wav"			},
   { "door.closing",			"oeffnen.wav"			},
 
+  { "background.TITLE",			UNDEFINED_FILENAME		},
   { "background.MAIN",			UNDEFINED_FILENAME		},
   { "background.LEVELS",		UNDEFINED_FILENAME		},
   { "background.SCORES",		"halloffame.wav"		},