X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fsound.c;h=9bdd2be8745c027f07aebe83b3694bd2b0bf7db9;hb=b180608242f0190c6c8b31772e4dcfce2e9af47c;hp=78a293c577a3a52332d51b83c9038b29c5d635dd;hpb=6f6af05b1d4b9671bc115ab9ab2fa3b9d516a652;p=rocksndiamonds.git diff --git a/src/game_em/sound.c b/src/game_em/sound.c index 78a293c5..9bdd2be8 100644 --- a/src/game_em/sound.c +++ b/src/game_em/sound.c @@ -3,7 +3,7 @@ * handle sounds in emerald mine */ -#include "game_em.h" +#include "main_em.h" #if defined(AUDIO_UNIX_NATIVE) @@ -27,7 +27,8 @@ static char audioname[] = "/dev/audio"; static const int sound_priority[SAMPLE_MAX] = { - SAMPLE_exit, + SAMPLE_exit_open, + SAMPLE_exit_leave, SAMPLE_die, SAMPLE_time, SAMPLE_boom, @@ -40,7 +41,8 @@ static const int sound_priority[SAMPLE_MAX] = SAMPLE_door, SAMPLE_dirt, SAMPLE_blank, - SAMPLE_android, + SAMPLE_android_clone, + SAMPLE_android_move, SAMPLE_ball, SAMPLE_grow, SAMPLE_squash, @@ -57,6 +59,7 @@ static const int sound_priority[SAMPLE_MAX] = SAMPLE_bug, SAMPLE_tank, SAMPLE_eater, + SAMPLE_eater_eat, SAMPLE_alien, SAMPLE_acid }; @@ -94,7 +97,9 @@ int sound_thread(void) { /* 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;