projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20050424-1-src
[rocksndiamonds.git]
/
src
/
game_em
/
sound.c
diff --git
a/src/game_em/sound.c
b/src/game_em/sound.c
index 8fa4565347e2b77792f3fe586057b47d4cce6332..9bdd2be8745c027f07aebe83b3694bd2b0bf7db9 100644
(file)
--- a/
src/game_em/sound.c
+++ b/
src/game_em/sound.c
@@
-27,7
+27,8
@@
static char audioname[] = "/dev/audio";
static const int sound_priority[SAMPLE_MAX] =
{
static const int sound_priority[SAMPLE_MAX] =
{
- SAMPLE_exit,
+ SAMPLE_exit_open,
+ SAMPLE_exit_leave,
SAMPLE_die,
SAMPLE_time,
SAMPLE_boom,
SAMPLE_die,
SAMPLE_time,
SAMPLE_boom,
@@
-40,7
+41,8
@@
static const int sound_priority[SAMPLE_MAX] =
SAMPLE_door,
SAMPLE_dirt,
SAMPLE_blank,
SAMPLE_door,
SAMPLE_dirt,
SAMPLE_blank,
- SAMPLE_android,
+ SAMPLE_android_clone,
+ SAMPLE_android_move,
SAMPLE_ball,
SAMPLE_grow,
SAMPLE_squash,
SAMPLE_ball,
SAMPLE_grow,
SAMPLE_squash,
@@
-57,6
+59,7
@@
static const int sound_priority[SAMPLE_MAX] =
SAMPLE_bug,
SAMPLE_tank,
SAMPLE_eater,
SAMPLE_bug,
SAMPLE_tank,
SAMPLE_eater,
+ SAMPLE_eater_eat,
SAMPLE_alien,
SAMPLE_acid
};
SAMPLE_alien,
SAMPLE_acid
};
@@
-94,7
+97,9
@@
int sound_thread(void)
{
/* pick sounds to play, if any */
{
/* pick sounds to play, if any */
- if (sound_play[SAMPLE_exit] || sound_play[SAMPLE_die])
+ if (sound_play[SAMPLE_exit_open] ||
+ sound_play[SAMPLE_exit_leave] ||
+ sound_play[SAMPLE_die])
sound_play[SAMPLE_boom] = 0; /* no explosions if player goes home */
mix_count = 0;
sound_play[SAMPLE_boom] = 0; /* no explosions if player goes home */
mix_count = 0;