projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into releases
[rocksndiamonds.git]
/
src
/
conf_snd.c
diff --git
a/src/conf_snd.c
b/src/conf_snd.c
index ef891ee14f8abdec537c5a4cd37fa1d882a52ace..1c3ce29a083677a45da67addc203c8ed9825072c 100644
(file)
--- a/
src/conf_snd.c
+++ b/
src/conf_snd.c
@@
-1,7
+1,7
@@
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-200
2
Artsoft Entertainment *
+* (c) 1995-200
6
Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
@@
-112,7
+112,7
@@
struct ConfigInfo sound_config[] =
{ "spaceship.waiting", "roehr.wav" },
{ "yamyam.moving", UNDEFINED_FILENAME },
{ "yamyam.waiting", "njam.wav" },
{ "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 },
{ "robot.moving", "schlurf.wav" },
{ "robot.moving.mode_loop", "false" },
{ "robot.waiting", UNDEFINED_FILENAME },
@@
-141,6
+141,11
@@
struct ConfigInfo sound_config[] =
{ "spring.pushing", "pusch.wav" },
{ "spring.impact", "klopf.wav" },
{ "[wall].growing", UNDEFINED_FILENAME },
{ "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" },
/* sounds for Diamond Caves style elements and actions */
{ "pearl.collecting", "pong.wav" },
@@
-152,6
+157,7
@@
struct ConfigInfo sound_config[] =
{ "[envelope].opening", UNDEFINED_FILENAME },
{ "[envelope].closing", UNDEFINED_FILENAME },
{ "invisible_sand.digging", "schlurf.wav" },
{ "[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" },
{ "shield_normal.collecting", "pong.wav" },
{ "shield_normal.active", UNDEFINED_FILENAME },
{ "shield_deadly.collecting", "pong.wav" },
@@
-234,6
+240,7
@@
struct ConfigInfo sound_config[] =
{ "door.opening", "oeffnen.wav" },
{ "door.closing", "oeffnen.wav" },
{ "door.opening", "oeffnen.wav" },
{ "door.closing", "oeffnen.wav" },
+ { "background.TITLE", UNDEFINED_FILENAME },
{ "background.MAIN", UNDEFINED_FILENAME },
{ "background.LEVELS", UNDEFINED_FILENAME },
{ "background.SCORES", "halloffame.wav" },
{ "background.MAIN", UNDEFINED_FILENAME },
{ "background.LEVELS", UNDEFINED_FILENAME },
{ "background.SCORES", "halloffame.wav" },