X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fsound.c;h=e4ac24cc79c16bea7862ff01f528e0a1a9633aee;hb=9e0e44d9596ef874ec5d1e1bd749748c3a9e93f0;hp=4a323818ca6af535076445b403789ad18052fcad;hpb=29014045f4de045f8452fdf7ab32622c94b37eef;p=rocksndiamonds.git

diff --git a/src/sound.c b/src/sound.c
index 4a323818..e4ac24cc 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -73,7 +73,7 @@ void SoundServer()
     if (!FD_ISSET(sound_pipe[0], &sound_fdset))
       continue;
     if (read(sound_pipe[0], &snd_ctrl, sizeof(snd_ctrl)) != sizeof(snd_ctrl))
-      Error(ERR_EXIT, "broken pipe - no sounds");
+      Error(ERR_EXIT_SOUNDSERVER, "broken pipe - no sounds");
 
 #ifdef VOXWARE
 
@@ -119,7 +119,7 @@ void SoundServer()
       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)
       {
@@ -483,13 +483,13 @@ void HPUX_Audio_Control()
 
   audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY);
   if (audio_ctl == -1)
-    Error(ERR_EXIT, "cannot open /dev/audioCtl - no sounds");
+    Error(ERR_EXIT_SOUNDSERVER, "cannot open /dev/audioCtl - no sounds");
 
   if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1)
-    Error(ERR_EXIT, "no audio info - no sounds");
+    Error(ERR_EXIT_SOUNDSERVER, "no audio info - no sounds");
 
   if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1)
-    Error(ERR_EXIT, "ulaw audio not available - no sounds");
+    Error(ERR_EXIT_SOUNDSERVER, "ulaw audio not available - no sounds");
 
   ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1);
   ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000);
@@ -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]);
 }
 
-BOOL LoadSound(struct SoundInfo *snd_info)
+boolean LoadSound(struct SoundInfo *snd_info)
 {
   FILE *file;
   char filename[256];
@@ -627,18 +627,19 @@ BOOL LoadSound(struct SoundInfo *snd_info)
   struct SoundHeader_8SVX *sound_header;
   unsigned char *ptr;
 
-  sprintf(filename,"%s/%s.%s",SND_PATH,snd_info->name,sound_ext);
+  sprintf(filename, "%s/%s/%s.%s",
+	  options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext);
 
 #ifndef MSDOS
   if (!(file=fopen(filename,"r")))
   {
-    Error(ERR_RETURN, "cannot open sound file '%s' - no sounds", filename);
+    Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename);
     return(FALSE);
   }
 
   if (fseek(file,0,SEEK_END)<0)
   {
-    Error(ERR_RETURN, "cannot read sound file '%s' - no sounds", filename);
+    Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
     fclose(file);
     return(FALSE);
   }
@@ -648,14 +649,14 @@ BOOL LoadSound(struct SoundInfo *snd_info)
 
   if (!(snd_info->file_ptr=malloc(snd_info->file_len)))
   {
-    Error(ERR_RETURN, "out of memory (this shouldn't happen :) - no sounds");
+    Error(ERR_WARN, "out of memory (this shouldn't happen :) - no sounds");
     fclose(file);
     return(FALSE);
   }
 
   if (fread(snd_info->file_ptr,1,snd_info->file_len,file)!=snd_info->file_len)
   {
-    Error(ERR_RETURN, "cannot read sound file '%s' - no sounds", filename);
+    Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
     fclose(file);
     return(FALSE);
   }
@@ -668,7 +669,7 @@ BOOL LoadSound(struct SoundInfo *snd_info)
       snd_info->file_len != be2long(&sound_header->chunk_size)+8 ||
       strncmp(sound_header->magic_8SVX,"8SVX",4))
   {
-    Error(ERR_RETURN, "'%s' is not an IFF/8SVX file or broken - no sounds",
+    Error(ERR_WARN, "'%s' is not an IFF/8SVX file or broken - no sounds",
 	  filename);
     return(FALSE);
   }
@@ -711,7 +712,7 @@ BOOL LoadSound(struct SoundInfo *snd_info)
   snd_info->sample_ptr = load_sample(filename);
   if(!snd_info->sample_ptr)
   {
-    Error(ERR_RETURN, "cannot read sound file '%s' - no sounds", filename);
+    Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
     fclose(file);
     return(FALSE);
   }
@@ -734,11 +735,11 @@ void PlaySoundLoop(int nr)
   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;
 
-  if (sound_status==SOUND_OFF || !sound_on)
+  if (sound_status==SOUND_OFF || !setup.sound)
     return;
 
   if (volume<PSND_MIN_VOLUME)
@@ -762,7 +763,7 @@ void PlaySoundExt(int nr, int volume, int stereo, BOOL loop)
 #ifndef MSDOS
   if (write(sound_pipe[1], &snd_ctrl, sizeof(snd_ctrl))<0)
   {
-    Error(ERR_RETURN, "cannot pipe to child process - no sounds");
+    Error(ERR_WARN, "cannot pipe to child process - no sounds");
     sound_status = SOUND_OFF;
     return;
   }
@@ -812,7 +813,7 @@ void StopSoundExt(int nr, int method)
 #ifndef MSDOS
   if (write(sound_pipe[1], &snd_ctrl, sizeof(snd_ctrl))<0)
   {
-    Error(ERR_RETURN, "cannot pipe to child process - no sounds");
+    Error(ERR_WARN, "cannot pipe to child process - no sounds");
     sound_status = SOUND_OFF;
     return;
   }