#include <soundcard.h>
#endif
-#include "global.h"
-#include "sample.h"
-
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,
SAMPLE_door,
SAMPLE_dirt,
SAMPLE_blank,
- SAMPLE_android,
+ SAMPLE_android_clone,
+ SAMPLE_android_move,
SAMPLE_ball,
SAMPLE_grow,
SAMPLE_squash,
SAMPLE_bug,
SAMPLE_tank,
SAMPLE_eater,
+ SAMPLE_eater_eat,
SAMPLE_alien,
SAMPLE_acid
};
mix_buffer = 0;
mix_count = 0;
- memset(sound_play, 0, sizeof(sound_play)); /* not playing any sounds */
+ clear_mem(sound_play, sizeof(sound_play)); /* not playing any sounds */
for (;;)
{
{
/* 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;
if (mix_count && audio_fd != -1)
{
/* prepare mix buffer */
- memset(mix_buffer, 0, fragment_size * sizeof(*mix_buffer));
+ clear_mem(mix_buffer, fragment_size * sizeof(*mix_buffer));
for (i = 0; i < mix_count; i++)
{