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
/
game_em
/
sound.c
diff --git
a/src/game_em/sound.c
b/src/game_em/sound.c
index 8fa4565347e2b77792f3fe586057b47d4cce6332..c1334cc7bb05381cada4ab00d9b26452cb13964d 100644
(file)
--- a/
src/game_em/sound.c
+++ b/
src/game_em/sound.c
@@
-20,14
+20,12
@@
#include <soundcard.h>
#endif
#include <soundcard.h>
#endif
-#include "global.h"
-#include "sample.h"
-
static char audioname[] = "/dev/audio";
static const int sound_priority[SAMPLE_MAX] =
{
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_die,
SAMPLE_time,
SAMPLE_boom,
@@
-40,7
+38,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
+56,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
};
@@
-86,7
+86,7
@@
int sound_thread(void)
mix_buffer = 0;
mix_count = 0;
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 (;;)
{
for (;;)
{
@@
-94,7
+94,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;
@@
-292,7
+294,7
@@
int sound_thread(void)
if (mix_count && audio_fd != -1)
{
/* prepare mix buffer */
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++)
{
for (i = 0; i < mix_count; i++)
{