rnd-19981017-1

[rocksndiamonds.git] / src / sound.c

diff --git a/src/sound.c b/src/sound.c
index 1858a8f331356abf3a6d0cd6ac92ba809398a216..be825edc9a510d0f8554a685d518e34490824122 100644 (file)
--- a/src/sound.c
+++ b/src/sound.c
@@ -119,7 +119,7 @@ void SoundServer()
       char *sample_ptr;
       long sample_size, max_sample_size;
       long fragment_size;
       char *sample_ptr;
       long sample_size, max_sample_size;
       long fragment_size;

-      BOOL stereo;
+      boolean stereo;

 
       if (playing_sounds || (sound_device=open(sound_device_name,O_WRONLY))>=0)
       {
 
       if (playing_sounds || (sound_device=open(sound_device_name,O_WRONLY))>=0)
       {


@@ -615,7 +615,7 @@ static unsigned long be2long(unsigned long *be)     /* big-endian -> longword */
   return(ptr[0]<<24 | ptr[1]<<16 | ptr[2]<<8 | ptr[3]);
 }
 
   return(ptr[0]<<24 | ptr[1]<<16 | ptr[2]<<8 | ptr[3]);
 }
 

-BOOL LoadSound(struct SoundInfo *snd_info)
+boolean LoadSound(struct SoundInfo *snd_info)

 {
   FILE *file;
   char filename[256];
 {
   FILE *file;
   char filename[256];


@@ -734,11 +734,11 @@ void PlaySoundLoop(int nr)
   PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_LOOP);
 }
 
   PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_LOOP);
 }
 

-void PlaySoundExt(int nr, int volume, int stereo, BOOL loop)
+void PlaySoundExt(int nr, int volume, int stereo, boolean loop)

 {
   struct SoundControl snd_ctrl = emptySoundControl;
 
 {
   struct SoundControl snd_ctrl = emptySoundControl;
 

-  if (sound_status==SOUND_OFF || !sound_on)
+  if (sound_status==SOUND_OFF || !setup.sound_on)

     return;
 
   if (volume<PSND_MIN_VOLUME)
     return;
 
   if (volume<PSND_MIN_VOLUME)